Get rid of DatabaseCleanerrc-get-rid-of-db_cleaner

Signed-off-by: Rémy Coutable <remy@rymai.me>

5 files changed, 13 insertions, 15 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ccf301e6c78..10a6675b55e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -251,7 +251,6 @@ RSpec/HookArgument:
   Exclude:
     - 'spec/spec_helper.rb'
     - 'spec/support/carrierwave.rb'
-    - 'spec/support/db_cleaner.rb'
     - 'spec/support/gitaly.rb'
     - 'spec/support/setup_builds_storage.rb'
 
diff --git a/Gemfile b/Gemfile
index 82559fa731c..29735057ba8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -385,7 +385,7 @@ group :test do
   gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
   gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.0.5'
-  gem 'test-prof', '~> 0.2.5'
+  gem 'test-prof', '~> 0.6.0'
 end
 
 gem 'octokit', '~> 4.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 79e3888fa64..dc706f5d448 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -890,7 +890,7 @@ GEM
       ffi
     sysexits (1.2.0)
     temple (0.7.7)
-    test-prof (0.2.5)
+    test-prof (0.6.0)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
     text (1.3.1)
@@ -1174,7 +1174,7 @@ DEPENDENCIES
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.5.1)
   sys-filesystem (~> 1.1.6)
-  test-prof (~> 0.2.5)
+  test-prof (~> 0.6.0)
   test_after_commit (~> 1.1)
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fdce8e84620..623a95af2ab 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,6 +9,7 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'rspec/retry'
 require 'rspec-parameterized'
+require 'test_prof/recipes/active_record_shared_connection'
 
 rspec_profiling_is_configured =
   ENV['RSPEC_PROFILING_POSTGRES_URL'].present? ||
@@ -39,7 +40,7 @@ Dir[Rails.root.join("spec/support/shared_examples/*.rb")].each { |f| require f }
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
 
   config.verbose_retry = true
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index 5edc5de2a09..622832e1f82 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -23,27 +23,25 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with(:deletion, cache_tables: false)
   end
 
-  config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
-  end
+  # config.before(:each) do
+  #   DatabaseCleaner.strategy = :transaction
+  # end
 
-  config.before(:each, :js) do
+  config.before(:each, :delete) do
     DatabaseCleaner.strategy = :deletion, { cache_tables: false }
+    DatabaseCleaner.start
   end
 
-  config.before(:each, :delete) do
-    DatabaseCleaner.strategy = :deletion, { cache_tables: false }
+  config.after(:each, :delete) do
+    DatabaseCleaner.clean
   end
 
   config.before(:each, :migration) do
     DatabaseCleaner.strategy = :deletion, { cache_tables: false }
-  end
-
-  config.before(:each) do
     DatabaseCleaner.start
   end
 
-  config.append_after(:each) do
+  config.after(:each, :migration) do
     DatabaseCleaner.clean
   end
 end