From 5d30409c22fd23f1dc778fb2763aea90b5ca73dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 02:29:17 +0000 Subject: [PATCH 1/3] Bump minitest from 5.27.0 to 6.0.1 Bumps [minitest](https://github.com/minitest/minitest) from 5.27.0 to 6.0.1. - [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc) - [Commits](https://github.com/minitest/minitest/compare/v5.27.0...v6.0.1) --- updated-dependencies: - dependency-name: minitest dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 10a8e068d..a4e114ab7 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gemspec CURRENT_RAILS_VERSION = "8.1" rails_version = ENV.fetch("RAILS_VERSION", CURRENT_RAILS_VERSION) -gem "minitest", "< 6.0" # Rails 8.1.1 doesn't support minitest 6.0 which causes errors +gem "minitest", "< 7.0" # Rails 8.1.1 doesn't support minitest 6.0 which causes errors gem "minitest-hooks" gem "minitest-reporters" gem "debug" diff --git a/Gemfile.lock b/Gemfile.lock index 9ace601a2..d9d95e620 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,8 +213,8 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - mini_portile2 (2.8.9) - minitest (5.27.0) + minitest (6.0.1) + prism (~> 1.5) minitest-hooks (1.5.3) minitest (> 5.3) minitest-reporters (1.7.1) @@ -381,8 +381,6 @@ GEM concurrent-ruby (~> 1.0) logger rack (>= 2.2.4, < 4) - sqlite3 (2.5.0) - mini_portile2 (~> 2.8.0) sqlite3 (2.5.0-aarch64-linux-gnu) sqlite3 (2.5.0-aarch64-linux-musl) sqlite3 (2.5.0-arm64-darwin) @@ -444,7 +442,7 @@ DEPENDENCIES json_api_client! kramdown (~> 2.5) kredis - minitest (< 6.0) + minitest (< 7.0) minitest-hooks minitest-reporters mutex_m From eb04d94f7855fc6334d378cfcd3de4d2609700cc Mon Sep 17 00:00:00 2001 From: Alexander Momchilov Date: Fri, 9 Jan 2026 13:17:51 -0500 Subject: [PATCH 2/3] bundle install To put back `sqlite3` and `mini_portile2` --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index d9d95e620..760326bcf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,6 +213,7 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) + mini_portile2 (2.8.9) minitest (6.0.1) prism (~> 1.5) minitest-hooks (1.5.3) @@ -381,6 +382,8 @@ GEM concurrent-ruby (~> 1.0) logger rack (>= 2.2.4, < 4) + sqlite3 (2.5.0) + mini_portile2 (~> 2.8.0) sqlite3 (2.5.0-aarch64-linux-gnu) sqlite3 (2.5.0-aarch64-linux-musl) sqlite3 (2.5.0-arm64-darwin) From 6efbfb779ca0be9da456745b2674ff937a972370 Mon Sep 17 00:00:00 2001 From: Alexander Momchilov Date: Fri, 9 Jan 2026 13:25:15 -0500 Subject: [PATCH 3/3] [Experiment] Use older Minitest for older Rails versions --- Gemfile | 16 +++++++- Gemfile.lock | 108 +++++++++++++++++++++++++-------------------------- 2 files changed, 68 insertions(+), 56 deletions(-) diff --git a/Gemfile b/Gemfile index a4e114ab7..3b744c58c 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,6 @@ gemspec CURRENT_RAILS_VERSION = "8.1" rails_version = ENV.fetch("RAILS_VERSION", CURRENT_RAILS_VERSION) -gem "minitest", "< 7.0" # Rails 8.1.1 doesn't support minitest 6.0 which causes errors gem "minitest-hooks" gem "minitest-reporters" gem "debug" @@ -25,9 +24,22 @@ end group :development, :test do if rails_version == "main" gem "rails", github: "rails/rails", branch: "main" + gem "minitest", "< 7.0" else rails_version = CURRENT_RAILS_VERSION if rails_version == "current" - gem "rails", "~> #{rails_version}.0" + + if rails_version == "8.1" + rails_version = "8.1.2" + gem "rails", "~> 8.1.2" # Fixes support for Minitest 6.0 + else + gem "rails", "~> #{rails_version}.0" + end + + if Gem::Version.new(rails_version) < Gem::Version.new("8.1.2") + gem "minitest", "< 6.0" # Don't use Minitest 6 for Rails versions older than 8.1.2 + else + gem "minitest", "< 7.0" # Rails 8.1.1 doesn't support minitest 6.0 which causes errors + end end gem "sqlite3" diff --git a/Gemfile.lock b/Gemfile.lock index 760326bcf..624a86f39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,29 +34,29 @@ GEM concurrent-ruby (~> 1.0) action_text-trix (2.1.16) railties - actioncable (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + actioncable (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionmailbox (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) - actionmailer (8.1.1) - actionpack (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activesupport (= 8.1.1) + actionmailer (8.1.2) + actionpack (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activesupport (= 8.1.2) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.1) - actionview (= 8.1.1) - activesupport (= 8.1.1) + actionpack (8.1.2) + actionview (= 8.1.2) + activesupport (= 8.1.2) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -64,32 +64,32 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.1) + actiontext (8.1.2) action_text-trix (~> 2.1.15) - actionpack (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + actionpack (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.1) - activesupport (= 8.1.1) + actionview (8.1.2) + activesupport (= 8.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (8.1.1) - activesupport (= 8.1.1) + activejob (8.1.2) + activesupport (= 8.1.2) globalid (>= 0.3.6) - activemodel (8.1.1) - activesupport (= 8.1.1) + activemodel (8.1.2) + activesupport (= 8.1.2) activemodel-serializers-xml (1.0.3) activemodel (>= 5.0.0.a) activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (8.1.1) - activemodel (= 8.1.1) - activesupport (= 8.1.1) + activerecord (8.1.2) + activemodel (= 8.1.2) + activesupport (= 8.1.2) timeout (>= 0.4.0) activerecord-typedstore (1.6.0) activerecord (>= 6.1) @@ -97,13 +97,13 @@ GEM activemodel (>= 7.0) activemodel-serializers-xml (~> 1.0) activesupport (>= 7.0) - activestorage (8.1.1) - actionpack (= 8.1.1) - activejob (= 8.1.1) - activerecord (= 8.1.1) - activesupport (= 8.1.1) + activestorage (8.1.2) + actionpack (= 8.1.2) + activejob (= 8.1.2) + activerecord (= 8.1.2) + activesupport (= 8.1.2) marcel (~> 1.0) - activesupport (8.1.1) + activesupport (8.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -271,20 +271,20 @@ GEM rack (>= 1.3) rackup (2.3.1) rack (>= 3) - rails (8.1.1) - actioncable (= 8.1.1) - actionmailbox (= 8.1.1) - actionmailer (= 8.1.1) - actionpack (= 8.1.1) - actiontext (= 8.1.1) - actionview (= 8.1.1) - activejob (= 8.1.1) - activemodel (= 8.1.1) - activerecord (= 8.1.1) - activestorage (= 8.1.1) - activesupport (= 8.1.1) + rails (8.1.2) + actioncable (= 8.1.2) + actionmailbox (= 8.1.2) + actionmailer (= 8.1.2) + actionpack (= 8.1.2) + actiontext (= 8.1.2) + actionview (= 8.1.2) + activejob (= 8.1.2) + activemodel (= 8.1.2) + activerecord (= 8.1.2) + activestorage (= 8.1.2) + activesupport (= 8.1.2) bundler (>= 1.15.0) - railties (= 8.1.1) + railties (= 8.1.2) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -292,9 +292,9 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.1.1) - actionpack (= 8.1.1) - activesupport (= 8.1.1) + railties (8.1.2) + actionpack (= 8.1.2) + activesupport (= 8.1.2) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -450,7 +450,7 @@ DEPENDENCIES minitest-reporters mutex_m nokogiri - rails (~> 8.1.0) + rails (~> 8.1.2) rake rubocop-rspec rubocop-shopify