diff --git a/Gemfile b/Gemfile index e3537bce2..a9cb8fbbd 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,6 @@ end group :development, :test do gem "bullet", "~> 6.1.4" gem "byebug", "~> 11.1.3" - gem "database_cleaner", "~> 2.0.1" gem "factory_bot_rails", "~> 6.2.0" gem "faker", "~> 2.18.0" gem "i18n-tasks", "~> 0.9.34" diff --git a/Gemfile.lock b/Gemfile.lock index ee0c8f765..8287adb66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,12 +168,6 @@ GEM crass (1.0.6) daemons (1.4.0) dalli (2.7.11) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.1) delayed_job (4.1.9) activesupport (>= 3.0, < 6.2) delayed_job_active_record (4.1.6) @@ -730,7 +724,6 @@ DEPENDENCIES coveralls (~> 0.8.23) daemons (~> 1.4.0) dalli (~> 2.7.11) - database_cleaner (~> 2.0.1) delayed_job_active_record (~> 4.1.6) devise (~> 4.8.0) devise-security (~> 0.16.0) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index bdbacaff3..ebcfeacb5 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -1,7 +1,4 @@ -unless Rails.env.test? - require "database_cleaner" - DatabaseCleaner.clean_with :truncation -end +ActiveRecord::Tasks::DatabaseTasks.truncate_all unless Rails.env.test? @logger = Logger.new(STDOUT) @logger.formatter = proc do |_severity, _datetime, _progname, msg| msg unless @avoid_log diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7e84626b4..59c87016a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -45,7 +45,7 @@ RSpec.configure do |config| example.run self.use_transactional_tests = true - DatabaseCleaner.clean_with(:truncation) + ActiveRecord::Tasks::DatabaseTasks.truncate_all Rails.application.load_seed end