Commit 1e0e0bce authored by maxwell's avatar maxwell

fixing merge with master

parents 2f6a11f0 ea7abccd
......@@ -11,6 +11,7 @@ gem "haml"
gem "devise", :git => "git://github.com/plataformatec/devise.git"
gem 'roxml', :git => "git://github.com/Empact/roxml.git"
group :test do
gem 'rspec', '>= 2.0.0.beta.12'
gem 'rspec-rails', ">= 2.0.0.beta.8"
......
......@@ -16,7 +16,7 @@ Rspec.configure do |config|
#
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
#this is a dumb hax TODO
config.mock_with :mocha
#config.mock_with :mocha
# config.mock_with :flexmock
# config.mock_with :rr
config.mock_with :rspec
......@@ -41,5 +41,5 @@ Rspec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, comment the following line or assign false
# instead of true.
config.use_transactional_fixtures = false
config.use_transactional_fixtures = true
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment