minitest 5.16.3 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5a4db9f495b34c86f2c39eef6b6d424b22d8d9e6a86038bf0ff84c1c20c975
-  data.tar.gz: b8a1b6cb226d14c6972460bec05ec610d05acdfa0edcffe19bf51e8220486206
+  metadata.gz: 76379897c6c77174044638d17a95f50b1b2fddbfde053759d864d8b9b419984b
+  data.tar.gz: 7cdedb3e76825894a5577f2c639c541402e1955b1166221530e2937b6c605b81
 SHA512:
-  metadata.gz: 6505a8f386da89263a005ba8eef3f81053e7e666a54ec03abd8f71e06c290ebf318df4f7728e420e3f40fab55ffe1a57824ec435286c89864ea830d330d6b028
-  data.tar.gz: 5b8bbba7d8565026e64da1d3af31a5aa342c3d063acd75de9661bc09fb142f4a469e9febf44daf2764d4fb33021d993a27bd936200efded501158b23c299989e
+  metadata.gz: 5bc0b4b036c2e07d3db6ace79c1d0e51d2aa5cac74a26174ec822f1f987882bffc0165650c86f168ee38b31e9f07d825730b20a1f13b704fc395a9a88a4d9060
+  data.tar.gz: e9bdf26bc5a327b72b7a1dbdf701f6cef70561b634a258f932c511f26e7f2886597a05cc4a964749ef16e32529ab6a0cb6d11601f2954c3830444d34c3fcb23b

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 5.17.0 / 2022-12-31
+
+* 1 minor enhancement:
+
+  * Refactor setup hooks into a SETUP_METHODS constant. (MSP-Greg)
+
+* 3 bug fixes:
+
+  * Fix kwargs for Mock calls to delegator. (blowmage)
+  * Fix kwargs for expectations. (bobmazanec, blowmage)
+  * Remove check for .b method. (tenderlove)
+
 === 5.16.3 / 2022-08-17
 
 * 2 bug fixes:

data/README.rdoc

@@ -407,37 +407,34 @@ Using our example above, here is how we might implement MyCI:
 
 Minitest is a dependency of rails, which until fairly recently had an
 overzealous backwards compatibility policy. As such, I'm stuck
-supporting versions of ruby that are long past EOL. Once rails 5.2 is
-dropped (hopefully April 2021), I get to drop a bunch of versions of
-ruby that I have to currently test against.
+supporting versions of ruby that are long past EOL. Hopefully I'll be
+able to support only current versions of ruby sometime in the near
+future.
 
-(As of 2021-01-31)
+(As of 2022-11-29)
 
 Current versions of rails: (https://endoflife.date/rails)
 
-  | rails | min ruby | rec ruby | minitest | status   |
-  |-------+----------+----------+----------+----------|
-  |   7.0 | >= 2.7   |      3.0 | >= 5.1   | Future   |
-  |   6.1 | >= 2.5   |      3.0 | >= 5.1   | Current  |
-  |   6.0 | >= 2.5   |      2.6 | >= 5.1   | Security |
-  |   5.2 | >= 2.2.2 |      2.5 | ~> 5.1   | Security | EOL @railsconf 2021?
+  | rails | min ruby | rec ruby | minitest | status   |  EOL Date  |
+  |-------+----------+----------+----------+----------+------------|
+  |   7.0 | >= 2.7   |      3.1 | >= 5.1   | Current  | 2025-06-01?|
+  |   6.1 | >= 2.5   |      3.0 | >= 5.1   | Maint    | 2024-06-01?|
+  |   6.0 | >= 2.5   |      2.6 | >= 5.1   | Security | 2023-06-01 |
+  |   5.2 | >= 2.2.2 |      2.5 | ~> 5.1   | EOL      | 2022-06-01 |
 
 Current versions of ruby: (https://endoflife.date/ruby)
 
   | ruby | Status  |   EOL Date |
   |------+---------+------------|
-  |  3.0 | Current | 2024-03-31 |
-  |  2.7 | Maint   | 2023-03-31 |
-  |  2.6 | Maint*  | 2022-03-31 |
+  |  3.1 | Current | 2025-12-25 |
+  |  3.0 | Maint   | 2024-03-31 |
+  |  2.7 | Maint*  | 2023-03-31 |
+  |  2.6 | EOL     | 2022-03-31 |
   |  2.5 | EOL     | 2021-03-31 |
-  |  2.4 | EOL     | 2020-03-31 |
-  |  2.3 | EOL     | 2019-03-31 |
-  |  2.2 | EOL     | 2018-03-31 |
 
 See also:
 
 * https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
-* https://jamesjeffersconsulting.com/ruby-rails-version-matrix/
 
 === How to test SimpleDelegates?
 

data/lib/minitest/mock.rb

@@ -150,7 +150,11 @@ module Minitest # :nodoc:
     def method_missing sym, *args, **kwargs, &block # :nodoc:
       unless @expected_calls.key?(sym) then
         if @delegator && @delegator.respond_to?(sym)
-          return @delegator.public_send(sym, *args, **kwargs, &block)
+          if kwargs.empty? then # FIX: drop this after 2.7 dead
+            return @delegator.public_send(sym, *args, &block)
+          else
+            return @delegator.public_send(sym, *args, **kwargs, &block)
+          end
         else
           raise NoMethodError, "unmocked method %p, expected one of %p" %
             [sym, @expected_calls.keys.sort_by(&:to_s)]

data/lib/minitest/spec.rb

@@ -6,6 +6,10 @@ class Module # :nodoc:
     dont_flip = false if block
     target_obj = block ? '_{obj.method}' : '_(obj)'
 
+    # https://eregon.me/blog/2021/02/13/correct-delegation-in-ruby-2-27-3.html
+    # Drop this when we can drop ruby 2.6 (aka after rails 6.1 EOL, ~2024-06)
+    kw_extra = "ruby2_keywords %p" % [new_name] if respond_to?(:ruby2_keywords, true)
+
     # warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
     self.class_eval <<-EOM, __FILE__, __LINE__ + 1
       def #{new_name} *args
@@ -14,6 +18,7 @@ class Module # :nodoc:
         Kernel.warn "DEPRECATED: global use of #{new_name} from #\{where}. Use #{target_obj}.#{new_name} instead. This will fail in Minitest 6."
         Minitest::Expectation.new(self, Minitest::Spec.current).#{new_name}(*args)
       end
+      #{kw_extra}
     EOM
 
     Minitest::Expectation.class_eval <<-EOM, __FILE__, __LINE__ + 1
@@ -28,6 +33,7 @@ class Module # :nodoc:
           ctx.#{meth}(args.first, target, *args[1..-1])
         end
       end
+      #{kw_extra}
     EOM
   end
 end

data/lib/minitest/test.rb

@@ -18,6 +18,10 @@ module Minitest
 
     PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException, SystemExit] # :nodoc:
 
+    SETUP_METHODS = %w[ before_setup setup after_setup ] # :nodoc:
+
+    TEARDOWN_METHODS = %w[ before_teardown teardown after_teardown ] # :nodoc:
+
     # :stopdoc:
     class << self; attr_accessor :io_lock; end
     self.io_lock = Mutex.new
@@ -84,8 +88,6 @@ module Minitest
       :random
     end
 
-    TEARDOWN_METHODS = %w[ before_teardown teardown after_teardown ] # :nodoc:
-
     ##
     # Runs a single test with setup/teardown hooks.
 
@@ -93,7 +95,9 @@ module Minitest
       with_info_handler do
         time_it do
           capture_exceptions do
-            before_setup; setup; after_setup
+            SETUP_METHODS.each do |hook|
+              self.send hook
+            end
 
             self.send self.name
           end
@@ -208,7 +212,7 @@ module Minitest
       neuter_exception e
     end
 
-    def neuter_exception e
+    def neuter_exception e # :nodoc:
       bt = e.backtrace
       msg = e.message.dup
 
@@ -219,7 +223,7 @@ module Minitest
       new_exception RuntimeError, msg, bt, true # but if this raises, we die
     end
 
-    def new_exception klass, msg, bt, kill = false
+    def new_exception klass, msg, bt, kill = false # :nodoc:
       ne = klass.new msg
       ne.set_backtrace bt
 

data/lib/minitest/test_task.rb

@@ -277,8 +277,8 @@ module Minitest # :nodoc:
   end
 end
 
-class Work < Queue
-  def initialize jobs = []
+class Work < Queue # :nodoc:
+  def initialize jobs = [] # :nodoc:
     super()
 
     jobs.each do |job|
@@ -289,7 +289,7 @@ class Work < Queue
   end
 end
 
-class Integer
+class Integer # :nodoc:
   def threads_do(jobs) # :nodoc:
     require "thread"
     q = Work.new jobs

data/lib/minitest.rb

@@ -9,7 +9,7 @@ require "etc"
 # :include: README.rdoc
 
 module Minitest
-  VERSION = "5.16.3" # :nodoc:
+  VERSION = "5.17.0" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -823,7 +823,7 @@ module Minitest
     end
 
     def to_s # :nodoc:
-      aggregated_results(StringIO.new(binary_string)).string
+      aggregated_results(StringIO.new(''.b)).string
     end
 
     def summary # :nodoc:
@@ -836,14 +836,6 @@ module Minitest
       "%d runs, %d assertions, %d failures, %d errors, %d skips%s" %
         [count, assertions, failures, errors, skips, extra]
     end
-
-    private
-
-    if '<3'.respond_to? :b
-      def binary_string; ''.b; end
-    else
-      def binary_string; ''.force_encoding(Encoding::ASCII_8BIT); end
-    end
   end
 
   ##

data/test/minitest/test_minitest_mock.rb

@@ -9,8 +9,6 @@ ensure
 end
 
 class TestMinitestMock < Minitest::Test
-  parallelize_me!
-
   def setup
     @mock = Minitest::Mock.new.expect(:foo, nil)
     @mock.expect(:meaning_of_life, 42)
@@ -260,6 +258,15 @@ class TestMinitestMock < Minitest::Test
     assert_equal exp, e.message
   end
 
+  def test_delegator_calls_are_propagated
+    delegator = Object.new
+    mock = Minitest::Mock.new delegator
+
+    refute delegator.nil?
+    refute mock.nil?
+    assert_mock mock
+  end
+
   def test_handles_kwargs_in_error_message
     mock = Minitest::Mock.new
 

data/test/minitest/test_minitest_spec.rb

@@ -1068,3 +1068,38 @@ class ValueMonadTest < Minitest::Test
     assert_equal "c", struct.expect
   end
 end
+
+describe Minitest::Spec, :infect_an_assertion do
+  class << self
+    attr_accessor :infect_mock
+  end
+
+  def assert_infects exp, act, msg = nil, foo: nil, bar: nil
+    self.class.infect_mock.assert_infects exp, act, msg, foo: foo, bar: bar
+  end
+
+  infect_an_assertion :assert_infects, :must_infect
+  infect_an_assertion :assert_infects, :must_infect_without_flipping, :dont_flip
+
+  it "infects assertions with kwargs" do
+    mock = Minitest::Mock.new
+    mock.expect :assert_infects, true, [:exp, :act, nil], foo: :foo, bar: :bar
+
+    self.class.infect_mock = mock
+
+    _(:act).must_infect :exp, foo: :foo, bar: :bar
+
+    assert_mock mock
+  end
+
+  it "infects assertions with kwargs (dont_flip)" do
+    mock = Minitest::Mock.new
+    mock.expect :assert_infects, true, [:act, :exp, nil], foo: :foo, bar: :bar
+
+    self.class.infect_mock = mock
+
+    _(:act).must_infect_without_flipping :exp, foo: :foo, bar: :bar
+
+    assert_mock mock
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.16.3
+  version: 5.17.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
-  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
-  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
-  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
-  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
-  YsuyUzsMz6GQA4khyaMgKNSD
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2023-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.24'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.24'
+        version: '4.0'
 description: |-
   minitest provides a complete suite of testing facilities supporting
   TDD, BDD, mocking, and benchmarking.