From f78425022c132fcfadae01b157e5b08750d2f5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20V=C3=A1squez?= <jvasquez@navigatingcancer.com>
Date: Fri, 10 Jul 2026 13:10:32 -0600
Subject: [PATCH] Update minitest 5.27.0 -> 6.0.6 (add minitest-mock for the
 6.0 split)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes the deliberate `< 6` pin and moves to minitest 6.0.6. minitest 6.0
extracted minitest/mock into a separate minitest-mock gem, and this suite
uses it (`require "minitest/mock"` + `.stub` in gemfile_test.rb and
bundler_audit_database_preparer_test.rb), so minitest-mock is added explicitly
— exactly the split the old pin's comment anticipated.

Both lockfiles updated; --conservative kept rack at 2.x.

Verified locally: minitest 6.0.6 does not ship mock.rb; minitest-mock supplies
it; full suite green (16 runs, 53 assertions, 0 failures) with the .stub-based
tests passing; boots; rubocop + reek clean.
---
 Gemfile           | 10 +++++-----
 Gemfile.lock      |  8 ++++++--
 Gemfile.next.lock |  8 ++++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 35bd6cc..414fbae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,11 +30,11 @@ gem "ostruct"
 # in 1.3.7.
 gem "concurrent-ruby", ">= 1.3.7"
 gem "puma", "~> 8.0"
-# minitest 6.0 dropped minitest/mock.rb into a separate minitest-mock gem;
-# pinned below 6 so a transitive bump (e.g. via `bundle update rails`)
-# doesn't silently drag the test suite's own framework across a major
-# version as collateral.
-gem "minitest", "< 6"
+# minitest 6.0 moved minitest/mock into a separate minitest-mock gem. The test
+# suite uses it (`require "minitest/mock"` + `.stub`), so it's declared
+# explicitly now that we're on minitest 6.
+gem "minitest"
+gem "minitest-mock"
 gem "nokogiri", ">= 1.13.0"
 gem "sass-rails", "~> 6.0"
 gem "terser"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4242bdd..26b2ddf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -223,7 +223,10 @@ GEM
     mime-types-data (3.2026.0701)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.27.0)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    minitest-mock (5.27.0)
     net-imap (0.6.4.1)
       date
       net-protocol
@@ -428,7 +431,8 @@ DEPENDENCIES
   fastruby-styleguide!
   kt-paperclip (~> 8.0.0)
   listen (>= 3.5)
-  minitest (< 6)
+  minitest
+  minitest-mock
   next_rails
   nokogiri (>= 1.13.0)
   ostruct
diff --git a/Gemfile.next.lock b/Gemfile.next.lock
index 4242bdd..26b2ddf 100644
--- a/Gemfile.next.lock
+++ b/Gemfile.next.lock
@@ -223,7 +223,10 @@ GEM
     mime-types-data (3.2026.0701)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.27.0)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    minitest-mock (5.27.0)
     net-imap (0.6.4.1)
       date
       net-protocol
@@ -428,7 +431,8 @@ DEPENDENCIES
   fastruby-styleguide!
   kt-paperclip (~> 8.0.0)
   listen (>= 3.5)
-  minitest (< 6)
+  minitest
+  minitest-mock
   next_rails
   nokogiri (>= 1.13.0)
   ostruct