diff --git a/Gemfile b/Gemfile index a78d485c9..2236dbb9d 100644 --- a/Gemfile +++ b/Gemfile @@ -160,7 +160,6 @@ end group :test do gem "approvals", "~> 0.0" # A library to make it easier to do golden-master style testing in Ruby - gem "database_cleaner-active_record", "~> 2.0.0", require: false # Strategies for cleaning databases using ActiveRecord. Can be used to ensure a clean state for testing. gem "exifr", ">= 1.3.6" # EXIF Reader is a module to read EXIF from JPEG and TIFF images gem "factory_bot_rails", "~> 6.1" # factory_bot is a fixtures replacement with a straightforward definition syntax, support for multiple build strategies gem "launchy", "~> 2.5" # Launchy is helper class for launching cross-platform applications in a fire and forget manner. diff --git a/Gemfile.lock b/Gemfile.lock index b6b69d083..b5806bc63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,10 +219,6 @@ GEM puma (>= 3.8.0) railties (>= 5.2.0) dante (0.2.0) - database_cleaner-active_record (2.0.0) - activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) - database_cleaner-core (2.0.0) ddtrace (0.46.0) msgpack dead_end (1.1.4) @@ -908,7 +904,6 @@ DEPENDENCIES cloudinary (~> 1.19) counter_culture (~> 2.8) cypress-rails (~> 0.4.2) - database_cleaner-active_record (~> 2.0.0) ddtrace (~> 0.46.0) derailed_benchmarks (~> 2.0) devise! diff --git a/spec/services/feeds/import_spec.rb b/spec/services/feeds/import_spec.rb index d8cc3d55c..22ee42ff2 100644 --- a/spec/services/feeds/import_spec.rb +++ b/spec/services/feeds/import_spec.rb @@ -1,8 +1,6 @@ require "rails_helper" -RSpec.describe Feeds::Import, type: :service, vcr: true, db_strategy: :truncation do - self.use_transactional_tests = false - +RSpec.describe Feeds::Import, type: :service, vcr: true do let(:link) { "https://medium.com/feed/@vaidehijoshi" } let(:nonmedium_link) { "https://circleci.com/blog/feed.xml" } let(:nonpermanent_link) { "https://medium.com/feed/@macsiri/" } diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb deleted file mode 100644 index 71de1056e..000000000 --- a/spec/support/database_cleaner.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "database_cleaner-active_record" - -RSpec.configure do |config| - config.after(:each, db_strategy: :truncation) do |_example| - DatabaseCleaner.clean_with(:truncation) - end -end diff --git a/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb b/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb index c91003afb..a1403738a 100644 --- a/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb +++ b/spec/system/dashboards/user_sorts_dashboard_articles_spec.rb @@ -1,8 +1,6 @@ require "rails_helper" -RSpec.describe "Sorting Dashboard Articles", type: :system, js: true, db_strategy: :truncation do - self.use_transactional_tests = false - +RSpec.describe "Sorting Dashboard Articles", type: :system, js: true do let(:user) { create(:user) } let(:article1) do create(:article, user_id: user.id, published_at: 10.minutes.ago, created_at: 1.day.ago, public_reactions_count: 5, diff --git a/vendor/cache/database_cleaner-active_record-2.0.0.gem b/vendor/cache/database_cleaner-active_record-2.0.0.gem deleted file mode 100644 index af0b6f7fd..000000000 Binary files a/vendor/cache/database_cleaner-active_record-2.0.0.gem and /dev/null differ diff --git a/vendor/cache/database_cleaner-core-2.0.0.gem b/vendor/cache/database_cleaner-core-2.0.0.gem deleted file mode 100644 index 174cdfd0f..000000000 Binary files a/vendor/cache/database_cleaner-core-2.0.0.gem and /dev/null differ