DB cleaner reverted to a known working version

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

1 files changed, 31 insertions, 10 deletions

diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index fa466ef5aea..d2d532d9738 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