From 2838a993da78bf365d7a84dc51f57a605fc99c96 Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Sat, 7 Jun 2014 10:09:56 +0200 Subject: [PATCH] DB cleaner reverted to a known working version --- spec/support/db_cleaner.rb | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb index fa466ef..d2d532d 100644 --- a/spec/support/db_cleaner.rb +++ b/spec/support/db_cleaner.rb @@ -1,18 +1,39 @@ +# RSpec.configure do |config| + +# config.around(:each) do |example| +# DatabaseCleaner.strategy = :transaction +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end + +# config.around(:each, js: true) do |example| +# DatabaseCleaner.strategy = :truncation +# DatabaseCleaner.clean_with(:truncation) +# DatabaseCleaner.cleaning do +# example.run +# end +# end +# end RSpec.configure do |config| + config.before(:suite) do + DatabaseCleaner.clean_with(:truncation) + end - config.around(:each) do |example| + config.before(:each) do DatabaseCleaner.strategy = :transaction - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end end - config.around(:each, js: true) do |example| + config.before(:each, :js => true) do DatabaseCleaner.strategy = :truncation - DatabaseCleaner.clean_with(:truncation) - DatabaseCleaner.cleaning do - example.run - end + end + + config.before(:each) do + DatabaseCleaner.start + end + + config.after(:each) do + DatabaseCleaner.clean end end -- libgit2 0.21.2