Remove support for Rails 6.1. 6.1 is now EOL.

Shopify · Jan 22, 2025 · 81cf45a · 81cf45a
1 parent c95d481
commit 81cf45a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 53 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         gemfile:
-        - gemfiles/rails_6_1.gemfile
         - gemfiles/rails_7_0.gemfile
         - gemfiles/rails_7_1.gemfile
         - gemfiles/rails_7_2.gemfile

diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem "debug"
 gem "mocha"
 gem "puma"
 if !@rails_gem_requirement
-  gem "rails", ">= 6.1"
+  gem "rails", ">= 7.0"
   ruby ">= 3.2.0"
 else
   # causes Dependabot to ignore the next line and update the previous gem "rails"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,12 +2,12 @@ PATH
   remote: .
   specs:
     maintenance_tasks (2.10.1)
-      actionpack (>= 6.1)
-      activejob (>= 6.1)
-      activerecord (>= 6.1)
+      actionpack (>= 7.0)
+      activejob (>= 7.0)
+      activerecord (>= 7.0)
       csv
       job-iteration (>= 1.3.6)
-      railties (>= 6.1)
+      railties (>= 7.0)
       zeitwerk (>= 2.6.2)
 
 GEM
@@ -287,7 +287,7 @@ DEPENDENCIES
   maintenance_tasks!
   mocha
   puma
-  rails (>= 6.1)
+  rails (>= 7.0)
   rubocop
   rubocop-shopify
   selenium-webdriver

diff --git a/app/models/maintenance_tasks/run.rb b/app/models/maintenance_tasks/run.rb
@@ -33,11 +33,7 @@ class Run < ApplicationRecord
     ]
     COMPLETED_STATUSES = [:succeeded, :errored, :cancelled]
 
-    if Rails.gem_version >= Gem::Version.new("7.0.alpha")
-      enum :status, STATUSES.to_h { |status| [status, status.to_s] }
-    else
-      enum status: STATUSES.to_h { |status| [status, status.to_s] }
-    end
+    enum :status, STATUSES.to_h { |status| [status, status.to_s] }
 
     after_save :instrument_status_change
 

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
diff --git a/lib/maintenance_tasks.rb b/lib/maintenance_tasks.rb
@@ -8,8 +8,6 @@
 require "job-iteration"
 require "maintenance_tasks/engine"
 
-require "patches/active_record_batch_enumerator"
-
 # The engine's namespace module. It provides isolation between the host
 # application's code and the engine-specific code. Top-level engine constants
 # and variables are defined under this module.

diff --git a/lib/patches/active_record_batch_enumerator.rb b/lib/patches/active_record_batch_enumerator.rb
diff --git a/maintenance_tasks.gemspec b/maintenance_tasks.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = ["maintenance_tasks"]
 
-  minimum_rails_version = "6.1"
+  minimum_rails_version = "7.0"
   spec.add_dependency("actionpack", ">= #{minimum_rails_version}")
   spec.add_dependency("activejob", ">= #{minimum_rails_version}")
   spec.add_dependency("activerecord", ">= #{minimum_rails_version}")

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -11,14 +11,7 @@
 # warning in Ruby 2.7.
 Capybara::Selenium::Driver.load_selenium
 
-if Rails::VERSION::MAJOR < 7
-  Selenium::WebDriver.logger.ignore(:browser_options)
-  if Rails::VERSION::MINOR < 1
-    require "action_dispatch/system_testing/browser"
-    # prevent Rails from adding --headless at the end of the arguments, overriding --headless=new
-    ActionDispatch::SystemTesting::Browser.redefine_method(:options) { capabilities }
-  end
-elsif Rails.gem_version < Gem::Version.new("7.1")
+if Rails.gem_version < Gem::Version.new("7.1")
   Selenium::WebDriver.logger.ignore(:capabilities)
 end