Merge f55d445 into 238f18e

railsadminteam · Aug 9, 2021 · bb923f0 · bb923f0
2 parents 238f18e + f55d445
commit bb923f0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,8 @@ end
 group :test do
   gem 'cancancan', '~> 3.0'
   gem 'carrierwave', ['>= 2.0.0.rc', '< 3']
-  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0', '< 2.0']
+  gem 'database_cleaner-mongoid', '>= 2.0', require: false
+  gem 'database_cleaner-active_record', '>= 2.0', require: false
   gem 'dragonfly', '~> 1.0'
   gem 'factory_bot', '>= 4.2'
   gem 'generator_spec', '>= 0.8'

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -32,7 +32,8 @@ end
 group :test do
   gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
+  gem "database_cleaner-mongoid", ">= 2.0", require: false
+  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -32,7 +32,8 @@ end
 group :test do
   gem "cancancan", "~> 3.2"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
-  gem "database_cleaner", [">= 1.2", "!= 1.4.0", "!= 1.5.0", "< 2.0"]
+  gem "database_cleaner-mongoid", ">= 2.0", require: false
+  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"

diff --git a/spec/orm/active_record.rb b/spec/orm/active_record.rb
@@ -1,7 +1,5 @@
 require 'rails_admin/adapters/active_record'
 
-DatabaseCleaner.strategy = :transaction
-
 ActiveRecord::Base.connection.data_sources.each do |table|
   ActiveRecord::Base.connection.drop_table(table)
 end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -32,7 +32,7 @@
 require 'factory_bot'
 require 'factories'
 require 'policies'
-require 'database_cleaner'
+require "database_cleaner/#{CI_ORM}"
 require "orm/#{CI_ORM}"
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__),
@@ -93,7 +93,7 @@ def password_digest(password)
   end
 
   config.before do |example|
-    DatabaseCleaner.strategy = (CI_ORM == :mongoid || example.metadata[:js]) ? :truncation : :transaction
+    DatabaseCleaner.strategy = (CI_ORM == :mongoid || example.metadata[:js]) ? :deletion : :transaction
 
     DatabaseCleaner.start
     RailsAdmin::Config.reset