minitest 5.9.1 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b2bfd6246154ea0c90600c09def193d9521a93
-  data.tar.gz: 25c490162019763e15b7c701d550034102d5a907
+  metadata.gz: 48297af06eab4424d8838e3313b009557efd6d89
+  data.tar.gz: 55fc554fbf6475f7d1f59e101b0deedc81c7dd54
 SHA512:
-  metadata.gz: 41ce137f8c906c21cd21742bdab148f90e6e595202133edabda0ad20a75164f2a0d06338892734d4e1f72b31a496cfe8df64d1d3e3bec9f6ce12743e3b99bfab
-  data.tar.gz: 5c3cac4d95858c58afe7ab572b31a369a51dcb205189584bb8f9604290b8e8942ee2a2d17eeb727924691fd0b63600745a165a07d09143bff54b5cf2c4d01923
+  metadata.gz: 4a43c8e38da3dc9b26147b7e0242d7d95875b35c23be0965a8811bf16754cb58eab55ec763cfaa34c5f2a056c0defe9a4460b79005a36f48f73949d6fdf68081
+  data.tar.gz: 0aefd1de07da46c5f4e90b43946f88c64740503ec003f27869804c0a380b071e06d9648a6b6c3c339d588a02e9ab26cac269092a0f7fb4783f7df5d6eaaff103

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 5.10.0 / 2016-11-30
+
+* 2 minor enhancements:
+
+  * Added AbstractReporter#prerecord and extended ProgressReporter and CompositeReporter to use it.
+  * Minor optimization: remove runnables with no runnable methods before run.
+
+* 1 bug fix:
+
+  * 2.4: removed deprecation warnings when referring to Fixnum.
+
 === 5.9.1 / 2016-09-25
 
 * 2 bug fixes:

data/README.rdoc

@@ -325,7 +325,7 @@ bogus example:
 
 Minitest uses composite reporter to output test results using multiple
 reporter instances. You can add new reporters to the composite during
-the init_plugins phase. As we saw in +plugin_bonus_init+ above, you
+the init_plugins phase. As we saw in +plugin_bogus_init+ above, you
 simply add your reporter instance to the composite via <tt><<</tt>.
 
 +AbstractReporter+ defines the API for reporters. You may subclass it
@@ -466,7 +466,7 @@ minitest-around             :: Around block for minitest. An alternative to
                                setup/teardown dance.
 minitest-assert_errors      :: Adds Minitest assertions to test for errors raised
                                or not raised by Minitest itself.
-minitest-autotest           :: autotest is a continous testing facility meant to
+minitest-autotest           :: autotest is a continuous testing facility meant to
                                be used during development.
 minitest-bacon              :: minitest-bacon extends minitest with bacon-like
                                functionality.
@@ -605,6 +605,10 @@ Authors... Please send me a pull request with a description of your minitest ext
 * minitest-sugar
 * spork-minitest
 
+== Minitest related goods
+
+* minitest/pride fabric: http://www.spoonflower.com/fabric/3928730-again-by-katie_allen
+
 == REQUIREMENTS:
 
 * Ruby 1.8.7+. No magic is involved. I hope.

data/Rakefile

@@ -11,13 +11,27 @@ Hoe.spec "minitest" do
 
   license "MIT"
 
-  self.testlib = :minitest
+  ## TODO: uncomment this on the last point release on 5.x
+  #
+  #   self.post_install_message = <<-"EOM"
+  # NOTE: minitest 5 will be the last in the minitest family to support
+  #       ruby 1.8 and 1.9 (and maybe 2.0?). If you need to keep using 1.8
+  #       or 1.9, you need to pin your dependency to minitest with
+  #       something like "~> 5.0".
+  #
+  #       Further, minitest 6 will be dropping the following:
+  #
+  #       + MiniTest (it's been Minitest for *years*)
+  #       + MiniTest::Unit
+  #       + MiniTest::Unit::TestCase
+  #       + assert_send (unless you argue for it well)
+  #   EOM
 end
 
 desc "Find missing expectations"
 task :specs do
   $:.unshift "lib"
-  require "minitest/unit"
+  require "minitest/test"
   require "minitest/spec"
 
   pos_prefix, neg_prefix = "must", "wont"

data/lib/minitest.rb

@@ -7,7 +7,7 @@ require "minitest/parallel"
 # :include: README.rdoc
 
 module Minitest
-  VERSION = "5.9.1" # :nodoc:
+  VERSION = "5.10.0" # :nodoc:
   ENCS = "".respond_to? :encoding # :nodoc:
 
   @@installed_at_exit ||= false
@@ -147,7 +147,7 @@ module Minitest
   # sub-classes to run.
 
   def self.__run reporter, options
-    suites = Runnable.runnables.shuffle
+    suites = Runnable.runnables.reject { |s| s.runnable_methods.empty? }.shuffle
     parallel, serial = suites.partition { |s| s.test_order == :parallel }
 
     # If we run the parallel tests before the serial tests, the parallel tests
@@ -319,6 +319,7 @@ module Minitest
     # test. See Minitest::ParallelTest::ClassMethods for an example.
 
     def self.run_one_method klass, method_name, reporter
+      reporter.prerecord klass, method_name
       reporter.record Minitest.run_one_method(klass, method_name)
     end
 
@@ -429,6 +430,13 @@ module Minitest
     def start
     end
 
+    ##
+    # About to start running a test. This allows a reporter to show
+    # that it is starting or that we are in the middle of a test run.
+
+    def prerecord klass, name
+    end
+
     ##
     # Record a result and output the Runnable#result_code. Stores the
     # result of the run if the run did not pass.
@@ -477,9 +485,15 @@ module Minitest
   # own.
 
   class ProgressReporter < Reporter
+    def prerecord klass, name
+      if options[:verbose] then
+        io.print "%s#%s = " % [klass, name]
+        io.flush
+      end
+    end
+
     def record result # :nodoc:
-      io.print "%s#%s = %.2f s = " % [result.class, result.name, result.time] if
-        options[:verbose]
+      io.print "%.2f s = " % [result.time] if options[:verbose]
       io.print result.result_code
       io.puts if options[:verbose]
     end
@@ -648,6 +662,12 @@ module Minitest
       self.reporters.each(&:start)
     end
 
+    def prerecord klass, name # :nodoc:
+      self.reporters.each do |reporter|
+        reporter.prerecord klass, name
+      end
+    end
+
     def record result # :nodoc:
       self.reporters.each do |reporter|
         reporter.record result
@@ -785,9 +805,11 @@ module Minitest
 
       return bt.dup if $DEBUG
 
-      new_bt = bt.take_while { |line| line !~ /lib\/minitest/ }
-      new_bt = bt.select     { |line| line !~ /lib\/minitest/ } if new_bt.empty?
-      new_bt = bt.dup                                           if new_bt.empty?
+      mt_re = %r%lib/minitest%
+
+      new_bt = bt.take_while { |line| line !~ mt_re }
+      new_bt = bt.select     { |line| line !~ mt_re } if new_bt.empty?
+      new_bt = bt.dup                                 if new_bt.empty?
 
       new_bt
     end
@@ -801,7 +823,9 @@ module Minitest
     result
   end
 
-  if defined? Process::CLOCK_MONOTONIC
+  # :stopdoc:
+
+  if defined? Process::CLOCK_MONOTONIC # :nodoc:
     def self.clock_time
       Process.clock_gettime Process::CLOCK_MONOTONIC
     end
@@ -810,6 +834,8 @@ module Minitest
       Time.now
     end
   end
+
+  # :startdoc:
 end
 
 require "minitest/test"

data/lib/minitest/assertions.rb

@@ -171,7 +171,17 @@ module Minitest
 
     def assert_equal exp, act, msg = nil
       msg = message(msg, E) { diff exp, act }
-      assert exp == act, msg
+      result = assert exp == act, msg
+
+      if exp.nil? then
+        if Minitest::VERSION =~ /^6/ then
+          refute_nil exp, "Use assert_nil if expecting nil."
+        else
+          $stderr.puts "Use assert_nil if expecting nil from #{caller.first}. This will fail in MT6."
+        end
+      end
+
+      result
     end
 
     ##
@@ -357,6 +367,8 @@ module Minitest
     # Fails unless the call returns a true value
 
     def assert_send send_ary, m = nil
+      warn "DEPRECATED: assert_send. From #{caller.first}"
+
       recv, msg, *args = send_ary
       m = message(m) {
         "Expected #{mu_pp(recv)}.#{msg}(*#{mu_pp(args)}) to return true" }
@@ -386,8 +398,10 @@ module Minitest
         rescue ThreadError => e       # wtf?!? 1.8 + threads == suck
           default += ", not \:#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
         rescue ArgumentError => e     # 1.9 exception
+          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
           default += ", not #{e.name.inspect}"
         end
         caught = false

data/lib/minitest/benchmark.rb

@@ -1,4 +1,4 @@
-require "minitest/unit"
+require "minitest/test"
 require "minitest/spec"
 
 module Minitest

data/lib/minitest/mock.rb

@@ -37,7 +37,7 @@ module Minitest # :nodoc:
       end
     end
 
-    def initialize(delegator = nil) # :nodoc:
+    def initialize delegator = nil # :nodoc:
       @delegator = delegator
       @expected_calls = Hash.new { |calls, name| calls[name] = [] }
       @actual_calls   = Hash.new { |calls, name| calls[name] = [] }
@@ -67,7 +67,7 @@ module Minitest # :nodoc:
     #   @mock.expect(:uses_one_string, true, ["foo"])
     #   @mock.uses_one_string("bar") # => raises MockExpectationError
 
-    def expect(name, retval, args = [], &blk)
+    def expect name, retval, args = [], &blk
       name = name.to_sym
 
       if block_given?
@@ -104,7 +104,7 @@ module Minitest # :nodoc:
       true
     end
 
-    def method_missing(sym, *args, &block) # :nodoc:
+    def method_missing sym, *args, &block # :nodoc:
       unless @expected_calls.key?(sym) then
         if @delegator && @delegator.respond_to?(sym)
           return @delegator.public_send(sym, *args, &block)
@@ -158,7 +158,7 @@ module Minitest # :nodoc:
       retval
     end
 
-    def respond_to?(sym, include_private = false) # :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)

data/lib/minitest/parallel.rb

@@ -1,5 +1,5 @@
 module Minitest
-  module Parallel
+  module Parallel #:nodoc:
 
     ##
     # The engine used to run multiple tests in parallel.

data/lib/minitest/pride_plugin.rb

@@ -70,7 +70,7 @@ module Minitest
       end
     end
 
-    def puts(*o) # :nodoc:
+    def puts *o # :nodoc:
       o.map! { |s|
         s.to_s.sub(/Finished/) {
           @index = 0

data/lib/minitest/spec.rb

@@ -132,7 +132,7 @@ class Minitest::Spec < Minitest::Test
     #       desc.superclass == ActiveRecord::Base
     #     end
 
-    def register_spec_type(*args, &block)
+    def register_spec_type *args, &block
       if block then
         matcher, klass = block, args.first
       else

data/lib/minitest/test.rb

@@ -37,9 +37,7 @@ module Minitest
     def self.make_my_diffs_pretty!
       require "pp"
 
-      define_method :mu_pp do |o|
-        o.pretty_inspect
-      end
+      define_method :mu_pp, &:pretty_inspect
     end
 
     ##

data/lib/minitest/unit.rb

@@ -34,7 +34,7 @@ module Minitest
       Minitest.autorun
     end
 
-    def self.after_tests(&b) # :nodoc:
+    def self.after_tests &b # :nodoc:
       from = caller.first
       warn "MiniTest::Unit.after_tests is now Minitest.after_run. From #{from}"
       Minitest.after_run(&b)

data/test/minitest/metametameta.rb

@@ -8,6 +8,17 @@ class Minitest::Test
   end
 end
 
+class FakeNamedTest < Minitest::Test
+  @@count = 0
+
+  def self.name
+    @fake_name ||= begin
+                     @@count += 1
+                     "FakeNamedTest%02d" % @@count
+                   end
+  end
+end
+
 class MetaMetaMetaTestCase < Minitest::Test
   attr_accessor :reporter, :output, :tu
 

data/test/minitest/test_minitest_mock.rb

@@ -174,10 +174,10 @@ class TestMinitestMock < Minitest::Test
   end
 
   def test_mock_is_a_blank_slate
-    @mock.expect :kind_of?, true, [Fixnum]
+    @mock.expect :kind_of?, true, [String]
     @mock.expect :==, true, [1]
 
-    assert @mock.kind_of?(Fixnum), "didn't mock :kind_of\?"
+    assert @mock.kind_of?(String), "didn't mock :kind_of\?"
     assert @mock == 1, "didn't mock :=="
   end
 
@@ -473,11 +473,11 @@ class TestMinitestStub < Minitest::Test
     @assertion_count = 2
 
     dynamic = Class.new do
-      def self.respond_to?(meth)
+      def self.respond_to? meth
         meth == :found
       end
 
-      def self.method_missing(meth, *args, &block)
+      def self.method_missing meth, *args, &block
         if meth == :found
           false
         else
@@ -501,8 +501,8 @@ class TestMinitestStub < Minitest::Test
     end
     rs = nil
 
-    File.stub(:open, true, mock) do
-      File.open("foo.txt", "r") do |f|
+    File.stub :open, true, mock do
+      File.open "foo.txt", "r" do |f|
         rs = f.write
       end
     end

data/test/minitest/test_minitest_spec.rb

@@ -12,6 +12,9 @@ class ExampleA; end
 class ExampleB < ExampleA; end
 
 describe Minitest::Spec do
+  # helps to deal with 2.4 deprecation of Fixnum for Integer
+  Int = 1.class
+
   # do not parallelize this suite... it just can"t handle it.
 
   def assert_triggered expected = "blah", klass = Minitest::Assertion
@@ -115,7 +118,7 @@ describe Minitest::Spec do
     @assertion_count -= 1 # no msg
     @assertion_count += 2 # assert_output is 2 assertions
 
-    proc {  }.must_be_silent.must_equal true
+    proc {}.must_be_silent.must_equal true
 
     assert_triggered "In stdout.\nExpected: \"\"\n  Actual: \"xxx\"" do
       proc { print "xxx" }.must_be_silent
@@ -304,7 +307,7 @@ describe Minitest::Spec do
   it "needs to verify inequality" do
     @assertion_count += 2
     42.wont_equal(6 * 9).must_equal false
-    proc{}.wont_equal(42).must_equal false
+    proc {}.wont_equal(42).must_equal false
 
     assert_triggered "Expected 1 to not be equal to 1." do
       1.wont_equal 1
@@ -318,12 +321,12 @@ describe Minitest::Spec do
   it "needs to verify instances of a class" do
     42.wont_be_instance_of(String).must_equal false
 
-    assert_triggered "Expected 42 to not be an instance of Fixnum." do
-      42.wont_be_instance_of Fixnum
+    assert_triggered "Expected 42 to not be a kind of #{Int.name}." do
+      42.wont_be_kind_of Int
     end
 
-    assert_triggered "msg.\nExpected 42 to not be an instance of Fixnum." do
-      42.wont_be_instance_of Fixnum, "msg"
+    assert_triggered "msg.\nExpected 42 to not be an instance of #{Int.name}." do
+      42.wont_be_instance_of Int, "msg"
     end
   end
 
@@ -331,34 +334,34 @@ describe Minitest::Spec do
     @assertion_count += 2
 
     42.wont_be_kind_of(String).must_equal false
-    proc{}.wont_be_kind_of(String).must_equal false
+    proc {}.wont_be_kind_of(String).must_equal false
 
-    assert_triggered "Expected 42 to not be a kind of Integer." do
-      42.wont_be_kind_of Integer
+    assert_triggered "Expected 42 to not be a kind of #{Int.name}." do
+      42.wont_be_kind_of Int
     end
 
-    assert_triggered "msg.\nExpected 42 to not be a kind of Integer." do
-      42.wont_be_kind_of Integer, "msg"
+    assert_triggered "msg.\nExpected 42 to not be a kind of #{Int.name}." do
+      42.wont_be_kind_of Int, "msg"
     end
   end
 
   it "needs to verify kinds of objects" do
     @assertion_count += 3 # extra test
 
-    (6 * 7).must_be_kind_of(Fixnum).must_equal true
+    (6 * 7).must_be_kind_of(Int).must_equal true
     (6 * 7).must_be_kind_of(Numeric).must_equal true
 
-    assert_triggered "Expected 42 to be a kind of String, not Fixnum." do
+    assert_triggered "Expected 42 to be a kind of String, not #{Int.name}." do
       (6 * 7).must_be_kind_of String
     end
 
-    assert_triggered "msg.\nExpected 42 to be a kind of String, not Fixnum." do
+    assert_triggered "msg.\nExpected 42 to be a kind of String, not #{Int.name}." do
       (6 * 7).must_be_kind_of String, "msg"
     end
 
     exp = "Expected #<Proc:0xXXXXXX@PATH> to be a kind of String, not Proc."
     assert_triggered exp do
-      proc{}.must_be_kind_of String
+      proc {}.must_be_kind_of String
     end
   end
 
@@ -502,7 +505,7 @@ describe Minitest::Spec do
     proc { throw :blah }.must_throw(:blah).must_equal true
 
     assert_triggered "Expected :blah to have been thrown." do
-      proc { }.must_throw :blah
+      proc {}.must_throw :blah
     end
 
     assert_triggered "Expected :blah to have been thrown, not :xxx." do
@@ -510,7 +513,7 @@ describe Minitest::Spec do
     end
 
     assert_triggered "msg.\nExpected :blah to have been thrown." do
-      proc { }.must_throw :blah, "msg"
+      proc {}.must_throw :blah, "msg"
     end
 
     assert_triggered "msg.\nExpected :blah to have been thrown, not :xxx." do
@@ -519,9 +522,9 @@ describe Minitest::Spec do
   end
 
   it "needs to verify types of objects" do
-    (6 * 7).must_be_instance_of(Fixnum).must_equal true
+    (6 * 7).must_be_instance_of(Int).must_equal true
 
-    exp = "Expected 42 to be an instance of String, not Fixnum."
+    exp = "Expected 42 to be an instance of String, not #{Int.name}."
 
     assert_triggered exp do
       (6 * 7).must_be_instance_of String
@@ -565,11 +568,11 @@ describe Minitest::Spec do
   it "needs to verify using respond_to" do
     42.must_respond_to(:+).must_equal true
 
-    assert_triggered "Expected 42 (Fixnum) to respond to #clear." do
+    assert_triggered "Expected 42 (#{Int.name}) to respond to #clear." do
       42.must_respond_to :clear
     end
 
-    assert_triggered "msg.\nExpected 42 (Fixnum) to respond to #clear." do
+    assert_triggered "msg.\nExpected 42 (#{Int.name}) to respond to #clear." do
       42.must_respond_to :clear, "msg"
     end
   end
@@ -626,7 +629,7 @@ describe Minitest::Spec, :let do
   end
 
   it "procs come after dont_flip" do
-    p = proc { }
+    p = proc {}
     assert_respond_to p, :call
     p.must_respond_to :call
   end
@@ -947,21 +950,21 @@ class ValueMonadTest < Minitest::Test
   attr_accessor :struct
 
   def setup
-    @struct = { :_ => 'a', :value => 'b', :expect => 'c' }
+    @struct = { :_ => "a", :value => "b", :expect => "c" }
     def @struct.method_missing k # think openstruct
       self[k]
     end
   end
 
   def test_value_monad_method
-    assert_equal 'a', struct._
+    assert_equal "a", struct._
   end
 
   def test_value_monad_value_alias
-    assert_equal 'b', struct.value
+    assert_equal "b", struct.value
   end
 
   def test_value_monad_expect_alias
-    assert_equal 'c', struct.expect
+    assert_equal "c", struct.expect
   end
 end

data/test/minitest/test_minitest_test.rb

@@ -67,7 +67,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
   # end
 
   def test_passed_eh_teardown_good
-    test_class = Class.new Minitest::Test do
+    test_class = Class.new FakeNamedTest do
       def teardown; assert true; end
       def test_omg; assert true; end
     end
@@ -78,7 +78,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
   end
 
   def test_passed_eh_teardown_skipped
-    test_class = Class.new Minitest::Test do
+    test_class = Class.new FakeNamedTest do
       def teardown; assert true; end
       def test_omg; skip "bork"; end
     end
@@ -91,7 +91,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
   end
 
   def test_passed_eh_teardown_flunked
-    test_class = Class.new Minitest::Test do
+    test_class = Class.new FakeNamedTest do
       def teardown; flunk;       end
       def test_omg; assert true; end
     end
@@ -138,7 +138,7 @@ class TestMinitestUnitInherited < MetaMetaMetaTestCase
   def test_inherited_hook_plays_nice_with_others
     with_overridden_include do
       assert_throws :inherited_hook do
-        Class.new Minitest::Test
+        Class.new FakeNamedTest
       end
     end
   end
@@ -158,7 +158,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_test
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       attr_reader :foo
 
       def run
@@ -187,7 +187,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_error
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -215,7 +215,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_error_teardown
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -261,7 +261,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def setup_basic_tu
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -289,14 +289,14 @@ class TestMinitestRunner < MetaMetaMetaTestCase
   def assert_filtering filter, name, expected, a = false
     args = %W[--#{filter} #{name} --seed 42]
 
-    alpha = Class.new Minitest::Test do
+    alpha = Class.new FakeNamedTest do
       define_method :test_something do
         assert a
       end
     end
     Object.const_set(:Alpha, alpha)
 
-    beta = Class.new Minitest::Test do
+    beta = Class.new FakeNamedTest do
       define_method :test_something do
         assert true
       end
@@ -320,7 +320,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'name', "/Beta#test_something/", expected
+    assert_filtering "name", "/Beta#test_something/", expected
   end
 
   def test_run_filtered_including_suite_name_string
@@ -332,7 +332,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'name', "Beta#test_something", expected
+    assert_filtering "name", "Beta#test_something", expected
   end
 
   def test_run_filtered_string_method_only
@@ -344,7 +344,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       2 runs, 2 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'name', "test_something", expected, :pass
+    assert_filtering "name", "test_something", expected, :pass
   end
 
   def test_run_failing_excluded
@@ -370,7 +370,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'exclude', "/Alpha#test_something/", expected
+    assert_filtering "exclude", "/Alpha#test_something/", expected
   end
 
   def test_run_filtered_excluding_suite_name_string
@@ -382,7 +382,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       1 runs, 1 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'exclude', "Alpha#test_something", expected
+    assert_filtering "exclude", "Alpha#test_something", expected
   end
 
   def test_run_filtered_excluding_string_method_only
@@ -394,12 +394,12 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       0 runs, 0 assertions, 0 failures, 0 errors, 0 skips
     EOM
 
-    assert_filtering 'exclude', "test_something", expected, :pass
+    assert_filtering "exclude", "test_something", expected, :pass
   end
 
   def test_run_passing
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -418,7 +418,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_skip
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -445,7 +445,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_skip_verbose
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def test_something
         assert true
       end
@@ -473,7 +473,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
   def test_run_with_other_runner
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       def self.run reporter, options = {}
         @reporter = reporter
         before_my_suite
@@ -548,7 +548,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
     }
 
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       parallelize_me!
 
       test_count.times do |i|
@@ -596,7 +596,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
   def test_before_setup
     call_order = []
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       define_method :setup do
         super()
         call_order << :setup
@@ -618,7 +618,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
   def test_after_teardown
     call_order = []
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       define_method :teardown do
         super()
         call_order << :teardown
@@ -640,7 +640,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
   def test_all_teardowns_are_guaranteed_to_run
     call_order = []
     @tu =
-    Class.new Minitest::Test do
+    Class.new FakeNamedTest do
       define_method :after_teardown do
         super()
         call_order << :after_teardown
@@ -671,7 +671,7 @@ class TestMinitestUnitOrder < MetaMetaMetaTestCase
   def test_setup_and_teardown_survive_inheritance
     call_order = []
 
-    @tu = Class.new Minitest::Test do
+    @tu = Class.new FakeNamedTest do
       define_method :setup do
         call_order << :setup_method
       end
@@ -979,6 +979,29 @@ class TestMinitestUnitTestCase < Minitest::Test
     end
   end
 
+  def test_assert_equal_does_not_allow_lhs_nil
+    if Minitest::VERSION =~ /^6/ then
+      warn "Time to strip the MT5 test"
+
+      @assertion_count += 1
+      assert_triggered(/Use assert_nil if expecting nil/) do
+        @tc.assert_equal nil, nil
+      end
+    else
+      err_re = /Use assert_nil if expecting nil from .*test_minitest_test.rb/
+
+      assert_output "", err_re do
+        @tc.assert_equal nil, nil
+      end
+    end
+  end
+
+  def test_assert_equal_does_not_allow_lhs_nil_triggered
+    assert_triggered "Expected: nil\n  Actual: false" do
+      @tc.assert_equal nil, false
+    end
+  end
+
   def test_assert_in_delta
     @tc.assert_in_delta 0.0, 1.0 / 1000, 0.1
   end
@@ -1088,7 +1111,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     @assertion_count = 2
 
     pattern = Object.new
-    def pattern.=~(_) true end
+    def pattern.=~ _; true end
 
     @tc.assert_match pattern, 5
   end
@@ -1106,7 +1129,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     @assertion_count = 2
 
     pattern = Object.new
-    def pattern.=~(_) false end
+    def pattern.=~ _; false end
     def pattern.inspect; "[Object]" end
 
     assert_triggered "Expected [Object] to match 5." do
@@ -1137,7 +1160,7 @@ class TestMinitestUnitTestCase < Minitest::Test
 
   def test_assert_operator_bad_object
     bad = Object.new
-    def bad.==(_) true end
+    def bad.== _; true end
 
     @tc.assert_operator bad, :equal?, bad
   end
@@ -1424,13 +1447,24 @@ class TestMinitestUnitTestCase < Minitest::Test
     end
   end
 
+  def assert_deprecated name
+    dep = /DEPRECATED: #{name}. From #{__FILE__}:\d+:.*?/
+    assert_output nil, dep do
+      yield
+    end
+  end
+
   def test_assert_send
-    @tc.assert_send [1, :<, 2]
+    assert_deprecated :assert_send do
+      @tc.assert_send [1, :<, 2]
+    end
   end
 
   def test_assert_send_bad
-    assert_triggered "Expected 1.>(*[2]) to return true." do
-      @tc.assert_send [1, :>, 2]
+    assert_deprecated :assert_send do
+      assert_triggered "Expected 1.>(*[2]) to return true." do
+        @tc.assert_send [1, :>, 2]
+      end
     end
   end
 
@@ -1466,6 +1500,22 @@ class TestMinitestUnitTestCase < Minitest::Test
     end
   end
 
+  def test_assert_throws_name_error
+    @tc.assert_raises NameError do
+      @tc.assert_throws :blah do
+        raise NameError
+      end
+    end
+  end
+
+  def test_assert_throws_argument_exception
+    @tc.assert_raises ArgumentError do
+      @tc.assert_throws :blah do
+        raise ArgumentError
+      end
+    end
+  end
+
   def test_assert_throws_different
     assert_triggered "Expected :blah to have been thrown, not :not_blah." do
       @tc.assert_throws :blah do
@@ -1696,7 +1746,7 @@ class TestMinitestUnitTestCase < Minitest::Test
     @assertion_count = 2
 
     pattern = Object.new
-    def pattern.=~(_) true end
+    def pattern.=~ _; true end
     def pattern.inspect; "[Object]" end
 
     assert_triggered "Expected [Object] to not match 5." do
@@ -1737,7 +1787,7 @@ class TestMinitestUnitTestCase < Minitest::Test
 
   def test_refute_operator_bad_object
     bad = Object.new
-    def bad.==(_) true end
+    def bad.== _; true end
 
     @tc.refute_operator true, :equal?, bad
   end
@@ -1779,7 +1829,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_runnable_methods_random
     @assertion_count = 0
 
-    sample_test_case = Class.new Minitest::Test do
+    sample_test_case = Class.new FakeNamedTest do
       def self.test_order; :random; end
       def test_test1; assert "does not matter" end
       def test_test2; assert "does not matter" end
@@ -1799,7 +1849,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_runnable_methods_sorted
     @assertion_count = 0
 
-    sample_test_case = Class.new Minitest::Test do
+    sample_test_case = Class.new FakeNamedTest do
       def self.test_order; :sorted end
       def test_test3; assert "does not matter" end
       def test_test2; assert "does not matter" end
@@ -1813,7 +1863,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_i_suck_and_my_tests_are_order_dependent_bang_sets_test_order_alpha
     @assertion_count = 0
 
-    shitty_test_case = Class.new Minitest::Test
+    shitty_test_case = Class.new FakeNamedTest
 
     shitty_test_case.i_suck_and_my_tests_are_order_dependent!
 
@@ -1823,7 +1873,7 @@ class TestMinitestUnitTestCase < Minitest::Test
   def test_i_suck_and_my_tests_are_order_dependent_bang_does_not_warn
     @assertion_count = 0
 
-    shitty_test_case = Class.new Minitest::Test
+    shitty_test_case = Class.new FakeNamedTest
 
     def shitty_test_case.test_order; :lol end
 
@@ -1841,7 +1891,8 @@ class TestMinitestUnitTestCase < Minitest::Test
     msg.gsub!(/\(oid=[-0-9]+\)/, "(oid=N)")
     msg.gsub!(/(\d\.\d{6})\d+/, '\1xxx') # normalize: ruby version, impl, platform
 
-    assert_equal expected, msg
+    assert_msg = Regexp === expected ? :assert_match : :assert_equal
+    self.send assert_msg, expected, msg
   end
 
   def util_msg exp, act, msg = nil
@@ -1887,8 +1938,8 @@ end
 class TestMinitestUnitRecording < MetaMetaMetaTestCase
   # do not parallelize this suite... it just can't handle it.
 
-  def assert_run_record(*expected, &block)
-    @tu = Class.new Minitest::Test, &block
+  def assert_run_record *expected, &block
+    @tu = Class.new FakeNamedTest, &block
 
     run_tu_with_fresh_reporter
 
@@ -1946,7 +1997,7 @@ class TestMinitestUnitRecording < MetaMetaMetaTestCase
   end
 
   def test_to_s_error_in_test_and_teardown
-    @tu = Class.new Minitest::Test do
+    @tu = Class.new FakeNamedTest do
       def test_method
         raise AnError
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.9.1
+  version: 5.10.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
   fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc