Use Minitest 6 where applicable (#3859)

MSP-Greg · web-flow · commit 21afa66798c4 · 2026-01-16T15:55:07.000-06:00
* ci: Gemfile & helper.rb - update minitest & add minitest-mock Update helper.rb * More updates * Update helper.rb * Update runner * helper.rb - fixup `prove_it!` per Ryan (@zenspider)
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem "rake-compiler"
 
 gem "json", "~> 2.18"
 gem "nio4r", "~> 2.7"
-gem "minitest", '>= 5.26.1', '< 6.0.0'
+gem "minitest", ">= 5.26"
 gem "minitest-retry"
 gem "minitest-proveit"
 gem "minitest-stub-const"
diff --git a/test/helper.rb b/test/helper.rb
@@ -10,16 +10,15 @@
 
 require "securerandom"
 
-# needs to be loaded before minitest for Ruby 2.7 and earlier
-require_relative "helpers/test_puma/assertions"
-
 require_relative "minitest/verbose"
 require "minitest/autorun"
 require "minitest/pride"
 require "minitest/proveit"
 require "minitest/stub_const"
+require "minitest/mock" unless defined?(::Minitest::Mock)
 require "net/http"
 require_relative "helpers/apps"
+require_relative "helpers/test_puma/assertions"
 
 Thread.abort_on_exception = true
 
@@ -97,12 +96,6 @@ def capture_exceptions
 
 Minitest::Test.prepend TimeoutPrepend
 
-class PumaTest < Minitest::Test # rubocop:disable Puma/TestsMustUsePumaTest
-  def teardown
-    clean_tmp_paths if respond_to? :clean_tmp_paths
-  end
-end
-
 if ENV['CI']
   require 'minitest/retry'
 
@@ -212,22 +205,6 @@ def skip_unless(eng, bt: caller)
   end
 end
 
-Minitest::Test.include TestSkips
-
-class Minitest::Test
-
-  PROJECT_ROOT = File.dirname(__dir__)
-
-  def self.run(reporter, options = {}) # :nodoc:
-    prove_it!
-    super
-  end
-
-  def full_name
-    "#{self.class.name}##{name}"
-  end
-end
-
 Minitest.after_run do
   if ENV['PUMA_TEST_DEBUG']
     $debugging_info.sort!
@@ -309,7 +286,6 @@ def tempfile_create(basename, data, mode: File::BINARY)
     fio
   end
 end
-Minitest::Test.include TestTempFile
 
 # This module is modified based on https://github.com/rails/rails/blob/7-1-stable/activesupport/lib/active_support/testing/method_call_assertions.rb
 module MethodCallAssertions
@@ -340,4 +316,22 @@ def assert_not_called_on_instance_of(klass, method_name, message = nil, &block)
     assert_called_on_instance_of(klass, method_name, message, times: 0, &block)
   end
 end
-Minitest::Test.include MethodCallAssertions
+
+class PumaTest < Minitest::Test # rubocop:disable Puma/TestsMustUsePumaTest
+  include MethodCallAssertions
+  include TestPuma::Assertions
+  include TestSkips
+  include TestTempFile
+
+  prove_it!
+
+  PROJECT_ROOT = File.dirname(__dir__)
+
+  def teardown
+    clean_tmp_paths if respond_to? :clean_tmp_paths
+  end
+
+  def full_name
+    "#{self.class.name}##{name}"
+  end
+end
diff --git a/test/runner b/test/runner
@@ -51,6 +51,8 @@ if show_warnings
   $VERBOSE = true
 end
 
+require 'minitest'
+
 if ARGV.empty? || ARGV.last.start_with?('-')
   Dir['test_*.rb', base: __dir__].sort.each { |tf| require_relative tf }
 else
@@ -78,5 +80,4 @@ if show_warnings
 end
 exit 1 if no_tests
 
-require 'minitest'
 STDOUT.write "Minitest version: #{Minitest::VERSION}\n\n"
