minitest 5.25.1 → 5.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791576b6d19fd427617c1e5c02a7ddf55f3d214e75bdeeda4ec5ccb49bbad5d2
-  data.tar.gz: 95a6dccbd1cc86bf047b82e88725d50d0dd03dab9f1f6db0a02aad13f1398f10
+  metadata.gz: a27292f346c716aae8b4a43bcb3297cb71155663c66b60e4f2db2713fb38ba21
+  data.tar.gz: 61e9d14ed5c142a0e16a185137f7ed2e7fd0703975232ebbaa3b0b98283045cd
 SHA512:
-  metadata.gz: acde5c1dc093da1b6749b4e328fe5e0b86ba34c081b3d6e667165f8811ea3565774570e73216d67f8c337b5e3999193b2709a50bd69e0dc62ed211b86d087cb9
-  data.tar.gz: ee2390a10ef3ce15c17fef8d8387ff38509ac7c5bf9fd0bcbb1b6c160592821b268d713c0dc8c7357ddeaefb8ca08d0a04d96501c064e0c4f4781f7b3612bbb8
+  metadata.gz: 35c6a79d2bb013e251f4a216e28c7170170691669f4a31eb65d6c078bfeafba31992631c1f6071511a81ac510a8abc93cdb6dfeefa8a9a988f33abcb0d9c6ed9
+  data.tar.gz: ceb3c98cfa67aa52743f2a197dacf19175d7eb68b32401a54d55212714f2700132349a01189b050865002c95840845f95d3f73c423ebf383c8e4f0250ddb764e

data/History.rdoc

@@ -1,3 +1,22 @@
+=== 5.25.3 / 2024-12-03
+
+* 5 bug fixes:
+
+  * Fixed assert_mock to fail instead of raise on unmet mock expectations.
+  * Fixed assert_mock to take an optional message argument.
+  * Fixed formatting of unmet mock expectation messages.
+  * Fixed missing must_verify expectation to match assert_mock.
+  * minitest/pride: Fixed to use true colors with *-direct terminals (bk2204)
+
+=== 5.25.2 / 2024-11-21
+
+* 4 bug fixes:
+
+  * Include class name in spec name. (thomasmarshall)
+  * Fixed 'redefining object_id' warning from ruby 3.4. (mattbrictson)
+  * Minitest top-level namespace no longer includes entire contents of README.rdoc. Too much!
+  * Refactored spec's describe to more cleanly determine the superclass and name
+
 === 5.25.1 / 2024-08-16
 
 * 2 bug fixes:

data/lib/minitest/mock.rb

@@ -30,6 +30,7 @@ module Minitest # :nodoc:
     end
 
     overridden_methods.map(&:to_sym).each do |method_id|
+      old_w, $-w = $-w, nil
       define_method method_id do |*args, **kwargs, &b|
         if @expected_calls.key? method_id then
           if kwargs.empty? then # FIX: drop this after 2.7 dead
@@ -45,6 +46,8 @@ module Minitest # :nodoc:
           end
         end
       end
+    ensure
+      $-w = old_w
     end
 
     def initialize delegator = nil # :nodoc:
@@ -142,8 +145,8 @@ module Minitest # :nodoc:
     def verify
       @expected_calls.each do |name, expected|
         actual = @actual_calls.fetch name, nil # defaults to []
-        raise MockExpectationError, "expected #{__call name, expected[0]}" unless actual
-        raise MockExpectationError, "expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
+        raise MockExpectationError, "Expected #{__call name, expected[0]}" unless actual
+        raise MockExpectationError, "Expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
           actual.size < expected.size
       end
       true
@@ -245,13 +248,27 @@ end
 
 module Minitest::Assertions
   ##
-  # Assert that the mock verifies correctly.
+  # Assert that the mock verifies correctly and fail if not.
 
-  def assert_mock mock
+  def assert_mock mock, msg = nil
     assert mock.verify
+  rescue MockExpectationError => e
+    msg = message(msg) { e.message }
+    flunk msg
   end
 end
 
+module Minitest::Expectations
+  ##
+  # See Minitest::Assertions#assert_mock.
+  #
+  #    _(collection).must_verify
+  #
+  # :method: must_verify
+
+  infect_an_assertion :assert_mock, :must_verify, :unary
+end
+
 ##
 # Object extensions for Minitest::Mock.
 

data/lib/minitest/pride_plugin.rb

@@ -10,7 +10,7 @@ module Minitest
   def self.plugin_pride_init options # :nodoc:
     return unless PrideIO.pride?
 
-    klass = ENV["TERM"] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
+    klass = ENV["TERM"] =~ /^xterm|-(?:256color|direct)$/ ? PrideLOL : PrideIO
     io    = klass.new options[:io]
 
     self.reporter.reporters.grep(Minitest::Reporter).each do |rep|

data/lib/minitest/spec.rb

@@ -81,14 +81,15 @@ module Kernel
 
   def describe desc, *additional_desc, &block # :doc:
     stack = Minitest::Spec.describe_stack
-    name  = [stack.last, desc, *additional_desc].compact.join("::")
-    sclas = stack.last || if Class === self && kind_of?(Minitest::Spec::DSL) then
-                            self
-                          else
-                            Minitest::Spec.spec_type desc, *additional_desc
-                          end
-
-    cls = sclas.create name, desc
+    is_spec_class = Class === self && kind_of?(Minitest::Spec::DSL)
+    name  = [stack.last, desc, *additional_desc]
+    name.prepend self if stack.empty? && is_spec_class
+    sclas =
+      stack.last                 \
+      || (is_spec_class && self) \
+      || Minitest::Spec.spec_type(desc, *additional_desc)
+
+    cls = sclas.create name.compact.join("::"), desc
 
     stack.push cls
     cls.class_eval(&block)

data/lib/minitest.rb

@@ -6,10 +6,11 @@ require_relative "minitest/parallel"
 require_relative "minitest/compress"
 
 ##
-# :include: README.rdoc
+# The top-level namespace for Minitest. Also the location of the main
+# runtime. See +Minitest.run+ for more information.
 
 module Minitest
-  VERSION = "5.25.1" # :nodoc:
+  VERSION = "5.25.3" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []

data/test/minitest/test_minitest_mock.rb

@@ -26,7 +26,7 @@ class TestMinitestMock < Minitest::Test
   def test_blow_up_if_not_called
     @mock.foo
 
-    util_verify_bad "expected meaning_of_life() => 42"
+    util_verify_bad "Expected meaning_of_life() => 42"
   end
 
   def test_not_blow_up_if_everything_called
@@ -46,7 +46,7 @@ class TestMinitestMock < Minitest::Test
     @mock.meaning_of_life
     @mock.expect :bar, true
 
-    util_verify_bad "expected bar() => true"
+    util_verify_bad "Expected bar() => true"
   end
 
   def test_blow_up_on_wrong_number_of_arguments
@@ -184,6 +184,73 @@ class TestMinitestMock < Minitest::Test
     assert @mock == 1, "didn't mock :=="
   end
 
+  def test_assert_mock__pass
+    mock = Minitest::Mock.new
+    mock.expect :loose_expectation, true, [Integer]
+    mock.loose_expectation 1
+
+    result = assert_mock mock
+
+    assert_equal true, result
+  end
+
+  def assert_bad_mock klass, msg
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, [:bar]
+    mock.expect :foo, nil, [:baz]
+
+    mock.foo :bar
+
+    e = assert_raises klass do
+      yield mock
+    end
+
+    assert_equal msg, e.message
+  end
+
+  def test_verify__error
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
+    assert_bad_mock MockExpectationError, exp do |mock|
+      mock.verify
+    end
+  end
+
+  def test_assert_mock__fail
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      assert_mock mock
+    end
+  end
+
+  def test_assert_mock__fail_msg
+    exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      assert_mock mock, "BLAH"
+    end
+  end
+
+  def test_assert_mock__fail_exp
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      describe "X" do
+        it "y" do
+          _(mock).must_verify
+        end
+      end.new(:blah).send(:test_0001_y)
+    end
+  end
+
+  def test_assert_mock__fail_exp_msg
+    exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      describe "X" do
+        it "y" do
+          _(mock).must_verify "BLAH"
+        end
+      end.new(:blah).send(:test_0001_y)
+    end
+  end
+
   def test_verify_allows_called_args_to_be_loosely_specified
     mock = Minitest::Mock.new
     mock.expect :loose_expectation, true, [Integer]
@@ -238,7 +305,7 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(:baz) => nil, got [foo(:bar) => nil]"
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
 
     assert_equal exp, e.message
   end
@@ -252,7 +319,7 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(:bar) => nil, got [foo(:bar) => nil]"
+    exp = "Expected foo(:bar) => nil, got [foo(:bar) => nil]"
 
     assert_equal exp, e.message
   end
@@ -276,7 +343,7 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(%p) => nil, got [foo(%p) => nil]" \
+    exp = "Expected foo(%p) => nil, got [foo(%p) => nil]" \
       % [{ :kw => false }, { :kw => true  }]
 
     assert_equal exp.delete("{}"), e.message

data/test/minitest/test_minitest_reporter.rb

@@ -2,7 +2,7 @@ require "minitest/autorun"
 require "minitest/metametameta"
 require "forwardable"
 
-class Runnable
+class FakeTest < Minitest::Test
   def woot
     assert true
   end
@@ -33,7 +33,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
   def error_test
     unless defined? @et then
-      @et = Minitest::Test.new :woot
+      @et = FakeTest.new :woot
       @et.failures << Minitest::UnexpectedError.new(begin
                                                       raise "no"
                                                     rescue => e
@@ -56,7 +56,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
       ex.set_backtrace ary
 
-      @sse = Minitest::Test.new :woot
+      @sse = FakeTest.new :woot
       @sse.failures << Minitest::UnexpectedError.new(ex)
       @sse = Minitest::Result.from @sse
     end
@@ -65,7 +65,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
   def fail_test
     unless defined? @ft then
-      @ft = Minitest::Test.new :woot
+      @ft = FakeTest.new :woot
       @ft.failures <<   begin
                           raise Minitest::Assertion, "boo"
                         rescue Minitest::Assertion => e
@@ -77,18 +77,18 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def passing_test
-    @pt ||= Minitest::Result.from Minitest::Test.new(:woot)
+    @pt ||= Minitest::Result.from FakeTest.new(:woot)
   end
 
   def passing_test_with_metadata
-    test = Minitest::Test.new :woot
+    test = FakeTest.new :woot
     test.metadata[:meta] = :data
     @pt ||= Minitest::Result.from test
   end
 
   def skip_test
     unless defined? @st then
-      @st = Minitest::Test.new :woot
+      @st = FakeTest.new :woot
       @st.failures << begin
                         raise Minitest::Skip
                       rescue Minitest::Assertion => e
@@ -294,7 +294,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Failure:
-      Minitest::Test#woot [FILE:LINE]:
+      FakeTest#woot [FILE:LINE]:
       boo
 
       1 runs, 0 assertions, 1 failures, 0 errors, 0 skips
@@ -318,7 +318,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      Minitest::Test#woot:
+      FakeTest#woot:
       RuntimeError: no
           FILE:LINE:in 'error_test'
           FILE:LINE:in 'test_report_error'
@@ -344,7 +344,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      Minitest::Test#woot:
+      FakeTest#woot:
       SystemStackError: 274 -> 12
           a
           b
@@ -402,7 +402,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       r.report
     end
 
-    exp = "Minitest::Test#woot [foo.rb:123]"
+    exp = "FakeTest#woot [foo.rb:123]"
 
     assert_includes io.string, exp
   end

data/test/minitest/test_minitest_spec.rb

@@ -212,9 +212,10 @@ describe Minitest::Spec do
                         must_raise
                         must_respond_to
                         must_throw
+                        must_verify
                         path_must_exist]
 
-    bad = %w[not raise throw send output be_silent]
+    bad = %w[not raise throw send output be_silent verify]
 
     expected_wonts = expected_musts.map { |m| m.sub("must", "wont") }.sort
     expected_wonts.reject! { |m| m =~ /wont_#{Regexp.union(*bad)}/ }
@@ -952,6 +953,23 @@ class TestMeta < MetaMetaMetaTestCase
     assert_equal "ExampleB::random_method", spec_b.name
   end
 
+  def test_name_inside_class
+    spec_a = nil
+    spec_b = nil
+    inside_class_example = Class.new Minitest::Spec
+    Object.const_set :InsideClassExample, inside_class_example
+    inside_class_example.class_eval do
+      spec_a = describe "a" do
+        spec_b = describe "b" do; end
+      end
+    end
+
+    assert_equal "InsideClassExample::a", spec_a.name
+    assert_equal "InsideClassExample::a::b", spec_b.name
+  ensure
+    Object.send :remove_const, :InsideClassExample
+  end
+
   def test_structure
     x, y, z, * = util_structure
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.25.1
+  version: 5.25.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
   deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-12-03 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.15
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: minitest provides a complete suite of testing facilities supporting TDD,