minitest 5.24.0 → 5.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd0fe4703c1bc82b9c33eb3dca089b234e123893d379dc940791e2cbd74802f
-  data.tar.gz: cfdfd1306481c0ea6ed54f03952205f4ceb9c41d2a901640f599c453eec39e39
+  metadata.gz: 6e090130753c1fb650b32bb10042b89b676ce100ceba25021cd3a7351d9114df
+  data.tar.gz: 729687628f500bc5b2153864f723491b72a98afcc6fd50da27fc48a5ed952def
 SHA512:
-  metadata.gz: cde9b530576ab5a9fccf75e7ed171768b83ef8ad833a6de3a69384c3da219642b93ab0d6e00e2c13d5cf7a0a0ee7d85ce291523cc50ee9908c2d37454a654598
-  data.tar.gz: 5d9432e383458f01530a68e1b6d6e6531bb85ff772335e5fdb15646d8cd880429c5ed6965c9c8e879399628395d1557f67893dc39236874e2c24c2782f954fb3
+  metadata.gz: 9a0d599badcfe81e3cf63bc030b39cfa6ff0388f9d732ab145002c8e5c1b1b83dbeb8d51878d977a717528afefb4616ce9ba23922795b05bcc4d30983bbbc577
+  data.tar.gz: c3693a94e10968dd1f0a89a0217d83612978baf5471d9b37e184a0fd3e8ba0ee513f79c51f99fee0af468539d636d9aa8f4724de629fc02599c5a8141ee74c1c

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 5.25.0 / 2024-08-13
+
+* 2 minor enhancements:
+
+  * Fixed some inefficiencies filtering and matching (mostly backtraces).
+  * Refactored siginfo handler to reduce runtime costs. Saved ~30%!
+
+* 5 bug fixes:
+
+  * Added missing rdoc to get back to 100% coverage.
+  * Cleaning up ancient code checking for defined?(Encoding) and the like.
+  * Disambiguated some shadowed variables in minitest/compress.
+  * Fixed an ironic bug if using string-literals AND Werror.
+  * Improve description of test:slow task. (stomar)
+
+=== 5.24.1 / 2024-06-29
+
+* 1 bug fix:
+
+  * Fix the error message when an extension is invalid value. (y-yagi)
+
 === 5.24.0 / 2024-06-18
 
 * 2 minor enhancements:

data/lib/hoe/minitest.rb

@@ -1,6 +1,7 @@
 # :stopdoc:
 
 class Hoe
+  # empty
 end
 
 module Hoe::Minitest
@@ -16,7 +17,7 @@ module Hoe::Minitest
 
     gem "minitest"
     require "minitest"
-    version = Minitest::VERSION.split(/\./).first(2).join(".")
+    version = Minitest::VERSION.split(".").first(2).join "."
 
     dependency "minitest", "~> #{version}", :development unless
       minitest? or ENV["MT_NO_ISOLATE"]

data/lib/minitest/assertions.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require "rbconfig"
 require "tempfile"
 require "stringio"
@@ -29,12 +27,12 @@ module Minitest
     def self.diff
       return @diff if defined? @diff
 
-      @diff = if (RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ &&
-                  system("diff.exe", __FILE__, __FILE__)) then
+      @diff = if (RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ and
+                  system "diff.exe", __FILE__, __FILE__) then
                 "diff.exe -u"
-              elsif system("gdiff", __FILE__, __FILE__)
+              elsif system "gdiff", __FILE__, __FILE__ then
                 "gdiff -u" # solaris and kin suck
-              elsif system("diff", __FILE__, __FILE__)
+              elsif system "diff", __FILE__, __FILE__ then
                 "diff -u"
               else
                 nil
@@ -59,16 +57,16 @@ module Minitest
     def diff exp, act
       result = nil
 
-      expect, butwas = things_to_diff(exp, act)
+      expect, butwas = things_to_diff exp, act
 
       return "Expected: #{mu_pp exp}\n  Actual: #{mu_pp act}" unless
         expect
 
-      Tempfile.open("expect") do |a|
+      Tempfile.open "expect" do |a|
         a.puts expect
         a.flush
 
-        Tempfile.open("butwas") do |b|
+        Tempfile.open "butwas" do |b|
           b.puts butwas
           b.flush
 
@@ -79,10 +77,10 @@ module Minitest
           if result.empty? then
             klass = exp.class
             result = [
-                      "No visible difference in the #{klass}#inspect output.\n",
-                      "You should look at the implementation of #== on ",
-                      "#{klass} or its members.\n",
-                      expect,
+                       "No visible difference in the #{klass}#inspect output.\n",
+                       "You should look at the implementation of #== on ",
+                       "#{klass} or its members.\n",
+                       expect,
                      ].join
           end
         end
@@ -127,20 +125,15 @@ module Minitest
     # See Minitest::Test.make_my_diffs_pretty!
 
     def mu_pp obj
-      s = obj.inspect
+      s = obj.inspect.encode Encoding.default_external
 
-      if defined? Encoding then
-        s = s.encode Encoding.default_external
+      return s unless String === obj &&
+        (obj.encoding != Encoding.default_external || !obj.valid_encoding?)
 
-        if String === obj && (obj.encoding != Encoding.default_external ||
-                              !obj.valid_encoding?) then
-          enc = "# encoding: #{obj.encoding}"
-          val = "#    valid: #{obj.valid_encoding?}"
-          s = "#{enc}\n#{val}\n#{s}"
-        end
-      end
+      enc = "# encoding: #{obj.encoding}"
+      val = "#    valid: #{obj.valid_encoding?}"
 
-      s
+      [enc, val, s].join "\n"
     end
 
     ##
@@ -153,8 +146,8 @@ module Minitest
       str = mu_pp obj
 
       # both '\n' & '\\n' (_after_ mu_pp (aka inspect))
-      single = !!str.match(/(?<!\\|^)\\n/)
-      double = !!str.match(/(?<=\\|^)\\n/)
+      single = str.match?(/(?<!\\|^)\\n/)
+      double = str.match?(/(?<=\\|^)\\n/)
 
       process =
         if single ^ double then
@@ -167,9 +160,9 @@ module Minitest
           :itself                                     # leave it alone
         end
 
-      str.
-        gsub(/\\?\\n/, &process).
-        gsub(/:0x[a-fA-F0-9]{4,}/m, ":0xXXXXXX") # anonymize hex values
+      str
+        .gsub(/\\?\\n/, &process)
+        .gsub(/:0x[a-fA-F0-9]{4,}/m, ":0xXXXXXX") # anonymize hex values
     end
 
     ##
@@ -193,14 +186,14 @@ module Minitest
     # Fails unless +obj+ is empty.
 
     def assert_empty obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(obj)} to be empty" }
+      msg = message(msg) { "Expected #{mu_pp obj} to be empty" }
       assert_respond_to obj, :empty?
       assert obj.empty?, msg
     end
 
     def _where # :nodoc:
-      where = Minitest.filter_backtrace(caller).first
-      where = where.split(/:in /, 2).first # clean up noise
+      Minitest.filter_backtrace(caller).first
+        .split(":in ", 2).first # clean up noise
     end
 
     E = "" # :nodoc:
@@ -223,7 +216,7 @@ module Minitest
       result = assert exp == act, msg
 
       if nil == exp then
-        if Minitest::VERSION =~ /^6/ then
+        if Minitest::VERSION >= "6" then
           refute_nil exp, "Use assert_nil if expecting nil."
         else
           warn "DEPRECATED: Use assert_nil if expecting nil from #{_where}. This will fail in Minitest 6."
@@ -260,7 +253,7 @@ module Minitest
 
     def assert_includes collection, obj, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(collection)} to include #{mu_pp(obj)}"
+        "Expected #{mu_pp collection} to include #{mu_pp obj}"
       }
       assert_respond_to collection, :include?
       assert collection.include?(obj), msg
@@ -271,7 +264,7 @@ module Minitest
 
     def assert_instance_of cls, obj, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(obj)} to be an instance of #{cls}, not #{obj.class}"
+        "Expected #{mu_pp obj} to be an instance of #{cls}, not #{obj.class}"
       }
 
       assert obj.instance_of?(cls), msg
@@ -282,7 +275,8 @@ module Minitest
 
     def assert_kind_of cls, obj, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(obj)} to be a kind of #{cls}, not #{obj.class}" }
+        "Expected #{mu_pp obj} to be a kind of #{cls}, not #{obj.class}"
+      }
 
       assert obj.kind_of?(cls), msg
     end
@@ -292,7 +286,7 @@ module Minitest
 
     def assert_match matcher, obj, msg = nil
       msg = message(msg) { "Expected #{mu_pp matcher} to match #{mu_pp obj}" }
-      assert_respond_to matcher, :"=~"
+      assert_respond_to matcher, :=~
       matcher = Regexp.new Regexp.escape matcher if String === matcher
       assert matcher =~ obj, msg
 
@@ -303,7 +297,7 @@ module Minitest
     # Fails unless +obj+ is nil
 
     def assert_nil obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(obj)} to be nil" }
+      msg = message(msg) { "Expected #{mu_pp obj} to be nil" }
       assert obj.nil?, msg
     end
 
@@ -314,7 +308,7 @@ module Minitest
 
     def assert_operator o1, op, o2 = UNDEFINED, msg = nil
       return assert_predicate o1, op, msg if UNDEFINED == o2
-      msg = message(msg) { "Expected #{mu_pp(o1)} to be #{op} #{mu_pp(o2)}" }
+      msg = message(msg) { "Expected #{mu_pp o1} to be #{op} #{mu_pp o2}" }
       assert o1.__send__(op, o2), msg
     end
 
@@ -395,7 +389,7 @@ module Minitest
     #   str.must_be :empty?
 
     def assert_predicate o1, op, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(o1)} to be #{op}" }
+      msg = message(msg) { "Expected #{mu_pp o1} to be #{op}" }
       assert o1.__send__(op), msg
     end
 
@@ -440,13 +434,13 @@ module Minitest
         raise
       rescue Exception => e
         flunk proc {
-          exception_details(e, "#{msg}#{mu_pp(exp)} exception expected, not")
+          exception_details(e, "#{msg}#{mu_pp exp} exception expected, not")
         }
       end
 
       exp = exp.first if exp.size == 1
 
-      flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised."
+      flunk "#{msg}#{mu_pp exp} expected but nothing was raised."
     end
 
     ##
@@ -455,7 +449,7 @@ module Minitest
 
     def assert_respond_to obj, meth, msg = nil, include_all: false
       msg = message(msg) {
-        "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}"
+        "Expected #{mu_pp obj} (#{obj.class}) to respond to ##{meth}"
       }
       assert obj.respond_to?(meth, include_all), msg
     end
@@ -481,7 +475,8 @@ module Minitest
 
       recv, msg, *args = send_ary
       m = message(m) {
-        "Expected #{mu_pp(recv)}.#{msg}(*#{mu_pp(args)}) to return true" }
+        "Expected #{mu_pp recv}.#{msg}(*#{mu_pp args}) to return true"
+      }
       assert recv.__send__(msg, *args), m
     end
 
@@ -500,15 +495,15 @@ module Minitest
     # Fails unless the block throws +sym+
 
     def assert_throws sym, msg = nil
-      default = "Expected #{mu_pp(sym)} to have been thrown"
+      default = "Expected #{mu_pp sym} to have been thrown"
       caught = true
-      value = catch(sym) do
+      value = catch sym do
         begin
           yield
         rescue ThreadError => e       # wtf?!? 1.8 + threads == suck
-          default += ", not \:#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
+          default += ", not :#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
         rescue ArgumentError => e     # 1.9 exception
-          raise e unless e.message.include?("uncaught throw")
+          raise e unless e.message.include? "uncaught throw"
           default += ", not #{e.message.split(/ /).last}"
         rescue NameError => e         # 1.8 exception
           raise e unless e.name == sym
@@ -607,12 +602,12 @@ module Minitest
 
     def exception_details e, msg
       [
-       "#{msg}",
-       "Class: <#{e.class}>",
-       "Message: <#{e.message.inspect}>",
-       "---Backtrace---",
-       "#{Minitest.filter_backtrace(e.backtrace).join("\n")}",
-       "---------------",
+        msg,
+        "Class: <#{e.class}>",
+        "Message: <#{e.message.inspect}>",
+        "---Backtrace---",
+        Minitest.filter_backtrace(e.backtrace),
+        "---------------",
       ].join "\n"
     end
 
@@ -621,7 +616,7 @@ module Minitest
     # you to put time-bombs in your tests if you need to keep
     # something around until a later date lest you forget about it.
 
-    def fail_after y,m,d,msg
+    def fail_after y, m, d, msg
       flunk msg if Time.now > Time.local(y, m, d)
     end
 
@@ -655,7 +650,7 @@ module Minitest
     # Fails if +test+ is truthy.
 
     def refute test, msg = nil
-      msg ||= message { "Expected #{mu_pp(test)} to not be truthy" }
+      msg ||= message { "Expected #{mu_pp test} to not be truthy" }
       assert !test, msg
     end
 
@@ -663,7 +658,7 @@ module Minitest
     # Fails if +obj+ is empty.
 
     def refute_empty obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(obj)} to not be empty" }
+      msg = message(msg) { "Expected #{mu_pp obj} to not be empty" }
       assert_respond_to obj, :empty?
       refute obj.empty?, msg
     end
@@ -675,7 +670,7 @@ module Minitest
 
     def refute_equal exp, act, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(act)} to not be equal to #{mu_pp(exp)}"
+        "Expected #{mu_pp act} to not be equal to #{mu_pp exp}"
       }
       refute exp == act, msg
     end
@@ -706,7 +701,7 @@ module Minitest
 
     def refute_includes collection, obj, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(collection)} to not include #{mu_pp(obj)}"
+        "Expected #{mu_pp collection} to not include #{mu_pp obj}"
       }
       assert_respond_to collection, :include?
       refute collection.include?(obj), msg
@@ -717,7 +712,7 @@ module Minitest
 
     def refute_instance_of cls, obj, msg = nil
       msg = message(msg) {
-        "Expected #{mu_pp(obj)} to not be an instance of #{cls}"
+        "Expected #{mu_pp obj} to not be an instance of #{cls}"
       }
       refute obj.instance_of?(cls), msg
     end
@@ -726,7 +721,7 @@ module Minitest
     # Fails if +obj+ is a kind of +cls+.
 
     def refute_kind_of cls, obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(obj)} to not be a kind of #{cls}" }
+      msg = message(msg) { "Expected #{mu_pp obj} to not be a kind of #{cls}" }
       refute obj.kind_of?(cls), msg
     end
 
@@ -735,7 +730,7 @@ module Minitest
 
     def refute_match matcher, obj, msg = nil
       msg = message(msg) { "Expected #{mu_pp matcher} to not match #{mu_pp obj}" }
-      assert_respond_to matcher, :"=~"
+      assert_respond_to matcher, :=~
       matcher = Regexp.new Regexp.escape matcher if String === matcher
       refute matcher =~ obj, msg
     end
@@ -744,7 +739,7 @@ module Minitest
     # Fails if +obj+ is nil.
 
     def refute_nil obj, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(obj)} to not be nil" }
+      msg = message(msg) { "Expected #{mu_pp obj} to not be nil" }
       refute obj.nil?, msg
     end
 
@@ -766,7 +761,7 @@ module Minitest
 
       begin
         yield
-        flunk("NoMatchingPatternError expected, but nothing was raised.")
+        flunk "NoMatchingPatternError expected, but nothing was raised."
       rescue NoMatchingPatternError
         pass
       end
@@ -780,7 +775,7 @@ module Minitest
 
     def refute_operator o1, op, o2 = UNDEFINED, msg = nil
       return refute_predicate o1, op, msg if UNDEFINED == o2
-      msg = message(msg) { "Expected #{mu_pp(o1)} to not be #{op} #{mu_pp(o2)}" }
+      msg = message(msg) { "Expected #{mu_pp o1} to not be #{op} #{mu_pp o2}" }
       refute o1.__send__(op, o2), msg
     end
 
@@ -802,7 +797,7 @@ module Minitest
     #   str.wont_be :empty?
 
     def refute_predicate o1, op, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(o1)} to not be #{op}" }
+      msg = message(msg) { "Expected #{mu_pp o1} to not be #{op}" }
       refute o1.__send__(op), msg
     end
 
@@ -811,7 +806,7 @@ module Minitest
     # include_all defaults to false to match Object#respond_to?
 
     def refute_respond_to obj, meth, msg = nil, include_all: false
-      msg = message(msg) { "Expected #{mu_pp(obj)} to not respond to #{meth}" }
+      msg = message(msg) { "Expected #{mu_pp obj} to not respond to #{meth}" }
 
       refute obj.respond_to?(meth, include_all), msg
     end
@@ -844,9 +839,9 @@ module Minitest
     # date, but still holds you accountable and prevents you from
     # forgetting it.
 
-    def skip_until y,m,d,msg
+    def skip_until y, m, d, msg
       skip msg if Time.now < Time.local(y, m, d)
-      where = caller.first.rpartition(':in').reject(&:empty?).first
+      where = caller(1..1).first.rpartition(":in").reject(&:empty?).first
       warn "Stale skip_until %p at %s" % [msg, where]
     end
 

data/lib/minitest/benchmark.rb

@@ -47,8 +47,6 @@ module Minitest
 
     def self.bench_linear min, max, step = 10
       (min..max).step(step).to_a
-    rescue LocalJumpError # 1.8.6
-      r = []; (min..max).step(step) { |n| r << n }; r
     end
 
     ##
@@ -83,7 +81,7 @@ module Minitest
     def assert_performance validation, &work
       range = self.class.bench_range
 
-      io.print "#{self.name}"
+      io.print self.name
 
       times = []
 
@@ -236,7 +234,7 @@ module Minitest
 
     def fit_exponential xs, ys
       n     = xs.size
-      xys   = xs.zip(ys)
+      xys   = xs.zip ys
       sxlny = sigma(xys) { |x, y| x * Math.log(y) }
       slny  = sigma(xys) { |_, y| Math.log(y)     }
       sx2   = sigma(xys) { |x, _| x * x           }
@@ -258,7 +256,7 @@ module Minitest
 
     def fit_logarithmic xs, ys
       n     = xs.size
-      xys   = xs.zip(ys)
+      xys   = xs.zip ys
       slnx2 = sigma(xys) { |x, _| Math.log(x) ** 2 }
       slnx  = sigma(xys) { |x, _| Math.log(x)      }
       sylnx = sigma(xys) { |x, y| y * Math.log(x)  }
@@ -280,7 +278,7 @@ module Minitest
 
     def fit_linear xs, ys
       n   = xs.size
-      xys = xs.zip(ys)
+      xys = xs.zip ys
       sx  = sigma xs
       sy  = sigma ys
       sx2 = sigma(xs)  { |x|   x ** 2 }
@@ -302,7 +300,7 @@ module Minitest
 
     def fit_power xs, ys
       n       = xs.size
-      xys     = xs.zip(ys)
+      xys     = xs.zip ys
       slnxlny = sigma(xys) { |x, y| Math.log(x) * Math.log(y) }
       slnx    = sigma(xs)  { |x   | Math.log(x)               }
       slny    = sigma(ys)  { |   y| Math.log(y)               }
@@ -323,7 +321,7 @@ module Minitest
 
     def sigma enum, &block
       enum = enum.map(&block) if block
-      enum.inject { |sum, n| sum + n }
+      enum.sum
     end
 
     ##
@@ -419,7 +417,6 @@ module Minitest
       end
     end
 
-
     ##
     # Create a benchmark that verifies that the performance is logarithmic.
     #

data/lib/minitest/compress.rb

@@ -11,12 +11,12 @@ module Minitest
     def compress orig
       ary = orig
 
-      eswo = ->(ary, n, off) { # each_slice_with_offset
+      eswo = ->(a, n, off) { # each_slice_with_offset
         if off.zero? then
-          ary.each_slice n
+          a.each_slice n
         else
           # [ ...off... [...n...] [...n...] ... ]
-          front, back = ary.take(off), ary.drop(off)
+          front, back = a.take(off), a.drop(off)
           [front].chain back.each_slice n
         end
       }
@@ -29,16 +29,16 @@ module Minitest
 
         order = index
           .reject { |k, v| v.size == 1 }          # { b: [1 3 5], c: [2 4 6] }
-          .sort_by { |k, ary|                     ### sort by max dist + min offset
-            d = ary.each_cons(2).sum { |a, b| b-a }
-            [-d, ary.first]
+          .sort_by { |k, a1|                      ### sort by max dist + min offset
+            d = a1.each_cons(2).sum { |a2, b| b-a2 }
+            [-d, a1.first]
           }                                       # b: [1 3 5] c: [2 4 6]
 
         ranges = order
-          .map { |k, ary|                         # [[1..2 3..4] [2..3 4..5]]
-            ary
+          .map { |k, a1|                          # [[1..2 3..4] [2..3 4..5]]
+            a1
               .each_cons(2)
-              .map { |a, b| a..b-1 }
+              .map { |a2, b| a2..b-1 }
           }
 
         big_ranges = ranges
@@ -50,7 +50,7 @@ module Minitest
         culprits = big_ranges
           .map { |r|
             eswo[ary, r.size, r.begin]            # [o1 s1 s1 s2 s2]
-              .chunk_while { |a,b| a == b }       # [[o1] [s1 s1] [s2 s2]]
+              .chunk_while { |a, b| a == b }      # [[o1] [s1 s1] [s2 s2]]
               .map { |a| [a.size, a.first] }      # [[1 o1] [2 s1] [2 s2]]
           }
           .select { |chunks|

data/lib/minitest/error_on_warning.rb

@@ -1,11 +1,11 @@
 module Minitest
 
-  module ErrorOnWarning
-    def warn(message, category: nil)
+  module ErrorOnWarning # :nodoc:
+    def warn message, category: nil
       message = "[#{category}] #{message}" if category
       raise UnexpectedWarning, message
     end
   end
 
-  ::Warning.singleton_class.prepend(ErrorOnWarning)
+  ::Warning.singleton_class.prepend ErrorOnWarning
 end

data/lib/minitest/mock.rb

@@ -8,7 +8,7 @@ module Minitest # :nodoc:
   # All mock objects are an instance of Mock
 
   class Mock
-    alias :__respond_to? :respond_to?
+    alias __respond_to? respond_to?
 
     overridden_methods = %i[
       ===
@@ -93,7 +93,7 @@ module Minitest # :nodoc:
     def expect name, retval, args = [], **kwargs, &blk
       name = name.to_sym
 
-      if block_given?
+      if blk then
         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 }
@@ -106,7 +106,7 @@ module Minitest # :nodoc:
             kwargs = args.pop
           else
             unless @@KW_WARNED then
-              from = caller.first
+              from = caller(1..1).first
               warn "Using MT_KWARGS_HAC\K yet passing kwargs. From #{from}"
               @@KW_WARNED = true
             end
@@ -141,7 +141,7 @@ module Minitest # :nodoc:
 
     def verify
       @expected_calls.each do |name, expected|
-        actual = @actual_calls.fetch(name, nil)
+        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
           actual.size < expected.size
@@ -150,7 +150,7 @@ module Minitest # :nodoc:
     end
 
     def method_missing sym, *args, **kwargs, &block # :nodoc:
-      unless @expected_calls.key?(sym) then
+      unless @expected_calls.key? sym then
         if @delegator && @delegator.respond_to?(sym)
           if kwargs.empty? then # FIX: drop this after 2.7 dead
             return @delegator.public_send(sym, *args, &block)
@@ -172,9 +172,9 @@ module Minitest # :nodoc:
       end
 
       expected_args, expected_kwargs, retval, val_block =
-        expected_call.values_at(:args, :kwargs, :retval, :block)
+        expected_call.values_at :args, :kwargs, :retval, :block
 
-      expected_kwargs = kwargs.map { |ak, av| [ak, Object] }.to_h if
+      expected_kwargs = kwargs.to_h { |ak, av| [ak, Object] } if
         Hash == expected_kwargs
 
       if val_block then
@@ -197,7 +197,7 @@ module Minitest # :nodoc:
           [sym, expected_kwargs.size, kwargs]
       end
 
-      zipped_args = expected_args.zip(args)
+      zipped_args = expected_args.zip args
       fully_matched = zipped_args.all? { |mod, a|
         mod === a or mod == a
       }
@@ -212,10 +212,10 @@ module Minitest # :nodoc:
         raise MockExpectationError, fmt % [sym, expected_kwargs.keys, kwargs.keys]
       end
 
-      zipped_kwargs = expected_kwargs.map { |ek, ev|
+      zipped_kwargs = expected_kwargs.to_h { |ek, ev|
         av = kwargs[ek]
         [ek, [ev, av]]
-      }.to_h
+      }
 
       fully_matched = zipped_kwargs.all? { |ek, (ev, av)|
         ev === av or ev == av
@@ -228,8 +228,8 @@ module Minitest # :nodoc:
 
       @actual_calls[sym] << {
         :retval => retval,
-        :args => zipped_args.map { |e, a| e === a ? e : a },
-        :kwargs => zipped_kwargs.map { |k, (e, a)| [k, e === a ? e : a] }.to_h,
+        :args   => zipped_args.map { |e, a| e === a ? e : a },
+        :kwargs => zipped_kwargs.to_h { |k, (e, a)| [k, e === a ? e : a] },
       }
 
       retval
@@ -238,7 +238,7 @@ module Minitest # :nodoc:
     def respond_to? sym, include_private = false # :nodoc:
       return true if @expected_calls.key? sym.to_sym
       return true if @delegator && @delegator.respond_to?(sym, include_private)
-      __respond_to?(sym, include_private)
+      __respond_to? sym, include_private
     end
   end
 end