minitest 5.14.3 → 5.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47836e4dcf290018441ccd338ab779507b9ad318c5815f7c6df427d5d519fd4
-  data.tar.gz: 29aeac653e8eb3e2d0962e6bfd29794ae88290e63820e827a8f92bb395a778b7
+  metadata.gz: 76379897c6c77174044638d17a95f50b1b2fddbfde053759d864d8b9b419984b
+  data.tar.gz: 7cdedb3e76825894a5577f2c639c541402e1955b1166221530e2937b6c605b81
 SHA512:
-  metadata.gz: b2f2c7e8f0a5b3c3ea3f8e87b68f69ff5294dc1e40c453308660a97ae8e072cd2426e853a5c84638b5d2f3d57bc744d6df98f9a659adad9ca13b233d401565b0
-  data.tar.gz: 13a28eebea4de744d08bb6ac3538cde8fe1817167cf48e2a5cfc5bc76d0a4584953f6e5b98d4bb15285630d92aae000093368ab309a3e5a80a8cb02117c6ba15
+  metadata.gz: 5bc0b4b036c2e07d3db6ace79c1d0e51d2aa5cac74a26174ec822f1f987882bffc0165650c86f168ee38b31e9f07d825730b20a1f13b704fc395a9a88a4d9060
+  data.tar.gz: e9bdf26bc5a327b72b7a1dbdf701f6cef70561b634a258f932c511f26e7f2886597a05cc4a964749ef16e32529ab6a0cb6d11601f2954c3830444d34c3fcb23b

data/History.rdoc

@@ -1,3 +1,93 @@
+=== 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:
+
+  * Fixed exception sanitization by removing TypeError restriction on rescue.
+  * Use A instead of deprecated TESTOPTS in rake test:slow. (davidstosik)
+
+=== 5.16.2 / 2022-07-03
+
+* 4 bug fixes:
+
+  * Added MT_KWARGS_HACK kludge for stub to deal with ruby 2.7 kwargs nastiness. (tsugimoto)
+  * In #expect, pop Hash class from args if $MT_KWARGS_HACK. (casperisfine)
+  * In above scenario, set expected kwargs (as Objects) based on actual kwargs.
+  * Nuke ivars if exception fails to marshal twice (eg better_errors). (irphilli)
+
+=== 5.16.1 / 2022-06-20
+
+* 2 bug fixes:
+
+  * Apparently adding real kwarg support to mocks/stubs broke some code. Fixed.
+    * Use `MT_KWARGS_HACK=1` to activate the kludgy kwargs support w/ caveats.
+  * Clarified some doco wrt the block on #stub.
+
+=== 5.16.0 / 2022-06-14
+
+* 2 major enhancements:
+
+  * Added Minitest::TestTask.
+  * Dropping ruby 2.2 - 2.5. 2.6 is DTM soon too.
+
+* 11 minor enhancements:
+
+  * Added --show-skips option to show skips at end of run but not require --verbose. (MSP-Greg)
+  * Added Minitest.seed, the random seed used by the run.
+  * Calling `srand Minitest.seed` before all shuffles to ensure determinism.
+  * Extended #stub to handle kwargs for both block and call args. (SampsonCrowley)
+  * Extended Mock#__call to display kwargs.
+  * Extended Mock#expect to record kwargs.
+  * Extended Mock#method_missing to take kwargs & compare them against expected.
+  * Mock#method_missing displays better errors on arity mismatch.
+  * Removed minor optimization removing empty suites before run.
+  * Simplified test randomization (test order will change even with fixed seed).
+  * assert_match now returns the MatchData on success. (Nakilon)
+
+* 3 bug fixes:
+
+  * (Re)Fixed marshalling of exceptions, neutering them in 2 passes.
+  * Fixed more problems with rdoc.
+  * Had to patch up mock and stub to deal with <=2.7 kwargs oddities
+
+=== 5.15.0 / 2021-12-14
+
+* 1 major enhancement:
+
+  * assert_throws returns the value returned, if any. (volmer)
+
+* 3 minor enhancements:
+
+  * Added -S <CODES> option to skip reporting of certain types of output
+  * Enable Ruby deprecation warnings by default. (casperisfine)
+  * Use Etc.nprocessors by default in order to maximize cpu usage. (tonytonyjan)
+
+* 6 bug fixes:
+
+  * Close then unlink tempfiles on Windows. (nobu)
+  * Fixed #skip_until for windows paths. (MSP-Greg)
+  * Fixed a bunch of tests for jruby and windows. (MSP-Greg)
+  * Fixed marshalling of specs if they error. (tenderlove, jeremyevans, et al)
+  * Updated deprecation message for block expectations. (blowmage)
+  * Use Kernel.warn directly in expectations in case CUT defines their own warn. (firien)
+
+=== 5.14.4 / 2021-02-23
+
+* 1 bug fix:
+
+  * Fixed deprecation warning using stub with methods using keyword arguments. (Nakilon)
+
 === 5.14.3 / 2021-01-05
 
 * 1 bug fix:
@@ -555,7 +645,7 @@ Minitest 5:
   * Added Minitest::Benchmark.
     * Your benchmarks need to move to their own subclass.
     * Benchmarks using the spec DSL have to have "Bench" somewhere in their describe.
-  * MiniTest::Unit.after_tests moved to Minitest.after_tests
+  * MiniTest::Unit.after_tests moved to Minitest.after_run
   * MiniTest::Unit.autorun is now Minitest.autorun. Just require minitest/autorun pls.
   * Removed ParallelEach#grep since it isn't used anywhere.
   * Renamed Runnable#__name__ to Runnable#name (but uses @NAME internally).

data/Manifest.txt

@@ -17,6 +17,7 @@ lib/minitest/pride.rb
 lib/minitest/pride_plugin.rb
 lib/minitest/spec.rb
 lib/minitest/test.rb
+lib/minitest/test_task.rb
 lib/minitest/unit.rb
 test/minitest/metametameta.rb
 test/minitest/test_minitest_assertions.rb
@@ -25,3 +26,4 @@ test/minitest/test_minitest_mock.rb
 test/minitest/test_minitest_reporter.rb
 test/minitest/test_minitest_spec.rb
 test/minitest/test_minitest_test.rb
+test/minitest/test_minitest_test_task.rb

data/README.rdoc

@@ -2,7 +2,7 @@
 
 home :: https://github.com/seattlerb/minitest
 bugs :: https://github.com/seattlerb/minitest/issues
-rdoc :: http://docs.seattlerb.org/minitest
+rdoc :: https://docs.seattlerb.org/minitest
 vim  :: https://github.com/sunaku/vim-ruby-minitest
 emacs:: https://github.com/arthurnn/minitest-emacs
 
@@ -70,6 +70,7 @@ extract-method refactorings still apply.
 * minitest/mock - a simple and clean mock/stub system.
 * minitest/benchmark - an awesome way to assert your algorithm's performance.
 * minitest/pride - show your pride in testing!
+* minitest/test_task - a full-featured and clean rake task generator.
 * Incredibly small and fast runner, but no bells and whistles.
 * Written by squishy human beings. Software can never be perfect. We will all eventually die.
 
@@ -186,7 +187,7 @@ Output is tab-delimited to make it easy to paste into a spreadsheet.
 === Mocks
 
 Mocks and stubs defined using terminology by Fowler & Meszaros at
-http://www.martinfowler.com/bliki/TestDouble.html:
+https://www.martinfowler.com/bliki/TestDouble.html:
 
 "Mocks are pre-programmed with expectations which form a specification
 of the calls they are expected to receive. They can throw an exception
@@ -237,7 +238,7 @@ an example of asserting that code inside a thread is run:
 === Stubs
 
 Mocks and stubs are defined using terminology by Fowler & Meszaros at
-http://www.martinfowler.com/bliki/TestDouble.html:
+https://www.martinfowler.com/bliki/TestDouble.html:
 
 "Stubs provide canned answers to calls made during the test".
 
@@ -264,9 +265,8 @@ new non-existing method:
 
 === Running Your Tests
 
-Ideally, you'll use a rake task to run your tests, either piecemeal or
-all at once. Both rake and rails ship with rake tasks for running your
-tests. BUT! You don't have to:
+Ideally, you'll use a rake task to run your tests (see below), either
+piecemeal or all at once. BUT! You don't have to:
 
     % ruby -Ilib:test test/minitest/test_minitest_test.rb
     Run options: --seed 37685
@@ -294,18 +294,45 @@ provided via plugins. To see them, simply run with +--help+:
         -p, --pride                      Pride. Show your testing pride!
         -a, --autotest                   Connect to autotest server.
 
+=== Rake Tasks
+
 You can set up a rake task to run all your tests by adding this to your Rakefile:
 
-    require "rake/testtask"
+    require "minitest/test_task"
+
+    Minitest::TestTask.create # named test, sensible defaults
+
+    # or more explicitly:
 
-    Rake::TestTask.new(:test) do |t|
+    Minitest::TestTask.create(:test) do |t|
       t.libs << "test"
       t.libs << "lib"
-      t.test_files = FileList["test/**/test_*.rb"]
+      t.warning = false
+      t.test_globs = ["test/**/*_test.rb"]
     end
 
     task :default => :test
 
+Each of these will generate 4 tasks:
+
+    rake test          :: Run the test suite.
+    rake test:cmd      :: Print out the test command.
+    rake test:isolated :: Show which test files fail when run separately.
+    rake test:slow     :: Show bottom 25 tests sorted by time.
+
+=== Rake Task Variables
+
+There are a bunch of variables you can supply to rake to modify the run.
+
+    MT_LIB_EXTRAS :: Extra libs to dynamically override/inject for custom runs.
+    N             :: -n: Tests to run (string or /regexp/).
+    X             :: -x: Tests to exclude (string or /regexp/).
+    A             :: Any extra arguments. Honors shell quoting.
+    MT_CPU        :: How many threads to use for parallel test runs
+    SEED          :: -s --seed Sets random seed.
+    TESTOPTS      :: Deprecated, same as A
+    FILTER        :: Deprecated, same as A
+
 == Writing Extensions
 
 To define a plugin, add a file named minitest/XXX_plugin.rb to your
@@ -376,6 +403,39 @@ Using our example above, here is how we might implement MyCI:
 
 == FAQ
 
+=== What versions are compatible with what? Or what versions are supported?
+
+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. Hopefully I'll be
+able to support only current versions of ruby sometime in the near
+future.
+
+(As of 2022-11-29)
+
+Current versions of rails: (https://endoflife.date/rails)
+
+  | 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.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 |
+
+See also:
+
+* https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+
 === How to test SimpleDelegates?
 
 The following implementation and test:
@@ -578,6 +638,7 @@ minitest-capistrano         :: Assertions and expectations for testing
                                Capistrano recipes.
 minitest-capybara           :: Capybara matchers support for minitest unit and
                                spec.
+minitest-cc                 :: It provides minimal information about code coverage.
 minitest-chef-handler       :: Run Minitest suites as Chef report handlers
 minitest-ci                 :: CI reporter plugin for Minitest.
 minitest-context            :: Defines contexts for code reuse in Minitest
@@ -611,6 +672,7 @@ minitest-growl              :: Test notifier for minitest via growl.
 minitest-happy              :: GLOBALLY ACTIVATE MINITEST PRIDE! RAWR!
 minitest-have_tag           :: Adds Minitest assertions to test for the existence of
                                HTML tags, including contents, within a provided string.
+minitest-heat               :: Reporting that builds a heat map of failure locations
 minitest-hooks              :: Around and before_all/after_all/around_all hooks
 minitest-hyper              :: Pretty, single-page HTML reports for your Minitest runs
 minitest-implicit-subject   :: Implicit declaration of the test subject.
@@ -675,7 +737,7 @@ minitest-stub-const         :: Stub constants for the duration of a block.
 minitest-tags               :: Add tags for minitest.
 minitest-unordered          :: Adds a new assertion to minitest for checking the
                                contents of a collection, ignoring element order.
-minitest-vcr                :: Automatic cassette managment with Minitest::Spec
+minitest-vcr                :: Automatic cassette management with Minitest::Spec
                                and VCR.
 minitest_log                :: Adds structured logging, data explication, and verdicts.
 minitest_owrapper           :: Get tests results as a TestResult object.
@@ -685,8 +747,13 @@ mongoid-minitest            :: Minitest matchers for Mongoid.
 mutant-minitest             :: Minitest integration for mutant.
 pry-rescue                  :: A pry plugin w/ minitest support. See
                                pry-rescue/minitest.rb.
+rematch                     :: Declutter your test files from large hardcoded data
+                               and update them automatically when your code changes.
 rspec2minitest              :: Easily translate any RSpec matchers to Minitest
                                assertions and expectations.
+stubberry                   :: Multiple stubbing 'berries', sweet and useful 
+                               stub helpers and assertions. ( stub_must, 
+                               assert_method_called, stubbing ORM objects by id )
 
 == Unknown Extensions:
 
@@ -712,7 +779,7 @@ Authors... Please send me a pull request with a description of your minitest ext
 
 == Minitest related goods
 
-* minitest/pride fabric: http://www.spoonflower.com/fabric/3928730-again-by-katie_allen
+* minitest/pride fabric: https://www.spoonflower.com/fabric/3928730-again-by-katie_allen
 
 == REQUIREMENTS:
 

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec "minitest" do
 
   license "MIT"
 
-  require_ruby_version [">= 2.2", "< 4.0"]
+  require_ruby_version [">= 2.6", "< 4.0"]
 end
 
 desc "Find missing expectations"

data/lib/hoe/minitest.rb

@@ -24,9 +24,5 @@ module Hoe::Minitest
 
   def define_minitest_tasks
     self.testlib = :minitest
-
-    # make sure we use the gemmed minitest on 1.9
-    self.test_prelude = 'gem "minitest"' unless
-      minitest? or ENV["MT_NO_ISOLATE"]
   end
 end

data/lib/minitest/assertions.rb

@@ -293,6 +293,8 @@ module Minitest
       assert_respond_to matcher, :"=~"
       matcher = Regexp.new Regexp.escape matcher if String === matcher
       assert matcher =~ obj, msg
+
+      Regexp.last_match
     end
 
     ##
@@ -473,7 +475,7 @@ module Minitest
     def assert_throws sym, msg = nil
       default = "Expected #{mu_pp(sym)} to have been thrown"
       caught = true
-      catch(sym) do
+      value = catch(sym) do
         begin
           yield
         rescue ThreadError => e       # wtf?!? 1.8 + threads == suck
@@ -489,6 +491,7 @@ module Minitest
       end
 
       assert caught, message(msg) { default }
+      value
     rescue Assertion
       raise
     rescue => e
@@ -561,15 +564,13 @@ module Minitest
 
           return captured_stdout.read, captured_stderr.read
         ensure
-          captured_stdout.unlink
-          captured_stderr.unlink
           $stdout.reopen orig_stdout
           $stderr.reopen orig_stderr
 
           orig_stdout.close
           orig_stderr.close
-          captured_stdout.close
-          captured_stderr.close
+          captured_stdout.close!
+          captured_stderr.close!
         end
       end
     end
@@ -793,7 +794,7 @@ module Minitest
 
     def skip_until y,m,d,msg
       skip msg if Time.now < Time.local(y, m, d)
-      where = caller.first.split(/:/, 3).first(2).join ":"
+      where = caller.first.rpartition(':in').reject(&:empty?).first
       warn "Stale skip_until %p at %s" % [msg, where]
     end
 

data/lib/minitest/benchmark.rb

@@ -217,7 +217,7 @@ module Minitest
     ##
     # Takes an array of x/y pairs and calculates the general R^2 value.
     #
-    # See: http://en.wikipedia.org/wiki/Coefficient_of_determination
+    # See: https://en.wikipedia.org/wiki/Coefficient_of_determination
 
     def fit_error xys
       y_bar  = sigma(xys) { |_, y| y } / xys.size.to_f
@@ -232,7 +232,7 @@ module Minitest
     #
     # Takes x and y values and returns [a, b, r^2].
     #
-    # See: http://mathworld.wolfram.com/LeastSquaresFittingExponential.html
+    # See: https://mathworld.wolfram.com/LeastSquaresFittingExponential.html
 
     def fit_exponential xs, ys
       n     = xs.size
@@ -254,7 +254,7 @@ module Minitest
     #
     # Takes x and y values and returns [a, b, r^2].
     #
-    # See: http://mathworld.wolfram.com/LeastSquaresFittingLogarithmic.html
+    # See: https://mathworld.wolfram.com/LeastSquaresFittingLogarithmic.html
 
     def fit_logarithmic xs, ys
       n     = xs.size
@@ -276,7 +276,7 @@ module Minitest
     #
     # Takes x and y values and returns [a, b, r^2].
     #
-    # See: http://mathworld.wolfram.com/LeastSquaresFitting.html
+    # See: https://mathworld.wolfram.com/LeastSquaresFitting.html
 
     def fit_linear xs, ys
       n   = xs.size
@@ -298,7 +298,7 @@ module Minitest
     #
     # Takes x and y values and returns [a, b, r^2].
     #
-    # See: http://mathworld.wolfram.com/LeastSquaresFittingPowerLaw.html
+    # See: https://mathworld.wolfram.com/LeastSquaresFittingPowerLaw.html
 
     def fit_power xs, ys
       n       = xs.size

data/lib/minitest/mock.rb

@@ -28,11 +28,19 @@ module Minitest # :nodoc:
     end
 
     overridden_methods.map(&:to_sym).each do |method_id|
-      define_method method_id do |*args, &b|
+      define_method method_id do |*args, **kwargs, &b|
         if @expected_calls.key? method_id then
-          method_missing(method_id, *args, &b)
+          if kwargs.empty? then # FIX: drop this after 2.7 dead
+            method_missing(method_id, *args, &b)
+          else
+            method_missing(method_id, *args, **kwargs, &b)
+          end
         else
-          super(*args, &b)
+          if kwargs.empty? then # FIX: drop this after 2.7 dead
+            super(*args, &b)
+          else
+            super(*args, **kwargs, &b)
+          end
         end
       end
     end
@@ -43,9 +51,11 @@ module Minitest # :nodoc:
       @actual_calls   = Hash.new { |calls, name| calls[name] = [] }
     end
 
+    @@KW_WARNED = false # :nodoc:
+
     ##
-    # Expect that method +name+ is called, optionally with +args+ or a
-    # +blk+, and returns +retval+.
+    # Expect that method +name+ is called, optionally with +args+ (and
+    # +kwargs+ or a +blk+, and returns +retval+.
     #
     #   @mock.expect(:meaning_of_life, 42)
     #   @mock.meaning_of_life # => 42
@@ -78,15 +88,31 @@ module Minitest # :nodoc:
     #   @mock.ordinal_increment # => raises MockExpectationError "No more expects available for :ordinal_increment"
     #
 
-    def expect name, retval, args = [], &blk
+    def expect name, retval, args = [], **kwargs, &blk
       name = name.to_sym
 
       if block_given?
         raise ArgumentError, "args ignored when block given" unless args.empty?
+        raise ArgumentError, "kwargs ignored when block given" unless kwargs.empty?
         @expected_calls[name] << { :retval => retval, :block => blk }
       else
         raise ArgumentError, "args must be an array" unless Array === args
-        @expected_calls[name] << { :retval => retval, :args => args }
+
+        if ENV["MT_KWARGS_HAC\K"] && (Hash === args.last ||
+                                      Hash ==  args.last) then
+          if kwargs.empty? then
+            kwargs = args.pop
+          else
+            unless @@KW_WARNED then
+              from = caller.first
+              warn "Using MT_KWARGS_HAC\K yet passing kwargs. From #{from}"
+              @@KW_WARNED = true
+            end
+          end
+        end
+
+        @expected_calls[name] <<
+          { :retval => retval, :args => args, :kwargs => kwargs }
       end
       self
     end
@@ -94,7 +120,13 @@ module Minitest # :nodoc:
     def __call name, data # :nodoc:
       case data
       when Hash then
-        "#{name}(#{data[:args].inspect[1..-2]}) => #{data[:retval].inspect}"
+        args   = data[:args].inspect[1..-2]
+        kwargs = data[:kwargs]
+        if kwargs && !kwargs.empty? then
+          args << ", " unless args.empty?
+          args << kwargs.inspect[1..-2]
+        end
+        "#{name}(#{args}) => #{data[:retval].inspect}"
       else
         data.map { |d| __call name, d }.join ", "
       end
@@ -115,10 +147,14 @@ module Minitest # :nodoc:
       true
     end
 
-    def method_missing sym, *args, &block # :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, &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)]
@@ -129,26 +165,34 @@ module Minitest # :nodoc:
       expected_call = @expected_calls[sym][index]
 
       unless expected_call then
-        raise MockExpectationError, "No more expects available for %p: %p" %
-          [sym, args]
+        raise MockExpectationError, "No more expects available for %p: %p %p" %
+          [sym, args, kwargs]
       end
 
-      expected_args, retval, val_block =
-        expected_call.values_at(:args, :retval, :block)
+      expected_args, expected_kwargs, retval, val_block =
+        expected_call.values_at(:args, :kwargs, :retval, :block)
+
+      expected_kwargs = kwargs.map { |ak, av| [ak, Object] }.to_h if
+        Hash == expected_kwargs
 
       if val_block then
         # keep "verify" happy
         @actual_calls[sym] << expected_call
 
-        raise MockExpectationError, "mocked method %p failed block w/ %p" %
-          [sym, args] unless val_block.call(*args, &block)
+        raise MockExpectationError, "mocked method %p failed block w/ %p %p" %
+          [sym, args, kwargs] unless val_block.call(*args, **kwargs, &block)
 
         return retval
       end
 
       if expected_args.size != args.size then
-        raise ArgumentError, "mocked method %p expects %d arguments, got %d" %
-          [sym, expected_args.size, args.size]
+        raise ArgumentError, "mocked method %p expects %d arguments, got %p" %
+          [sym, expected_args.size, args]
+      end
+
+      if expected_kwargs.size != kwargs.size then
+        raise ArgumentError, "mocked method %p expects %d keyword arguments, got %p" %
+          [sym, expected_kwargs.size, kwargs]
       end
 
       zipped_args = expected_args.zip(args)
@@ -157,13 +201,33 @@ module Minitest # :nodoc:
       }
 
       unless fully_matched then
-        raise MockExpectationError, "mocked method %p called with unexpected arguments %p" %
-          [sym, args]
+        fmt = "mocked method %p called with unexpected arguments %p"
+        raise MockExpectationError, fmt % [sym, args]
+      end
+
+      unless expected_kwargs.keys.sort == kwargs.keys.sort then
+        fmt = "mocked method %p called with unexpected keywords %p vs %p"
+        raise MockExpectationError, fmt % [sym, expected_kwargs.keys, kwargs.keys]
+      end
+
+      zipped_kwargs = expected_kwargs.map { |ek, ev|
+        av = kwargs[ek]
+        [ek, [ev, av]]
+      }.to_h
+
+      fully_matched = zipped_kwargs.all? { |ek, (ev, av)|
+        ev === av or ev == av
+      }
+
+      unless fully_matched then
+        fmt = "mocked method %p called with unexpected keyword arguments %p vs %p"
+        raise MockExpectationError, fmt % [sym, expected_kwargs, kwargs]
       end
 
       @actual_calls[sym] << {
         :retval => retval,
-        :args => zipped_args.map! { |mod, a| mod === a ? mod : a },
+        :args => zipped_args.map { |e, a| e === a ? e : a },
+        :kwargs => zipped_kwargs.map { |k, (e, a)| [k, e === a ? e : a] }.to_h,
       }
 
       retval
@@ -207,31 +271,54 @@ class Object
   #         assert obj_under_test.stale?
   #       end
   #     end
-  #
+  #--
+  # NOTE: keyword args in callables are NOT checked for correctness
+  # against the existing method. Too many edge cases to be worth it.
 
-  def stub name, val_or_callable, *block_args
+  def stub name, val_or_callable, *block_args, **block_kwargs, &block
     new_name = "__minitest_stub__#{name}"
 
     metaclass = class << self; self; end
 
     if respond_to? name and not methods.map(&:to_s).include? name.to_s then
-      metaclass.send :define_method, name do |*args|
-        super(*args)
+      metaclass.send :define_method, name do |*args, **kwargs|
+        super(*args, **kwargs)
       end
     end
 
     metaclass.send :alias_method, new_name, name
 
-    metaclass.send :define_method, name do |*args, &blk|
-      if val_or_callable.respond_to? :call then
-        val_or_callable.call(*args, &blk)
-      else
-        blk.call(*block_args) if blk
-        val_or_callable
+    if ENV["MT_KWARGS_HAC\K"] then
+      metaclass.send :define_method, name do |*args, &blk|
+        if val_or_callable.respond_to? :call then
+          val_or_callable.call(*args, &blk)
+        else
+          blk.call(*block_args, **block_kwargs) if blk
+          val_or_callable
+        end
+      end
+    else
+      metaclass.send :define_method, name do |*args, **kwargs, &blk|
+        if val_or_callable.respond_to? :call then
+          if kwargs.empty? then # FIX: drop this after 2.7 dead
+            val_or_callable.call(*args, &blk)
+          else
+            val_or_callable.call(*args, **kwargs, &blk)
+          end
+        else
+          if blk then
+            if block_kwargs.empty? then # FIX: drop this after 2.7 dead
+              blk.call(*block_args)
+            else
+              blk.call(*block_args, **block_kwargs)
+            end
+          end
+          val_or_callable
+        end
       end
     end
 
-    yield self
+    block[self]
   ensure
     metaclass.send :undef_method, name
     metaclass.send :alias_method, name, new_name