Revert "Fix for failing specs"

This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock

1 files changed, 16 insertions, 15 deletions

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