minitest 5.14.0 → 5.17.0

data/test/minitest/test_minitest_reporter.rb

@@ -1,5 +1,6 @@
 require "minitest/autorun"
 require "minitest/metametameta"
+require "forwardable"
 
 class Runnable
   def woot
@@ -12,30 +13,24 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   attr_accessor :r, :io
 
   def new_composite_reporter
+    # Ruby bug in older versions of 2.2 & 2.3 on all platforms
+    # Latest Windows builds were 2.2.6 and 2.3.3.  Latest Ruby releases were
+    # 2.2.10 and 2.3.8.
+    skip if windows? && RUBY_VERSION < '2.4'
     reporter = Minitest::CompositeReporter.new
     reporter << Minitest::SummaryReporter.new(self.io)
     reporter << Minitest::ProgressReporter.new(self.io)
 
-    def reporter.first
-      reporters.first
-    end
-
-    def reporter.results
-      first.results
-    end
-
-    def reporter.count
-      first.count
-    end
-
-    def reporter.assertions
-      first.assertions
-    end
+    # eg reporter.results -> reporters.first.results
+    reporter.extend Forwardable
+    reporter.delegate :first => :reporters
+    reporter.delegate %i[results count assertions options to_s] => :first
 
     reporter
   end
 
   def setup
+    super
     self.io = StringIO.new("")
     self.r  = new_composite_reporter
   end
@@ -86,7 +81,25 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   def test_to_s
     r.record passing_test
     r.record fail_test
-    assert_match "woot", r.first.to_s
+    assert_match "woot", r.to_s
+  end
+
+  def test_options_skip_F
+    r.options[:skip] = "F"
+
+    r.record passing_test
+    r.record fail_test
+
+    refute_match "woot", r.to_s
+  end
+
+  def test_options_skip_E
+    r.options[:skip] = "E"
+
+    r.record passing_test
+    r.record error_test
+
+    refute_match "RuntimeError: no", r.to_s
   end
 
   def test_passed_eh_empty
@@ -126,7 +139,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_passed_eh_skipped_verbose
-    r.first.options[:verbose] = true
+    r.options[:verbose] = true
 
     r.start
     r.results << skip_test

data/test/minitest/test_minitest_spec.rb

@@ -43,6 +43,10 @@ describe Minitest::Spec do
     end
   end
 
+  def assert_success spec
+    assert_equal true, spec
+  end
+
   before do
     @assertion_count = 4
   end
@@ -62,7 +66,7 @@ describe Minitest::Spec do
   it "needs to check for file existence" do
     @assertion_count = 3
 
-    _(_(__FILE__).path_must_exist).must_equal true
+    assert_success _(__FILE__).path_must_exist
 
     assert_triggered "Expected path 'blah' to exist." do
       _("blah").path_must_exist
@@ -72,7 +76,7 @@ describe Minitest::Spec do
   it "needs to check for file non-existence" do
     @assertion_count = 3
 
-    _(_("blah").path_wont_exist).must_equal false
+    assert_success _("blah").path_wont_exist
 
     assert_triggered "Expected path '#{__FILE__}' to not exist." do
       _(__FILE__).path_wont_exist
@@ -82,7 +86,7 @@ describe Minitest::Spec do
   it "needs to be sensible about must_include order" do
     @assertion_count += 3 # must_include is 2 assertions
 
-    _(_([1, 2, 3]).must_include(2)).must_equal true
+    assert_success _([1, 2, 3]).must_include(2)
 
     assert_triggered "Expected [1, 2, 3] to include 5." do
       _([1, 2, 3]).must_include 5
@@ -96,7 +100,7 @@ describe Minitest::Spec do
   it "needs to be sensible about wont_include order" do
     @assertion_count += 3 # wont_include is 2 assertions
 
-    _(_([1, 2, 3]).wont_include(5)).must_equal false
+    assert_success _([1, 2, 3]).wont_include(5)
 
     assert_triggered "Expected [1, 2, 3] to not include 2." do
       _([1, 2, 3]).wont_include 2
@@ -137,7 +141,7 @@ describe Minitest::Spec do
     @assertion_count -= 1 # no msg
     @assertion_count += 2 # assert_output is 2 assertions
 
-    _(expect {}.must_be_silent).must_equal true
+    assert_success expect {}.must_be_silent
 
     assert_triggered "In stdout.\nExpected: \"\"\n  Actual: \"xxx\"" do
       expect { print "xxx" }.must_be_silent
@@ -195,7 +199,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify binary messages" do
-    _(_(42).wont_be(:<, 24)).must_equal false
+    assert_success _(42).wont_be(:<, 24)
 
     assert_triggered "Expected 24 to not be < 42." do
       _(24).wont_be :<, 42
@@ -209,7 +213,7 @@ describe Minitest::Spec do
   it "needs to verify emptyness" do
     @assertion_count += 3 # empty is 2 assertions
 
-    _(_([]).must_be_empty).must_equal true
+    assert_success _([]).must_be_empty
 
     assert_triggered "Expected [42] to be empty." do
       _([42]).must_be_empty
@@ -223,7 +227,7 @@ describe Minitest::Spec do
   it "needs to verify equality" do
     @assertion_count += 1
 
-    _(_(6 * 7).must_equal(42)).must_equal true
+    assert_success _(6 * 7).must_equal(42)
 
     assert_triggered "Expected: 42\n  Actual: 54" do
       _(6 * 9).must_equal 42
@@ -242,7 +246,7 @@ describe Minitest::Spec do
     @assertion_count += 1 # extra test
 
     out, err = capture_io do
-      _(_(nil).must_equal(nil)).must_equal true
+      assert_success _(nil).must_equal(nil)
     end
 
     exp = "DEPRECATED: Use assert_nil if expecting nil from #{__FILE__}:#{__LINE__-3}. " \
@@ -256,7 +260,7 @@ describe Minitest::Spec do
   it "needs to verify floats outside a delta" do
     @assertion_count += 1 # extra test
 
-    _(_(24).wont_be_close_to(42)).must_equal false
+    assert_success _(24).wont_be_close_to(42)
 
     assert_triggered "Expected |42 - 42.0| (0.0) to not be <= 0.001." do
       _(6 * 7.0).wont_be_close_to 42
@@ -275,7 +279,7 @@ describe Minitest::Spec do
   it "needs to verify floats outside an epsilon" do
     @assertion_count += 1 # extra test
 
-    _(_(24).wont_be_within_epsilon(42)).must_equal false
+    assert_success _(24).wont_be_within_epsilon(42)
 
     x = "0.042"
     assert_triggered "Expected |42 - 42.0| (0.0) to not be <= #{x}." do
@@ -295,7 +299,7 @@ describe Minitest::Spec do
   it "needs to verify floats within a delta" do
     @assertion_count += 1 # extra test
 
-    _(_(6.0 * 7).must_be_close_to(42.0)).must_equal true
+    assert_success _(6.0 * 7).must_be_close_to(42.0)
 
     assert_triggered "Expected |0.0 - 0.01| (0.01) to be <= 0.001." do
       _(1.0 / 100).must_be_close_to 0.0
@@ -314,7 +318,7 @@ describe Minitest::Spec do
   it "needs to verify floats within an epsilon" do
     @assertion_count += 1 # extra test
 
-    _(_(6.0 * 7).must_be_within_epsilon(42.0)).must_equal true
+    assert_success _(6.0 * 7).must_be_within_epsilon(42.0)
 
     assert_triggered "Expected |0.0 - 0.01| (0.01) to be <= 0.0." do
       _(1.0 / 100).must_be_within_epsilon 0.0
@@ -330,7 +334,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify identity" do
-    _(_(1).must_be_same_as(1)).must_equal true
+    assert_success _(1).must_be_same_as(1)
 
     assert_triggered "Expected 1 (oid=N) to be the same as 2 (oid=N)." do
       _(1).must_be_same_as 2
@@ -343,8 +347,8 @@ 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
+    assert_success _(42).wont_equal(6 * 9)
+    assert_success _(proc {}).wont_equal(42)
 
     assert_triggered "Expected 1 to not be equal to 1." do
       _(1).wont_equal 1
@@ -356,7 +360,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify instances of a class" do
-    _(_(42).wont_be_instance_of(String)).must_equal false
+    assert_success _(42).wont_be_instance_of(String)
 
     assert_triggered "Expected 42 to not be a kind of #{Int.name}." do
       _(42).wont_be_kind_of Int
@@ -370,8 +374,8 @@ describe Minitest::Spec do
   it "needs to verify kinds of a class" do
     @assertion_count += 2
 
-    _(_(42).wont_be_kind_of(String)).must_equal false
-    _(_(proc {}).wont_be_kind_of(String)).must_equal false
+    assert_success _(42).wont_be_kind_of(String)
+    assert_success _(proc {}).wont_be_kind_of(String)
 
     assert_triggered "Expected 42 to not be a kind of #{Int.name}." do
       _(42).wont_be_kind_of Int
@@ -385,8 +389,8 @@ describe Minitest::Spec do
   it "needs to verify kinds of objects" do
     @assertion_count += 3 # extra test
 
-    _(_(6 * 7).must_be_kind_of(Int)).must_equal true
-    _(_(6 * 7).must_be_kind_of(Numeric)).must_equal true
+    assert_success _(6 * 7).must_be_kind_of(Int)
+    assert_success _(6 * 7).must_be_kind_of(Numeric)
 
     assert_triggered "Expected 42 to be a kind of String, not #{Int.name}." do
       _(6 * 7).must_be_kind_of String
@@ -405,7 +409,7 @@ describe Minitest::Spec do
   it "needs to verify mismatch" do
     @assertion_count += 3 # match is 2
 
-    _(_("blah").wont_match(/\d+/)).must_equal false
+    assert_success _("blah").wont_match(/\d+/)
 
     assert_triggered "Expected /\\w+/ to not match \"blah\"." do
       _("blah").wont_match(/\w+/)
@@ -417,7 +421,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify nil" do
-    _(_(nil).must_be_nil).must_equal true
+    assert_success _(nil).must_be_nil
 
     assert_triggered "Expected 42 to be nil." do
       _(42).must_be_nil
@@ -431,7 +435,7 @@ describe Minitest::Spec do
   it "needs to verify non-emptyness" do
     @assertion_count += 3 # empty is 2 assertions
 
-    _(_(["some item"]).wont_be_empty).must_equal false
+    assert_success _(["some item"]).wont_be_empty
 
     assert_triggered "Expected [] to not be empty." do
       _([]).wont_be_empty
@@ -443,7 +447,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify non-identity" do
-    _(_(1).wont_be_same_as(2)).must_equal false
+    assert_success _(1).wont_be_same_as(2)
 
     assert_triggered "Expected 1 (oid=N) to not be the same as 1 (oid=N)." do
       _(1).wont_be_same_as 1
@@ -455,7 +459,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify non-nil" do
-    _(_(42).wont_be_nil).must_equal false
+    assert_success _(42).wont_be_nil
 
     assert_triggered "Expected nil to not be nil." do
       _(nil).wont_be_nil
@@ -467,7 +471,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify objects not responding to a message" do
-    _(_("").wont_respond_to(:woot!)).must_equal false
+    assert_success _("").wont_respond_to(:woot!)
 
     assert_triggered "Expected \"\" to not respond to to_s." do
       _("").wont_respond_to :to_s
@@ -481,7 +485,7 @@ describe Minitest::Spec do
   it "needs to verify output in stderr" do
     @assertion_count -= 1 # no msg
 
-    _(expect { $stderr.print "blah" }.must_output(nil, "blah")).must_equal true
+    assert_success expect { $stderr.print "blah" }.must_output(nil, "blah")
 
     assert_triggered "In stderr.\nExpected: \"blah\"\n  Actual: \"xxx\"" do
       expect { $stderr.print "xxx" }.must_output(nil, "blah")
@@ -491,7 +495,7 @@ describe Minitest::Spec do
   it "needs to verify output in stdout" do
     @assertion_count -= 1 # no msg
 
-    _(expect { print "blah" }.must_output("blah")).must_equal true
+    assert_success expect { print "blah" }.must_output("blah")
 
     assert_triggered "In stdout.\nExpected: \"blah\"\n  Actual: \"xxx\"" do
       expect { print "xxx" }.must_output("blah")
@@ -501,7 +505,7 @@ describe Minitest::Spec do
   it "needs to verify regexp matches" do
     @assertion_count += 3 # must_match is 2 assertions
 
-    _(_("blah").must_match(/\w+/)).must_equal true
+    assert_kind_of MatchData, _("blah").must_match(/\w+/)
 
     assert_triggered "Expected /\\d+/ to match \"blah\"." do
       _("blah").must_match(/\d+/)
@@ -567,12 +571,29 @@ describe Minitest::Spec do
         (1 + 1).must_equal 2
       end
     end
+
+    # https://github.com/seattlerb/minitest/issues/837
+    # https://github.com/rails/rails/pull/39304
+    it "deprecates expectation used without _ with empty backtrace_filter" do
+      skip "N/A" if ENV["MT_NO_EXPECTATIONS"]
+
+      @assertion_count += 3
+
+      exp = /DEPRECATED: global use of must_equal from/
+
+      with_empty_backtrace_filter do
+        assert_output "", exp do
+          (1 + 1).must_equal 2
+        end
+      end
+    end
   end
 
   it "needs to verify throw" do
-    @assertion_count += 2 # 2 extra tests
+    @assertion_count += 4 # 2 extra tests
 
-    _(expect { throw :blah }.must_throw(:blah)).must_equal true
+    assert_nil expect { throw :blah }.must_throw(:blah)
+    assert_equal 42, expect { throw :blah, 42 }.must_throw(:blah)
 
     assert_triggered "Expected :blah to have been thrown." do
       expect {}.must_throw :blah
@@ -592,7 +613,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify types of objects" do
-    _(_(6 * 7).must_be_instance_of(Int)).must_equal true
+    assert_success _(6 * 7).must_be_instance_of(Int)
 
     exp = "Expected 42 to be an instance of String, not #{Int.name}."
 
@@ -608,7 +629,7 @@ describe Minitest::Spec do
   it "needs to verify using any (negative) predicate" do
     @assertion_count -= 1 # doesn"t take a message
 
-    _(_("blah").wont_be(:empty?)).must_equal false
+    assert_success _("blah").wont_be(:empty?)
 
     assert_triggered "Expected \"\" to not be empty?." do
       _("").wont_be :empty?
@@ -618,7 +639,7 @@ describe Minitest::Spec do
   it "needs to verify using any binary operator" do
     @assertion_count -= 1 # no msg
 
-    _(_(41).must_be(:<, 42)).must_equal true
+    assert_success _(41).must_be(:<, 42)
 
     assert_triggered "Expected 42 to be < 41." do
       _(42).must_be(:<, 41)
@@ -628,7 +649,7 @@ describe Minitest::Spec do
   it "needs to verify using any predicate" do
     @assertion_count -= 1 # no msg
 
-    _(_("").must_be(:empty?)).must_equal true
+    assert_success _("").must_be(:empty?)
 
     assert_triggered "Expected \"blah\" to be empty?." do
       _("blah").must_be :empty?
@@ -636,7 +657,7 @@ describe Minitest::Spec do
   end
 
   it "needs to verify using respond_to" do
-    _(_(42).must_respond_to(:+)).must_equal true
+    assert_success _(42).must_respond_to(:+)
 
     assert_triggered "Expected 42 (#{Int.name}) to respond to #clear." do
       _(42).must_respond_to :clear
@@ -723,6 +744,10 @@ describe Minitest::Spec, :subject do
 end
 
 class TestMetaStatic < Minitest::Test
+  def assert_method_count expected, klass
+    assert_equal expected, klass.public_instance_methods.grep(/^test_/).count
+  end
+
   def test_children
     Minitest::Spec.children.clear # prevents parallel run
 
@@ -756,8 +781,8 @@ class TestMetaStatic < Minitest::Test
       end
     end
 
-    assert_equal 1, outer.public_instance_methods.grep(/^test_/).count
-    assert_equal 1, inner.public_instance_methods.grep(/^test_/).count
+    assert_method_count 1, outer
+    assert_method_count 1, inner
   end
 
   def test_it_wont_add_test_methods_to_children
@@ -771,14 +796,18 @@ class TestMetaStatic < Minitest::Test
       end
     end
 
-    assert_equal 1, outer.public_instance_methods.grep(/^test_/).count
-    assert_equal 0, inner.public_instance_methods.grep(/^test_/).count
+    assert_method_count 1, outer
+    assert_method_count 0, inner
   end
 end
 
 class TestMeta < MetaMetaMetaTestCase
   # do not call parallelize_me! here because specs use register_spec_type globally
 
+  def assert_defined_methods expected, klass
+    assert_equal expected, klass.instance_methods(false).sort.map(&:to_s)
+  end
+
   def util_structure
     y = z = nil
     before_list = []
@@ -851,7 +880,7 @@ class TestMeta < MetaMetaMetaTestCase
       end
     end
 
-    test_name = spec_class.instance_methods.sort.grep(/test/).first
+    test_name = spec_class.instance_methods.sort.grep(/test_/).first
 
     spec = spec_class.new test_name
 
@@ -900,9 +929,9 @@ class TestMeta < MetaMetaMetaTestCase
     inner_methods2 = inner_methods1 +
       %w[test_0002_anonymous test_0003_anonymous]
 
-    assert_equal top_methods,    x.instance_methods(false).sort.map(&:to_s)
-    assert_equal inner_methods1, y.instance_methods(false).sort.map(&:to_s)
-    assert_equal inner_methods2, z.instance_methods(false).sort.map(&:to_s)
+    assert_defined_methods top_methods, x
+    assert_defined_methods inner_methods1, y
+    assert_defined_methods inner_methods2, z
   end
 
   def test_structure_postfix_it
@@ -919,8 +948,8 @@ class TestMeta < MetaMetaMetaTestCase
       it "inner-it" do end
     end
 
-    assert_equal %w[test_0001_inner-it], y.instance_methods(false).map(&:to_s)
-    assert_equal %w[test_0001_inner-it], z.instance_methods(false).map(&:to_s)
+    assert_defined_methods %w[test_0001_inner-it], y
+    assert_defined_methods %w[test_0001_inner-it], z
   end
 
   def test_setup_teardown_behavior
@@ -951,9 +980,9 @@ class TestMeta < MetaMetaMetaTestCase
                    ].sort
 
     assert_equal test_methods, [x1, x2]
-    assert_equal test_methods, x.instance_methods.grep(/^test/).map(&:to_s).sort
-    assert_equal [], y.instance_methods.grep(/^test/)
-    assert_equal [], z.instance_methods.grep(/^test/)
+    assert_defined_methods test_methods, x
+    assert_defined_methods [], y
+    assert_defined_methods [], z
   end
 
   def test_structure_subclasses
@@ -1039,3 +1068,38 @@ class ValueMonadTest < Minitest::Test
     assert_equal "c", struct.expect
   end
 end
+
+describe Minitest::Spec, :infect_an_assertion do
+  class << self
+    attr_accessor :infect_mock
+  end
+
+  def assert_infects exp, act, msg = nil, foo: nil, bar: nil
+    self.class.infect_mock.assert_infects exp, act, msg, foo: foo, bar: bar
+  end
+
+  infect_an_assertion :assert_infects, :must_infect
+  infect_an_assertion :assert_infects, :must_infect_without_flipping, :dont_flip
+
+  it "infects assertions with kwargs" do
+    mock = Minitest::Mock.new
+    mock.expect :assert_infects, true, [:exp, :act, nil], foo: :foo, bar: :bar
+
+    self.class.infect_mock = mock
+
+    _(:act).must_infect :exp, foo: :foo, bar: :bar
+
+    assert_mock mock
+  end
+
+  it "infects assertions with kwargs (dont_flip)" do
+    mock = Minitest::Mock.new
+    mock.expect :assert_infects, true, [:act, :exp, nil], foo: :foo, bar: :bar
+
+    self.class.infect_mock = mock
+
+    _(:act).must_infect_without_flipping :exp, foo: :foo, bar: :bar
+
+    assert_mock mock
+  end
+end