minitest 5.24.0 → 5.25.0

data/test/minitest/test_minitest_test.rb

@@ -1,21 +1,18 @@
-# encoding: UTF-8
-
-require "pathname"
 require "minitest/metametameta"
 
-if defined? Encoding then
-  e = Encoding.default_external
-  if e != Encoding::UTF_8 then
-    warn ""
-    warn ""
-    warn "NOTE: External encoding #{e} is not UTF-8. Tests WILL fail."
-    warn "      Run tests with `RUBYOPT=-Eutf-8 rake` to avoid errors."
-    warn ""
-    warn ""
-  end
+e = Encoding.default_external
+if e != Encoding::UTF_8 then
+  warn ""
+  warn ""
+  warn "NOTE: External encoding #{e} is not UTF-8. Tests WILL fail."
+  warn "      Run tests with `RUBYOPT=-Eutf-8 rake` to avoid errors."
+  warn ""
+  warn ""
 end
 
 class Minitest::Runnable
+  attr_reader :gc_stats # only needed if running w/ minitest-gcstats
+
   def whatever # faked for testing
     assert true
   end
@@ -24,10 +21,7 @@ end
 class TestMinitestUnit < MetaMetaMetaTestCase
   parallelize_me!
 
-  pwd = Pathname.new File.expand_path Dir.pwd
-  basedir = Pathname.new(File.expand_path "lib/minitest") + "mini"
-  basedir = basedir.relative_path_from(pwd).to_s
-  MINITEST_BASE_DIR = basedir[/\A\./] ? basedir : "./#{basedir}"
+  MINITEST_BASE_DIR = "./lib/minitest/mini"
   BT_MIDDLE = ["#{MINITEST_BASE_DIR}/test.rb:161:in 'each'",
                "#{MINITEST_BASE_DIR}/test.rb:158:in 'each'",
                "#{MINITEST_BASE_DIR}/test.rb:139:in 'run'",
@@ -49,7 +43,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
     ex = util_expand_bt ex
 
     Minitest::Test.io_lock.synchronize do # try not to trounce in parallel
-      fu = Minitest.filter_backtrace(bt)
+      fu = Minitest.filter_backtrace bt
 
       assert_equal ex, fu
     end
@@ -60,7 +54,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
           BT_MIDDLE +
           ["#{MINITEST_BASE_DIR}/test.rb:29"])
     ex = bt.clone
-    fu = Minitest.filter_backtrace(bt)
+    fu = Minitest.filter_backtrace bt
     assert_equal ex, fu
   end
 
@@ -94,19 +88,19 @@ class TestMinitestUnit < MetaMetaMetaTestCase
       end
 
       def test_this_is_non_ascii_failure_message
-        fail 'ЁЁЁ'.dup.force_encoding(Encoding::BINARY)
+        raise "ЁЁЁ".dup.force_encoding(Encoding::BINARY)
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       FE
 
       Finished in 0.00
 
         1) Failure:
       FakeNamedTestXX#test_this_is_not_ascii_assertion [FILE:LINE]:
-      Expected: \"ЁЁЁ\"
-        Actual: \"ёёё\"
+      Expected: "ЁЁЁ"
+        Actual: "ёёё"
 
         2) Error:
       FakeNamedTestXX#test_this_is_non_ascii_failure_message:
@@ -164,7 +158,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
   end
 
   def util_expand_bt bt
-    bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
+    bt.map { |f| f.start_with?(".") ? File.expand_path(f) : f }
   end
 end
 
@@ -208,15 +202,14 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   def test_class_runnables
     @assertion_count = 0
 
-    tc = Class.new(Minitest::Test)
+    tc = Class.new Minitest::Test
 
     assert_equal 1, Minitest::Test.runnables.size
     assert_equal [tc], Minitest::Test.runnables
   end
 
   def test_run_test
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       attr_reader :foo
 
       def run
@@ -232,7 +225,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -244,8 +237,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_error
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -255,7 +247,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .E
 
       Finished in 0.00
@@ -263,7 +255,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
         1) Error:
       FakeNamedTestXX#test_error:
       RuntimeError: unhandled exception
-          FILE:LINE:in \'test_error\'
+          FILE:LINE:in 'test_error'
 
       2 runs, 1 assertions, 0 failures, 1 errors, 0 skips
     EOM
@@ -272,8 +264,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_error_teardown
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -283,7 +274,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       E
 
       Finished in 0.00
@@ -291,7 +282,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
         1) Error:
       FakeNamedTestXX#test_something:
       RuntimeError: unhandled exception
-          FILE:LINE:in \'teardown\'
+          FILE:LINE:in 'teardown'
 
       1 runs, 1 assertions, 0 failures, 1 errors, 0 skips
     EOM
@@ -302,7 +293,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   def test_run_failing
     setup_basic_tu
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .F
 
       Finished in 0.00
@@ -318,8 +309,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def setup_basic_tu
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -337,7 +327,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   def test_run_failing_filtered
     setup_basic_tu
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -356,14 +346,14 @@ class TestMinitestRunner < MetaMetaMetaTestCase
         assert a
       end
     end
-    Object.const_set(:Alpha, alpha)
+    Object.const_set :Alpha, alpha
 
     beta = Class.new FakeNamedTest do
       define_method :test_something do
         assert true
       end
     end
-    Object.const_set(:Beta, beta)
+    Object.const_set :Beta, beta
 
     @tus = [alpha, beta]
 
@@ -374,7 +364,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_including_suite_name
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -386,7 +376,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_including_suite_name_string
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -398,7 +388,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_string_method_only
-    expected = clean <<-EOM
+    expected = <<~EOM
       ..
 
       Finished in 0.00
@@ -412,7 +402,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   def test_run_failing_excluded
     setup_basic_tu
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -424,7 +414,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_excluding_suite_name
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -436,7 +426,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_excluding_suite_name_string
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -448,7 +438,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_filtered_excluding_string_method_only
-    expected = clean <<-EOM
+    expected = <<~EOM
 
 
       Finished in 0.00
@@ -460,14 +450,13 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_passing
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .
 
       Finished in 0.00
@@ -479,8 +468,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_skip
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -490,7 +478,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .S
 
       Finished in 0.00
@@ -506,8 +494,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_skip_verbose
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -517,7 +504,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       FakeNamedTestXX#test_something = 0.00 s = .
       FakeNamedTestXX#test_skip = 0.00 s = S
 
@@ -534,8 +521,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_skip_show_skips
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -545,7 +531,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       .S
 
       Finished in 0.00
@@ -561,8 +547,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   end
 
   def test_run_with_other_runner
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       def self.run reporter, options = {}
         @reporter = reporter
         before_my_suite
@@ -585,7 +570,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       Running wacky! tests
       ..
 
@@ -634,8 +619,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       main_latch.release
     }
 
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       parallelize_me!
 
       test_count.times do |i|
@@ -652,7 +636,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       end
     end
 
-    expected = clean <<-EOM
+    expected = <<~EOM
       ..
 
       Finished in 0.00
@@ -662,18 +646,18 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
     skip if Minitest.parallel_executor.size < 2 # locks up test runner if 1 CPU
 
-    assert_report(expected) do |reporter|
-      reporter.extend(Module.new {
-        define_method("record") do |result|
+    assert_report expected do |reporter|
+      reporter.extend Module.new {
+        define_method :record do |result|
           super(result)
           wait_latch.release
         end
 
-        define_method("report") do
+        define_method :report do
           wait_latch.await
           super()
         end
-      })
+      }
     end
     assert thread.join
   end
@@ -684,8 +668,8 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
 
   def test_before_setup
     call_order = []
-    @tu =
-    Class.new FakeNamedTest do
+
+    @tu = Class.new FakeNamedTest do
       define_method :setup do
         super()
         call_order << :setup
@@ -700,14 +684,13 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
 
     run_tu_with_fresh_reporter
 
-    expected = [:before_setup, :setup]
+    expected = %i[before_setup setup]
     assert_equal expected, call_order
   end
 
   def test_after_teardown
     call_order = []
-    @tu =
-    Class.new FakeNamedTest do
+    @tu = Class.new FakeNamedTest do
       define_method :teardown do
         super()
         call_order << :teardown
@@ -722,14 +705,14 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
 
     run_tu_with_fresh_reporter
 
-    expected = [:teardown, :after_teardown]
+    expected = %i[teardown after_teardown]
     assert_equal expected, call_order
   end
 
   def test_all_teardowns_are_guaranteed_to_run
     call_order = []
-    @tu =
-    Class.new FakeNamedTest do
+
+    @tu = Class.new FakeNamedTest do
       define_method :after_teardown do
         super()
         call_order << :after_teardown
@@ -753,7 +736,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
 
     run_tu_with_fresh_reporter
 
-    expected = [:before_teardown, :teardown, :after_teardown]
+    expected = %i[before_teardown teardown after_teardown]
     assert_equal expected, call_order
   end
 
@@ -780,7 +763,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
     run_tu_with_fresh_reporter
 
     # Once for the parent class, once for the child
-    expected = [:setup_method, :test, :teardown_method] * 2
+    expected = %i[setup_method test teardown_method] * 2
 
     assert_equal expected, call_order
   end
@@ -813,6 +796,7 @@ class TestMinitestRunnable < Minitest::Test
     new_tc = Marshal.load Marshal.dump @tc
 
     ivars = new_tc.instance_variables.map(&:to_s).sort
+    ivars.delete "@gc_stats" # only needed if running w/ minitest-gcstats
     assert_equal expected_ivars, ivars
     assert_equal "whatever",     new_tc.name
     assert_equal 42,             new_tc.assertions
@@ -876,11 +860,11 @@ class TestMinitestRunnable < Minitest::Test
   end
 
   def test_spec_marshal_with_exception_nameerror
-    klass = describe("whatever") {
-      it("raises nameerror") {
+    klass = describe "whatever" do
+      it "raises NameError" do
         NOPE::does_not_exist
-      }
-    }
+      end
+    end
 
     rm = klass.runnable_methods.first
 
@@ -944,10 +928,9 @@ class TestMinitestRunnable < Minitest::Test
   end
 
   def test_spec_marshal_with_exception__worse_error_typeerror
-    worse_error_klass = Class.new(StandardError) do
-      # problem #1: anonymous subclass can'tmarshal, fails sanitize_exception
-      def initialize(record = nil)
-
+    worse_error_klass = Class.new StandardError do
+      # problem #1: anonymous subclass can't marshal, fails sanitize_exception
+      def initialize record = nil
         super(record.first)
       end
     end
@@ -1004,8 +987,6 @@ class TestMinitestUnitTestCase < Minitest::Test
   # which is not threadsafe. Nearly every method in here is an
   # assertion test so it isn't worth splitting it out further.
 
-  RUBY18 = !defined? Encoding
-
   def setup
     super
 
@@ -1030,7 +1011,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     $VERBOSE = orig_verbose
   end
 
-  def sample_test_case(rand)
+  def sample_test_case rand
     srand rand
     Class.new FakeNamedTest do
       100.times do |i|
@@ -1089,21 +1070,21 @@ class TestMinitestUnitTestCase < Minitest::Test
 
   def test_autorun_does_not_affect_fork_success_status
     @assertion_count = 0
-    skip "windows doesn't have fork" unless Process.respond_to?(:fork)
+    skip "windows doesn't have fork" unless Process.respond_to? :fork
     Process.waitpid(fork {})
     assert_equal true, $?.success?
   end
 
   def test_autorun_does_not_affect_fork_exit_status
     @assertion_count = 0
-    skip "windows doesn't have fork" unless Process.respond_to?(:fork)
+    skip "windows doesn't have fork" unless Process.respond_to? :fork
     Process.waitpid(fork { exit 42 })
     assert_equal 42, $?.exitstatus
   end
 
   def test_autorun_optionally_can_affect_fork_exit_status
     @assertion_count = 0
-    skip "windows doesn't have fork" unless Process.respond_to?(:fork)
+    skip "windows doesn't have fork" unless Process.respond_to? :fork
     Minitest.allow_fork = true
     Process.waitpid(fork { exit 42 })
     refute_equal 42, $?.exitstatus
@@ -1179,7 +1160,7 @@ class TestMinitestUnitRecording < MetaMetaMetaTestCase
     bogus_reporter = Class.new do      # doesn't subclass AbstractReporter
       def start; @success = false; end
       # def prerecord klass, name; end # doesn't define full API
-      def record result; @success = true; end
+      def record _result; @success = true; end
       def report; end
       def passed?; end
       def results; end
@@ -1257,7 +1238,7 @@ class TestMinitestUnitRecording < MetaMetaMetaTestCase
 
     run_tu_with_fresh_reporter
 
-    exp = clean "
+    exp = <<~EOM
       Error:
       FakeNamedTestXX#test_method:
       AnError: AnError
@@ -1267,7 +1248,7 @@ class TestMinitestUnitRecording < MetaMetaMetaTestCase
       FakeNamedTestXX#test_method:
       RuntimeError: unhandled exception
           FILE:LINE:in 'teardown'
-    "
+    EOM
 
     assert_equal exp.strip, normalize_output(first_reporter.results.first.to_s).strip
   end

data/test/minitest/test_minitest_test_task.rb

@@ -14,11 +14,16 @@ Hoe.load_plugins # make sure Hoe::Test is loaded
 class TestHoeTest < Minitest::Test
   PATH = "test/minitest/test_minitest_test_task.rb"
 
-  mt_path = %w[lib test .].join File::PATH_SEPARATOR
+  def util_cmd_string *prelude_framework
+    mt_path = %w[lib test .].join File::PATH_SEPARATOR
+    mt_expected = "-I%s -w -e '%srequire %p' -- "
 
-  MT_EXPECTED = %W[-I#{mt_path} -w
-                   -e '%srequire "#{PATH}"'
-                   --].join(" ") + " "
+    mt_expected % [mt_path, prelude_framework.join("; "), PATH]
+  end
+
+  def util_exp_cmd
+    @tester.make_test_cmd.sub(/ -- .+/, " -- ")
+  end
 
   def test_make_test_cmd_for_minitest
     skip "Using TESTOPTS... skipping" if ENV["TESTOPTS"]
@@ -31,8 +36,7 @@ class TestHoeTest < Minitest::Test
       t.test_globs = [PATH]
     end
 
-    assert_equal MT_EXPECTED % [framework].join("; "), @tester.make_test_cmd
-      .sub(/ -- .+/, " -- ")
+    assert_equal util_cmd_string(framework), util_exp_cmd
   end
 
   def test_make_test_cmd_for_minitest_prelude
@@ -48,7 +52,6 @@ class TestHoeTest < Minitest::Test
       t.test_globs = [PATH]
     end
 
-    assert_equal MT_EXPECTED % [prelude, framework].join("; "), @tester.make_test_cmd
-      .sub(/ -- .+/, " -- ")
+    assert_equal util_cmd_string(prelude, framework), util_exp_cmd
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.24.0
+  version: 5.25.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
   deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: minitest provides a complete suite of testing facilities supporting TDD,