minitest 5.24.0 → 5.25.0

data/lib/minitest/parallel.rb

@@ -1,5 +1,5 @@
 module Minitest
-  module Parallel #:nodoc:
+  module Parallel # :nodoc:
 
     ##
     # The engine used to run multiple tests in parallel.
@@ -24,10 +24,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_plugin.rb

@@ -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"].match?(/^xterm|-256color$/) ? 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,7 +109,7 @@ module Minitest
       #
       #   plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
 
-      @colors = (6 * 7).times.map { |n|
+      @colors = Array.new(6 * 7) { |n|
         n *= 1.0 / 3
         r  = (3 * Math.sin(n           ) + 3).to_i
         g  = (3 * Math.sin(n + 4 * PI_3) + 3).to_i

data/lib/minitest/spec.rb

@@ -4,11 +4,11 @@ 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
@@ -249,7 +249,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 +268,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
 
@@ -289,7 +289,7 @@ class Minitest::Spec < Minitest::Test
     end
 
     attr_reader :desc # :nodoc:
-    alias :specify :it
+    alias specify it
 
     ##
     # Rdoc... why are you so dumb?

data/lib/minitest/test.rb

@@ -85,20 +85,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
@@ -230,16 +228,6 @@ 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

data/lib/minitest/test_task.rb

@@ -150,7 +150,7 @@ module Minitest # :nodoc:
         ENV["N"] && ENV["N"].to_i > 0
 
       lib_extras = (ENV["MT_LIB_EXTRAS"] || "").split File::PATH_SEPARATOR
-      self.libs[0,0] = lib_extras
+      self.libs[0, 0] = lib_extras
 
       extra_args << "-n" << ENV["N"]                      if ENV["N"]
       extra_args << "-e" << ENV["X"]                      if ENV["X"]
@@ -169,7 +169,7 @@ module Minitest # :nodoc:
     def define # :nodoc:
       desc "Run the test suite. Use N, X, A, and TESTOPTS to add flags/args."
       task name do
-        ruby make_test_cmd, verbose:verbose
+        ruby make_test_cmd, verbose: verbose
       end
 
       desc "Print out the test command. Good for profiling and other tools."
@@ -183,7 +183,7 @@ module Minitest # :nodoc:
 
         # 3 seems to be the magic number... (tho not by that much)
         bad, good, n = {}, [], (ENV.delete("K") || 3).to_i
-        file = ENV.delete("F")
+        file = ENV.delete "F"
         times = {}
 
         tt0 = Time.now
@@ -244,7 +244,7 @@ module Minitest # :nodoc:
 
       task "#{name}:deps" => "#{name}:isolated" # now just an alias
 
-      desc "Show bottom 25 tests wrt time."
+      desc "Run the test suite and report the slowest 25 tests."
       task "#{name}:slow" do
         sh ["rake #{name} A=-v",
             "egrep '#test_.* s = .'",
@@ -268,11 +268,11 @@ module Minitest # :nodoc:
       runner = runner.join "; "
 
       args  = []
-      args << "-I#{libs.join(File::PATH_SEPARATOR)}" unless libs.empty?
+      args << "-I#{libs.join File::PATH_SEPARATOR}" unless libs.empty?
       args << "-w" if warning
-      args << '-e'
+      args << "-e"
       args << "'#{runner}'"
-      args << '--'
+      args << "--"
       args << extra_args.map(&:shellescape)
 
       args.join " "
@@ -293,10 +293,10 @@ class Work < Queue # :nodoc:
 end
 
 class Integer # :nodoc:
-  def threads_do(jobs) # :nodoc:
+  def threads_do jobs # :nodoc:
     q = Work.new jobs
 
-    self.times.map {
+    Array.new(self) {
       Thread.new do
         while job = q.pop # go until quit value
           yield job

data/lib/minitest.rb

@@ -9,7 +9,7 @@ require_relative "minitest/compress"
 # :include: README.rdoc
 
 module Minitest
-  VERSION = "5.24.0" # :nodoc:
+  VERSION = "5.25.0" # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -67,9 +67,8 @@ module Minitest
   # Registers Minitest to run at process exit
 
   def self.autorun
-    if Object.const_defined?(:Warning) && Warning.respond_to?(:[]=)
-      Warning[:deprecated] = true
-    end
+    Warning[:deprecated] = true if
+      Object.const_defined?(:Warning) && Warning.respond_to?(:[]=)
 
     at_exit {
       next if $! and not ($!.kind_of? SystemExit and $!.success?)
@@ -135,14 +134,14 @@ module Minitest
         next unless recv.respond_to? :minitest_plugin_init
         recv.minitest_plugin_init options
       else
-        raise ArgumentError, "blahblah %p" % [mod_or_meth]
+        raise ArgumentError, "plugin is %p, but it must be a symbol, string or module" % [mod_or_meth]
       end
     end
   end
 
   def self.process_args args = [] # :nodoc:
     options = {
-               :io => $stdout,
+                :io => $stdout,
               }
     orig_args = args.dup
 
@@ -186,7 +185,7 @@ module Minitest
         options[:skip] = s.chars.to_a
       end
 
-      ruby27plus = ::Warning.respond_to?(:[]=)
+      ruby27plus = ::Warning.respond_to? :[]=
 
       opts.on "-W[error]", String, "Turn Ruby warnings into errors" do |s|
         options[:Werror] = true
@@ -202,20 +201,20 @@ module Minitest
 
       unless extensions.empty?
         opts.separator ""
-        opts.separator "Known extensions: #{extensions.join(", ")}"
+        opts.separator "Known extensions: #{extensions.join ", "}"
 
         extensions.each do |mod_or_meth|
           case mod_or_meth
           when Symbol, String then
             meth = mod_or_meth
             msg = "plugin_#{meth}_options"
-            send msg, opts, options if respond_to?(msg)
+            send msg, opts, options if respond_to? msg
           when Module
             recv = mod_or_meth
             next unless recv.respond_to? :minitest_plugin_options
             recv.minitest_plugin_options opts, options
           else
-            raise ArgumentError, "blahblah %p" % [mod_or_meth]
+            raise ArgumentError, "plugin is %p, but it must be a symbol, string or module" % [mod_or_meth]
           end
         end
       end
@@ -240,7 +239,7 @@ module Minitest
     end
 
     options[:args] = orig_args.map { |s|
-      s =~ /[\s|&<>$()]/ ? s.inspect : s
+      s.match?(/[\s|&<>$()]/) ? s.inspect : s
     }.join " "
 
     options
@@ -282,7 +281,7 @@ module Minitest
     self.init_plugins options
     self.reporter = nil # runnables shouldn't depend on the reporter, ever
 
-    self.parallel_executor.start if parallel_executor.respond_to?(:start)
+    self.parallel_executor.start if parallel_executor.respond_to? :start
     reporter.start
     begin
       __run reporter, options
@@ -406,8 +405,8 @@ module Minitest
       pos = options[:filter]
       neg = options[:exclude]
 
-      pos = Regexp.new $1 if pos.is_a?(String) && pos =~ %r%/(.*)/%
-      neg = Regexp.new $1 if neg.is_a?(String) && neg =~ %r%/(.*)/%
+      pos = Regexp.new $1 if pos.kind_of?(String) && pos =~ %r%/(.*)/%
+      neg = Regexp.new $1 if neg.kind_of?(String) && neg =~ %r%/(.*)/%
 
       filtered_methods = self.runnable_methods
         .select { |m| !pos ||  pos === m || pos === "#{self}##{m}"  }
@@ -415,8 +414,22 @@ module Minitest
 
       return if filtered_methods.empty?
 
-      with_info_handler reporter do
+      t0 = name = nil
+
+      handler = lambda do
+        unless reporter.passed? then
+          warn "Current results:"
+          warn reporter.reporters.grep(SummaryReporter).first
+        end
+
+        warn "Current: %s#%s %.2fs" % [self, name, Minitest.clock_time - t0]
+      end
+
+      with_info_handler reporter, handler do
         filtered_methods.each do |method_name|
+          name = method_name
+          t0 = Minitest.clock_time
+
           run_one_method self, method_name, reporter
         end
       end
@@ -441,16 +454,7 @@ module Minitest
       :random
     end
 
-    def self.with_info_handler reporter, &block # :nodoc:
-      handler = lambda do
-        unless reporter.passed? then
-          warn "Current results:"
-          warn ""
-          warn reporter.reporters.first
-          warn ""
-        end
-      end
-
+    def self.with_info_handler reporter, handler, &block # :nodoc:
       on_signal ::Minitest.info_signal, handler, &block
     end
 
@@ -489,7 +493,7 @@ module Minitest
     def marshal_dump # :nodoc:
       unless @@marshal_dump_warned then
         warn ["Minitest::Runnable#marshal_dump is deprecated.",
-              "You might be violating internals. From", caller.first].join " "
+              "You might be violating internals. From", caller(1..1).first].join " "
         @@marshal_dump_warned = true
       end
 
@@ -617,7 +621,7 @@ module Minitest
     # Did this run error?
 
     def error?
-      self.failures.any? { |f| UnexpectedError === f }
+      self.failures.any? UnexpectedError
     end
   end
 
@@ -720,7 +724,7 @@ module Minitest
       true
     end
 
-    def synchronize(&block) # :nodoc:
+    def synchronize &block # :nodoc:
       @mutex.synchronize(&block)
     end
   end
@@ -752,11 +756,11 @@ module Minitest
   # own.
 
   class ProgressReporter < Reporter
-    def prerecord klass, name #:nodoc:
-      if options[:verbose] then
-        io.print "%s#%s = " % [klass.name, name]
-        io.flush
-      end
+    def prerecord klass, name # :nodoc:
+      return unless options[:verbose]
+
+      io.print "%s#%s = " % [klass.name, name]
+      io.flush
     end
 
     def record result # :nodoc:
@@ -890,10 +894,8 @@ module Minitest
   # own.
 
   class SummaryReporter < StatisticsReporter
-    # :stopdoc:
-    attr_accessor :sync
-    attr_accessor :old_sync
-    # :startdoc:
+    attr_accessor :sync     # :nodoc:
+    attr_accessor :old_sync # :nodoc:
 
     def start # :nodoc:
       super
@@ -941,20 +943,22 @@ module Minitest
     end
 
     def to_s # :nodoc:
-      aggregated_results(StringIO.new(''.b)).string
+      aggregated_results(StringIO.new("".b)).string
     end
 
     def summary # :nodoc:
-      extra = ""
+      extra = []
 
-      extra = "\n\nYou have skipped tests. Run with --verbose for details." if
-        results.any?(&:skipped?) unless
-        options[:verbose] or options[:show_skips] or ENV["MT_NO_SKIP_MSG"]
+      extra << ", %d warnings" % [warnings] if options[:Werror]
 
-      extra.prepend ", %d warnings" % [warnings] if options[:Werror]
+      extra << "\n\nYou have skipped tests. Run with --verbose for details." if
+        results.any?(&:skipped?) unless
+        options[:verbose]        or
+        options[:show_skips]     or
+        ENV["MT_NO_SKIP_MSG"]
 
       "%d runs, %d assertions, %d failures, %d errors, %d skips%s" %
-        [count, assertions, failures, errors, skips, extra]
+        [count, assertions, failures, errors, skips, extra.join]
     end
   end
 
@@ -1125,7 +1129,7 @@ module Minitest
 
     def maglev? platform = defined?(RUBY_ENGINE) && RUBY_ENGINE
       where = Minitest.filter_backtrace(caller).first
-      where = where.split(/:in /, 2).first # clean up noise
+      where = where.split(":in ", 2).first # clean up noise
       warn "DEPRECATED: `maglev?` called from #{where}. This will fail in Minitest 6."
       "maglev" == platform
     end
@@ -1134,14 +1138,14 @@ module Minitest
     # Is this running on mri?
 
     def mri? platform = RUBY_DESCRIPTION
-      /^ruby/ =~ platform
+      platform.start_with? "ruby"
     end
 
     ##
     # Is this running on macOS?
 
     def osx? platform = RUBY_PLATFORM
-      /darwin/ =~ platform
+      platform.include? "darwin"
     end
 
     ##
@@ -1149,7 +1153,7 @@ module Minitest
 
     def rubinius? platform = defined?(RUBY_ENGINE) && RUBY_ENGINE
       where = Minitest.filter_backtrace(caller).first
-      where = where.split(/:in /, 2).first # clean up noise
+      where = where.split(":in ", 2).first # clean up noise
       warn "DEPRECATED: `rubinius?` called from #{where}. This will fail in Minitest 6."
       "rbx" == platform
     end
@@ -1158,7 +1162,7 @@ module Minitest
     # Is this running on windows?
 
     def windows? platform = RUBY_PLATFORM
-      /mswin|mingw/ =~ platform
+      /mswin|mingw/.match? platform
     end
   end
 
@@ -1169,11 +1173,14 @@ module Minitest
 
   class BacktraceFilter
 
-    MT_RE = %r%lib/minitest|internal:warning% #:nodoc:
+    MT_RE = %r%lib/minitest|internal:warning% # :nodoc:
+
+    ##
+    # The regular expression to use to filter backtraces. Defaults to +MT_RE+.
 
     attr_accessor :regexp
 
-    def initialize regexp = MT_RE
+    def initialize regexp = MT_RE # :nodoc:
       self.regexp = regexp
     end
 
@@ -1186,9 +1193,9 @@ module Minitest
 
       return bt.dup if $DEBUG || ENV["MT_DEBUG"]
 
-      new_bt = bt.take_while { |line| line.to_s !~ regexp }
-      new_bt = bt.select     { |line| line.to_s !~ regexp } if new_bt.empty?
-      new_bt = bt.dup                                       if new_bt.empty?
+      new_bt = bt.take_while { |line| !regexp.match? line.to_s }
+      new_bt = bt.select     { |line| !regexp.match? line.to_s } if new_bt.empty?
+      new_bt = bt.dup                                            if new_bt.empty?
 
       new_bt
     end

data/test/minitest/metametameta.rb

@@ -3,10 +3,6 @@ require "stringio"
 require "minitest/autorun"
 
 class Minitest::Test
-  def clean s
-    s.gsub(/^ {6}/, "")
-  end
-
   def with_empty_backtrace_filter
     with_backtrace_filter Minitest::BacktraceFilter.new %r%.% do
       yield
@@ -31,6 +27,7 @@ class Minitest::Test
   end
 
   def assert_deprecation re = /DEPRECATED/
+    re = // if $-w.nil? # "skip" if running `rake testW0`
     assert_output "", re do
       yield
     end
@@ -67,7 +64,7 @@ class MetaMetaMetaTestCase < Minitest::Test
   def run_tu_with_fresh_reporter flags = %w[--seed 42]
     options = Minitest.process_args flags
 
-    @output = StringIO.new("".encode(Encoding::UTF_8))
+    @output = StringIO.new(+"")
 
     self.reporter = Minitest::CompositeReporter.new
     reporter << Minitest::SummaryReporter.new(@output, options)
@@ -76,7 +73,7 @@ class MetaMetaMetaTestCase < Minitest::Test
     with_stderr @output do
       reporter.start
 
-      yield(reporter) if block_given?
+      yield reporter if block_given?
 
       @tus ||= [@tu]
       @tus.each do |tu|
@@ -94,8 +91,8 @@ class MetaMetaMetaTestCase < Minitest::Test
   end
 
   def assert_report expected, flags = %w[--seed 42], &block
-    header = clean <<-EOM
-      Run options: #{flags.map { |s| s =~ /\|/ ? s.inspect : s }.join " "}
+    header = <<~EOM
+      Run options: #{flags.map { |s| s.include?("|") ? s.inspect : s }.join " "}
 
       # Running:
 
@@ -130,7 +127,7 @@ class MetaMetaMetaTestCase < Minitest::Test
     output.gsub!(/in [`']block in (?:([^']+)[#.])?/, "in 'block in")
     output.gsub!(/in [`'](?:([^']+)[#.])?/, "in '")
 
-    output.gsub!(/( at )[^:]+:\d+/) { "#{$1}[#{file[$2]}:LINE]" } # eval?
+    output.gsub!(/( at )([^:]+):\d+/) { "#{$1}[#{file[$2]}:LINE]" } # eval?
 
     output
   end