Skip to content

Commit

Permalink
Revert "database_cleaner timing test on Travis"
Browse files Browse the repository at this point in the history
This reverts commit a670377.
  • Loading branch information
LocoDelAssembly committed Oct 25, 2014
1 parent a670377 commit 947d025
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -106,6 +106,5 @@ group :test do
gem 'timecop', '~> 0.7.1'
gem 'webmock', '~> 1.18.0'
gem 'vcr', '~> 2.9.2'
gem 'database_cleaner', '~> 1.3.0'
end

22 changes: 2 additions & 20 deletions spec/spec_helper.rb
Expand Up @@ -63,7 +63,7 @@
=end

config.infer_spec_type_from_file_location!
config.use_transactional_fixtures = false
config.use_transactional_fixtures = true
config.infer_base_class_for_anonymous_controllers = false

# Many RSpec users commonly either run the entire suite or an individual
Expand All @@ -89,23 +89,5 @@
#
#
#
config.before(:suite) do
DatabaseCleaner.clean_with(:truncation)
end

config.before(:each) do
DatabaseCleaner.strategy = :transaction
end

config.before(:each, js: true) do
DatabaseCleaner.strategy = :truncation
end

config.before(:each) do
DatabaseCleaner.start
end

config.after(:each) do
DatabaseCleaner.clean
end

end

0 comments on commit 947d025

Please sign in to comment.