From 244172a9bce9586b3c37bf8852c130c77d866b5d Mon Sep 17 00:00:00 2001
From: Hernan Schmidt <hschmidt@suse.com>
Date: Tue, 16 Aug 2016 19:02:59 +0200
Subject: [PATCH] Clean up DatabaseCleaner usage

---
 spec/spec_helper.rb              | 11 +----------
 spec/support/database_cleaner.rb |  8 --------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3ee6db15..3b387199 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -55,15 +55,9 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  # Setting up DB cleaning to maintain empty rows
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
   config.around(:each) do |example|
     DatabaseCleaner.cleaning do
-      load "#{Rails.root}/db/seeds.rb"
+      Rails.application.load_seed
       example.run
     end
   end
@@ -89,15 +83,12 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.use_transactional_fixtures = true
-
   # Reuse rspec as mocking framework
   config.mock_framework = :rspec
 
   # Types of tests (controller, feature, model) will
   # be inferred from subfolder name
   config.infer_spec_type_from_file_location!
-
 end
 
 OmniAuth.config.test_mode = true
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index e0dbc9aa..2d47903d 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -10,12 +10,4 @@ RSpec.configure do |config|
   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