minitest 5.20.0 → 5.27.0

data/lib/minitest/expectations.rb

@@ -125,7 +125,7 @@ module Minitest::Expectations
   infect_an_assertion :assert_output, :must_output, :block
 
   ##
-  # See Minitest::Assertions#assert_pattern_match
+  # See Minitest::Assertions#assert_pattern
   #
   #    _ { ... }.must_pattern_match [...]
   #
@@ -293,7 +293,7 @@ module Minitest::Expectations
   infect_an_assertion :refute_operator, :wont_be, :reverse
 
   ##
-  # See Minitest::Assertions#refute_pattern_match
+  # See Minitest::Assertions#refute_pattern
   #
   #    _ { ... }.wont_pattern_match [...]
   #

data/lib/minitest/hell.rb

@@ -1,4 +1,4 @@
-require "minitest/parallel"
+require_relative "parallel"
 
 class Minitest::Test
   parallelize_me!

data/lib/minitest/manual_plugins.rb

@@ -0,0 +1,16 @@
+require_relative "../minitest"
+
+ARGV << "--no-plugins"
+
+module Minitest
+  ##
+  # Manually load plugins by name.
+
+  def self.load *names
+    names.each do |name|
+      require "minitest/#{name}_plugin"
+
+      self.extensions << name.to_s
+    end
+  end
+end

data/lib/minitest/mock.rb

@@ -8,9 +8,9 @@ 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 = %w[
+    overridden_methods = %i[
       ===
       class
       inspect
@@ -23,26 +23,23 @@ module Minitest # :nodoc:
       to_s
     ]
 
+    overridden_methods << :singleton_method_added if defined?(::DEBUGGER__)
+
     instance_methods.each do |m|
-      undef_method m unless overridden_methods.include?(m.to_s) || m =~ /^__/
+      undef_method m unless overridden_methods.include?(m) || m =~ /^__/
     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
-            method_missing(method_id, *args, &b)
-          else
-            method_missing(method_id, *args, **kwargs, &b)
-          end
+          method_missing(method_id, *args, **kwargs, &b)
         else
-          if kwargs.empty? then # FIX: drop this after 2.7 dead
-            super(*args, &b)
-          else
-            super(*args, **kwargs, &b)
-          end
+          super(*args, **kwargs, &b)
         end
       end
+    ensure
+      $-w = old_w
     end
 
     def initialize delegator = nil # :nodoc:
@@ -91,7 +88,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 }
@@ -104,7 +101,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
@@ -139,22 +136,18 @@ module Minitest # :nodoc:
 
     def verify
       @expected_calls.each do |name, expected|
-        actual = @actual_calls.fetch(name, nil)
-        raise MockExpectationError, "expected #{__call name, expected[0]}" unless actual
-        raise MockExpectationError, "expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
+        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
       end
       true
     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)
-          else
-            return @delegator.public_send(sym, *args, **kwargs, &block)
-          end
+          return @delegator.public_send(sym, *args, **kwargs, &block)
         else
           raise NoMethodError, "unmocked method %p, expected one of %p" %
             [sym, @expected_calls.keys.sort_by(&:to_s)]
@@ -170,9 +163,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
@@ -195,7 +188,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
       }
@@ -210,10 +203,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
@@ -226,8 +219,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
@@ -236,20 +229,35 @@ 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
 
 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 if
+    defined?(infect_an_assertion)
+end
+
 ##
 # Object extensions for Minitest::Mock.
 
@@ -300,18 +308,10 @@ class Object
     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
+          val_or_callable.call(*args, **kwargs, &blk)
         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
+            blk.call(*block_args, **block_kwargs)
           end
           val_or_callable
         end

data/lib/minitest/parallel.rb

@@ -1,5 +1,7 @@
+require "thread"
+
 module Minitest
-  module Parallel #:nodoc:
+  module Parallel # :nodoc:
 
     ##
     # The engine used to run multiple tests in parallel.
@@ -16,7 +18,7 @@ module Minitest
 
       def initialize size
         @size  = size
-        @queue = Queue.new
+        @queue = Thread::Queue.new
         @pool  = nil
       end
 
@@ -24,10 +26,10 @@ module Minitest
       # Start the executor
 
       def start
-        @pool  = size.times.map {
-          Thread.new(@queue) do |queue|
+        @pool  = Array.new(size) {
+          Thread.new @queue do |queue|
             Thread.current.abort_on_exception = true
-            while (job = queue.pop)
+            while job = queue.pop do
               klass, method, reporter = job
               reporter.synchronize { reporter.prerecord klass, method }
               result = Minitest.run_one_method klass, method

data/lib/minitest/pride.rb

@@ -1,4 +1,4 @@
-require "minitest"
+require_relative "../minitest"
 
 Minitest.load_plugins
 Minitest::PrideIO.pride!

data/lib/minitest/pride_plugin.rb

@@ -1,4 +1,4 @@
-require "minitest"
+require_relative "../minitest"
 
 module Minitest
   def self.plugin_pride_options opts, _options # :nodoc:
@@ -8,13 +8,13 @@ module Minitest
   end
 
   def self.plugin_pride_init options # :nodoc:
-    if PrideIO.pride? then
-      klass = ENV["TERM"] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
-      io    = klass.new options[:io]
+    return unless PrideIO.pride?
 
-      self.reporter.reporters.grep(Minitest::Reporter).each do |rep|
-        rep.io = io if rep.io.tty?
-      end
+    klass = ENV["TERM"] =~ /^xterm|-(?:256color|direct)$/ ? PrideLOL : PrideIO
+    io    = klass.new options[:io]
+
+    self.reporter.reporters.grep(Minitest::Reporter).each do |rep|
+      rep.io = io if rep.io.tty?
     end
   end
 
@@ -59,12 +59,10 @@ module Minitest
 
     def print o
       case o
-      when "." then
+      when ".", "S" then
         io.print pride o
       when "E", "F" then
         io.print "#{ESC}41m#{ESC}37m#{o}#{NND}"
-      when "S" then
-        io.print pride o
       else
         io.print o
       end
@@ -72,11 +70,9 @@ module Minitest
 
     def puts *o # :nodoc:
       o.map! { |s|
-        s.to_s.sub(/Finished/) {
+        s.to_s.sub("Finished") {
           @index = 0
-          "Fabulous run".split(//).map { |c|
-            pride(c)
-          }.join
+          "Fabulous run".chars.map { |c| pride(c) }.join
         }
       }
 
@@ -113,19 +109,16 @@ module Minitest
       #
       #   plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
 
-      # 6 has wide pretty gradients. 3 == lolcat, about half the width
-      @colors = (0...(6 * 7)).map { |n|
-        n *= 1.0 / 6
+      @colors = Array.new(6 * 7) { |n|
+        n *= 1.0 / 3
         r  = (3 * Math.sin(n           ) + 3).to_i
-        g  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
-        b  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
-
-        # Then we take rgb and encode them in a single number using base 6.
-        # For some mysterious reason, we add 16... to clear the bottom 4 bits?
-        # Yes... they're ugly.
+        g  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
+        b  = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
 
+        # Then we take rgb and encode them in a single number using
+        # base 6, shifted by 16 for the base 16 ansi colors.
         36 * r + 6 * g + b + 16
-      }
+      }.rotate(4) # puts "red" first
 
       super
     end

data/lib/minitest/spec.rb

@@ -1,14 +1,14 @@
-require "minitest/test"
+require_relative "test"
 
 class Module # :nodoc:
   def infect_an_assertion meth, new_name, dont_flip = false # :nodoc:
     block = dont_flip == :block
     dont_flip = false if block
-    target_obj = block ? '_{obj.method}' : '_(obj)'
+    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)
+    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
@@ -38,7 +38,11 @@ class Module # :nodoc:
   end
 end
 
-Minitest::Expectation = Struct.new :target, :ctx # :nodoc:
+# :stopdoc:
+module Minitest # fucking hell rdoc...
+  Expectation = Struct.new :target, :ctx
+end
+# :startdoc:
 
 ##
 # Kernel extensions for minitest
@@ -81,14 +85,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
+    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, desc
+    cls = sclas.create name.compact.join("::"), desc
 
     stack.push cls
     cls.class_eval(&block)
@@ -249,7 +254,7 @@ class Minitest::Spec < Minitest::Test
       pre, post = "let '#{name}' cannot ", ". Please use another name."
       methods = Minitest::Spec.instance_methods.map(&:to_s) - %w[subject]
       raise ArgumentError, "#{pre}begin with 'test'#{post}" if
-        name =~ /\Atest/
+        name.start_with? "test"
       raise ArgumentError, "#{pre}override a method in Minitest::Spec#{post}" if
         methods.include? name
 
@@ -268,7 +273,7 @@ class Minitest::Spec < Minitest::Test
     end
 
     def create name, desc # :nodoc:
-      cls = Class.new(self) do
+      cls = Class.new self do
         @name = name
         @desc = desc
 
@@ -284,12 +289,11 @@ class Minitest::Spec < Minitest::Test
       defined?(@name) ? @name : super
     end
 
-    def to_s # :nodoc:
-      name # Can't alias due to 1.8.7, not sure why
-    end
+    alias to_s name
+    alias inspect name
 
     attr_reader :desc # :nodoc:
-    alias :specify :it
+    alias specify it
 
     ##
     # Rdoc... why are you so dumb?
@@ -342,7 +346,7 @@ class Minitest::Spec < Minitest::Test
   TYPES = DSL::TYPES # :nodoc:
 end
 
-require "minitest/expectations"
+require_relative "expectations"
 
 class Object # :nodoc:
   include Minitest::Expectations unless ENV["MT_NO_EXPECTATIONS"]

data/lib/minitest/test.rb

@@ -1,4 +1,4 @@
-require "minitest" unless defined? Minitest::Runnable
+require_relative "../minitest" unless defined? Minitest::Runnable
 
 module Minitest
   ##
@@ -8,9 +8,9 @@ module Minitest
   # See Minitest::Assertions
 
   class Test < Runnable
-    require "minitest/assertions"
-    include Minitest::Assertions
+    require_relative "assertions"
     include Minitest::Reportable
+    include Minitest::Assertions
 
     def class_name # :nodoc:
       self.class.name # for Minitest::Reportable
@@ -52,11 +52,13 @@ module Minitest
     end
 
     ##
-    # Call this at the top of your tests when you want to run your
-    # tests in parallel. In doing so, you're admitting that you rule
-    # and your tests are awesome.
+    # Call this at the top of your tests (inside the +Minitest::Test+
+    # subclass or +describe+ block) when you want to run your tests in
+    # parallel. In doing so, you're admitting that you rule and your
+    # tests are awesome.
 
     def self.parallelize_me!
+      return unless Minitest.parallel_executor
       include Minitest::Parallel::Test
       extend Minitest::Parallel::Test::ClassMethods
     end
@@ -84,20 +86,18 @@ module Minitest
     # Runs a single test with setup/teardown hooks.
 
     def run
-      with_info_handler do
-        time_it do
-          capture_exceptions do
-            SETUP_METHODS.each do |hook|
-              self.send hook
-            end
-
-            self.send self.name
+      time_it do
+        capture_exceptions do
+          SETUP_METHODS.each do |hook|
+            self.send hook
           end
 
-          TEARDOWN_METHODS.each do |hook|
-            capture_exceptions do
-              self.send hook
-            end
+          self.send self.name
+        end
+
+        TEARDOWN_METHODS.each do |hook|
+          capture_exceptions do
+            self.send hook
           end
         end
       end
@@ -229,20 +229,10 @@ module Minitest
       ne
     end
 
-    def with_info_handler &block # :nodoc:
-      t0 = Minitest.clock_time
-
-      handler = lambda do
-        warn "\nCurrent: %s#%s %.2fs" % [self.class, self.name, Minitest.clock_time - t0]
-      end
-
-      self.class.on_signal ::Minitest.info_signal, handler, &block
-    end
-
     include LifecycleHooks
     include Guard
     extend Guard
   end # Test
 end
 
-require "minitest/unit" if ENV["MT_COMPAT"] # compatibility layer only
+require_relative "unit" if ENV["MT_COMPAT"] # compatibility layer only