Merge pull request #6943 from jvanbaarsen/spec-fix

Fix for failing specs

1 files changed, 15 insertions, 16 deletions

diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index 8c9c74f14bd..f2b310245bd 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -1,22 +1,21 @@
-require 'database_cleaner'
-
 RSpec.configure do |config|
-  config.before do
-    if example.metadata[:js]
-      DatabaseCleaner.strategy = :truncation
-      Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
+  config.around(:each) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.around(:each, js: true) do
+    DatabaseCleaner.strategy = :truncation
+  end
 
-    unless example.metadata[:no_db]
-      DatabaseCleaner.start
-    end
+  config.before(:each) do
+    DatabaseCleaner.start
   end
 
-  config.after do
-    unless example.metadata[:no_db]
-      DatabaseCleaner.clean
-    end
+  config.after(:each) do
+    DatabaseCleaner.clean
   end
 end