minitest 5.24.1 → 5.25.0

data/test/minitest/test_minitest_mock.rb

@@ -10,8 +10,9 @@ end
 
 class TestMinitestMock < Minitest::Test
   def setup
-    @mock = Minitest::Mock.new.expect(:foo, nil)
-    @mock.expect(:meaning_of_life, 42)
+    @mock = Minitest::Mock.new
+      .expect(:foo, nil)
+      .expect(:meaning_of_life, 42)
   end
 
   def test_create_stub_method
@@ -36,14 +37,14 @@ class TestMinitestMock < Minitest::Test
   end
 
   def test_allow_expectations_to_be_added_after_creation
-    @mock.expect(:bar, true)
+    @mock.expect :bar, true
     assert @mock.bar
   end
 
   def test_not_verify_if_new_expected_method_is_not_called
     @mock.foo
     @mock.meaning_of_life
-    @mock.expect(:bar, true)
+    @mock.expect :bar, true
 
     util_verify_bad "expected bar() => true"
   end
@@ -51,7 +52,7 @@ class TestMinitestMock < Minitest::Test
   def test_blow_up_on_wrong_number_of_arguments
     @mock.foo
     @mock.meaning_of_life
-    @mock.expect(:sum, 3, [1, 2])
+    @mock.expect :sum, 3, [1, 2]
 
     e = assert_raises ArgumentError do
       @mock.sum
@@ -63,7 +64,7 @@ class TestMinitestMock < Minitest::Test
   def test_return_mock_does_not_raise
     retval = Minitest::Mock.new
     mock = Minitest::Mock.new
-    mock.expect(:foo, retval)
+    mock.expect :foo, retval
     mock.foo
 
     assert_mock mock
@@ -72,8 +73,8 @@ class TestMinitestMock < Minitest::Test
   def test_mock_args_does_not_raise
     arg = Minitest::Mock.new
     mock = Minitest::Mock.new
-    mock.expect(:foo, nil, [arg])
-    mock.foo(arg)
+    mock.expect :foo, nil, [arg]
+    mock.foo arg
 
     assert_mock mock
   end
@@ -113,8 +114,6 @@ class TestMinitestMock < Minitest::Test
   end
 
   def test_expectations_can_be_satisfied_via_public_send
-    skip "Doesn't run on 1.8" if RUBY_VERSION < "1.9"
-
     @mock.public_send :foo
     @mock.public_send :meaning_of_life
 
@@ -124,10 +123,10 @@ class TestMinitestMock < Minitest::Test
   def test_blow_up_on_wrong_arguments
     @mock.foo
     @mock.meaning_of_life
-    @mock.expect(:sum, 3, [1, 2])
+    @mock.expect :sum, 3, [1, 2]
 
     e = assert_raises MockExpectationError do
-      @mock.sum(2, 4)
+      @mock.sum 2, 4
     end
 
     exp = "mocked method :sum called with unexpected arguments [2, 4]"
@@ -163,8 +162,8 @@ class TestMinitestMock < Minitest::Test
     a = Minitest::Mock.new
     b = Minitest::Mock.new
 
-    a.expect(:foo, :a)
-    b.expect(:foo, :b)
+    a.expect :foo, :a
+    b.expect :foo, :b
 
     assert_equal :a, a.foo
     assert_equal :b, b.foo
@@ -172,7 +171,7 @@ class TestMinitestMock < Minitest::Test
 
   def test_do_not_create_stub_method_on_new_mocks
     a = Minitest::Mock.new
-    a.expect(:foo, :a)
+    a.expect :foo, :a
 
     assert !Minitest::Mock.new.respond_to?(:foo)
   end
@@ -181,7 +180,7 @@ class TestMinitestMock < Minitest::Test
     @mock.expect :kind_of?, true, [String]
     @mock.expect :==, true, [1]
 
-    assert @mock.kind_of?(String), "didn't mock :kind_of\?"
+    assert @mock.kind_of?(String), "didn't mock :kind_of?"
     assert @mock == 1, "didn't mock :=="
   end
 
@@ -277,9 +276,10 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(:kw=>false) => nil, got [foo(:kw=>true) => nil]"
+    exp = "expected foo(%p) => nil, got [foo(%p) => nil]" \
+      % [{ :kw => false }, { :kw => true  }]
 
-    assert_equal exp, e.message
+    assert_equal exp.delete("{}"), e.message
   end
 
   def test_verify_passes_when_mock_block_returns_true
@@ -318,7 +318,7 @@ class TestMinitestMock < Minitest::Test
       k1 == arg1 && k2 == arg2 && k3 == arg3
     end
 
-    mock.foo(k1: arg1, k2: arg2, k3: arg3)
+    mock.foo k1: arg1, k2: arg2, k3: arg3
 
     assert_mock mock
   end
@@ -331,7 +331,7 @@ class TestMinitestMock < Minitest::Test
     end
 
     e = assert_raises ArgumentError do
-      mock.foo(k1: arg1, k2: arg2)
+      mock.foo k1: arg1, k2: arg2
     end
 
     # basically testing ruby ... need ? for ruby < 2.7 :(
@@ -346,7 +346,7 @@ class TestMinitestMock < Minitest::Test
     end
 
     e = assert_raises ArgumentError do
-      mock.foo(k1: arg1, k2: arg2, k3: arg3)
+      mock.foo k1: arg1, k2: arg2, k3: arg3
     end
 
     # basically testing ruby ... need ? for ruby < 2.7 :(
@@ -361,10 +361,12 @@ class TestMinitestMock < Minitest::Test
     end
 
     e = assert_raises MockExpectationError do
-      mock.foo(k1: arg1, k2: arg2, k3: :BAD!)
+      mock.foo k1: arg1, k2: arg2, k3: :BAD!
     end
 
-    exp = "mocked method :foo failed block w/ [] {:k1=>:bar, :k2=>[1, 2, 3], :k3=>:BAD!}"
+    exp = "mocked method :foo failed block w/ [] %p" \
+      % [{ :k1 => :bar, :k2 => [1, 2, 3], :k3 => :BAD! }]
+
     assert_equal exp, e.message
   end
 
@@ -373,7 +375,7 @@ class TestMinitestMock < Minitest::Test
     mock = Minitest::Mock.new
     mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
 
-    mock.foo(k1: arg1, k2: arg2, k3: arg3)
+    mock.foo k1: arg1, k2: arg2, k3: arg3
 
     assert_mock mock
   end
@@ -397,10 +399,10 @@ class TestMinitestMock < Minitest::Test
   def test_mock_block_is_passed_keyword_args__args__old_style_bad
     arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
     mock = Minitest::Mock.new
-    mock.expect :foo, nil, [{k1: arg1, k2: arg2, k3: arg3}]
+    mock.expect :foo, nil, [{ k1: arg1, k2: arg2, k3: arg3 }]
 
     e = assert_raises ArgumentError do
-      mock.foo(k1: arg1, k2: arg2, k3: arg3)
+      mock.foo k1: arg1, k2: arg2, k3: arg3
     end
 
     assert_equal "mocked method :foo expects 1 arguments, got []", e.message
@@ -410,9 +412,9 @@ class TestMinitestMock < Minitest::Test
     with_kwargs_env do
       arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
       mock = Minitest::Mock.new
-      mock.expect :foo, nil, [{k1: arg1, k2: arg2, k3: arg3}]
+      mock.expect :foo, nil, [{ k1: arg1, k2: arg2, k3: arg3 }]
 
-      mock.foo(k1: arg1, k2: arg2, k3: arg3)
+      mock.foo k1: arg1, k2: arg2, k3: arg3
 
       assert_mock mock
     end
@@ -441,10 +443,10 @@ class TestMinitestMock < Minitest::Test
     mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
 
     e = assert_raises ArgumentError do
-      mock.foo(k1: arg1, k2: arg2)
+      mock.foo k1: arg1, k2: arg2
     end
 
-    assert_equal "mocked method :foo expects 3 keyword arguments, got %p" % {k1: arg1, k2: arg2}, e.message
+    assert_equal "mocked method :foo expects 3 keyword arguments, got %p" % { k1: arg1, k2: arg2 }, e.message
   end
 
   def test_mock_block_is_passed_keyword_args__args_bad_extra
@@ -453,10 +455,10 @@ class TestMinitestMock < Minitest::Test
     mock.expect :foo, nil, k1: arg1, k2: arg2
 
     e = assert_raises ArgumentError do
-      mock.foo(k1: arg1, k2: arg2, k3: arg3)
+      mock.foo k1: arg1, k2: arg2, k3: arg3
     end
 
-    assert_equal "mocked method :foo expects 2 keyword arguments, got %p" % {k1: arg1, k2: arg2, k3: arg3}, e.message
+    assert_equal "mocked method :foo expects 2 keyword arguments, got %p" % { k1: arg1, k2: arg2, k3: arg3 }, e.message
   end
 
   def test_mock_block_is_passed_keyword_args__args_bad_key
@@ -465,7 +467,7 @@ class TestMinitestMock < Minitest::Test
     mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
 
     e = assert_raises MockExpectationError do
-      mock.foo(k1: arg1, k2: arg2, BAD: arg3)
+      mock.foo k1: arg1, k2: arg2, BAD: arg3
     end
 
     assert_includes e.message, "unexpected keywords [:k1, :k2, :k3]"
@@ -478,18 +480,18 @@ class TestMinitestMock < Minitest::Test
     mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
 
     e = assert_raises MockExpectationError do
-      mock.foo(k1: arg1, k2: :BAD!, k3: arg3)
+      mock.foo k1: arg1, k2: :BAD!, k3: arg3
     end
 
-    assert_match(/unexpected keyword arguments.* vs .*:k2=>:BAD!/, e.message)
+    bad = { :k2 => :BAD! }.inspect.delete "{}"
+    assert_match(/unexpected keyword arguments.* vs .*#{bad}/, e.message)
   end
 
   def test_mock_block_is_passed_function_block
     mock = Minitest::Mock.new
     block = proc { "bar" }
     mock.expect :foo, nil do |arg, &blk|
-      arg == "foo" &&
-      blk == block
+      arg == "foo" && blk == block
     end
     mock.foo "foo", &block
     assert_mock mock
@@ -497,8 +499,8 @@ class TestMinitestMock < Minitest::Test
 
   def test_mock_forward_keyword_arguments
     mock = Minitest::Mock.new
-    mock.expect(:foo, nil) { |bar:| bar == 'bar' }
-    mock.foo(bar: 'bar')
+    mock.expect(:foo, nil) { |bar:| bar == "bar" }
+    mock.foo bar: "bar"
     assert_mock mock
   end
 
@@ -517,7 +519,7 @@ class TestMinitestMock < Minitest::Test
   def test_mock_block_raises_if_args_passed
     mock = Minitest::Mock.new
 
-    e = assert_raises(ArgumentError) do
+    e = assert_raises ArgumentError do
       mock.expect :foo, nil, [:a, :b, :c] do
         true
       end
@@ -531,8 +533,8 @@ class TestMinitestMock < Minitest::Test
   def test_mock_block_raises_if_kwargs_passed
     mock = Minitest::Mock.new
 
-    e = assert_raises(ArgumentError) do
-      mock.expect :foo, nil, kwargs:1 do
+    e = assert_raises ArgumentError do
+      mock.expect :foo, nil, kwargs: 1 do
         true
       end
     end
@@ -544,7 +546,7 @@ class TestMinitestMock < Minitest::Test
 
   def test_mock_returns_retval_when_called_with_block
     mock = Minitest::Mock.new
-    mock.expect(:foo, 32) do
+    mock.expect :foo, 32 do
       true
     end
 
@@ -563,7 +565,7 @@ class TestMinitestMock < Minitest::Test
 
   def test_mock_called_via_send
     mock = Minitest::Mock.new
-    mock.expect(:foo, true)
+    mock.expect :foo, true
 
     mock.send :foo
     assert_mock mock
@@ -571,7 +573,7 @@ class TestMinitestMock < Minitest::Test
 
   def test_mock_called_via___send__
     mock = Minitest::Mock.new
-    mock.expect(:foo, true)
+    mock.expect :foo, true
 
     mock.__send__ :foo
     assert_mock mock
@@ -579,9 +581,9 @@ class TestMinitestMock < Minitest::Test
 
   def test_mock_called_via_send_with_args
     mock = Minitest::Mock.new
-    mock.expect(:foo, true, [1, 2, 3])
+    mock.expect :foo, true, [1, 2, 3]
 
-    mock.send(:foo, 1, 2, 3)
+    mock.send :foo, 1, 2, 3
     assert_mock mock
   end
 
@@ -657,7 +659,7 @@ class TestMinitestStub < Minitest::Test
     end
   end
 
-  def test_stub_value
+  def test_stub_value__literal
     assert_stub 42
   end
 
@@ -714,7 +716,7 @@ class TestMinitestStub < Minitest::Test
       end
     end
 
-    val = dynamic.stub(:found, true) do |s|
+    val = dynamic.stub :found, true do |s|
       s.found
     end
 
@@ -729,14 +731,17 @@ class TestMinitestStub < Minitest::Test
       end
     end
 
-    exp = jruby? ? /Undefined method nope_nope_nope for '#{self.class}::Time'/ :
-      /undefined method [`']nope_nope_nope' for( class)? [`']#{self.class}::Time'/
+    exp = if jruby? then
+            /Undefined method nope_nope_nope for '#{self.class}::Time'/
+          else
+            /undefined method [`']nope_nope_nope' for( class)? [`']#{self.class}::Time'/
+          end
     assert_match exp, e.message
   end
 
   def test_mock_with_yield
     mock = Minitest::Mock.new
-    mock.expect(:write, true) do
+    mock.expect :write, true do
       true
     end
     rs = nil
@@ -753,7 +758,7 @@ class TestMinitestStub < Minitest::Test
     mock = Minitest::Mock.new
     rs = nil
 
-    File.stub :open, true, mock, kw:42 do
+    File.stub :open, true, mock, kw: 42 do
       File.open "foo.txt", "r" do |f, kw:|
         rs = kw
       end
@@ -762,8 +767,6 @@ class TestMinitestStub < Minitest::Test
     @tc.assert_equal 42, rs
   end
 
-  alias test_stub_value__old test_stub_value # TODO: remove/rename
-
   ## Permutation Sets:
 
   # [:value, :lambda]
@@ -818,7 +821,7 @@ class TestMinitestStub < Minitest::Test
   # [:value,  :block_call, :args] =>  N/A
 
   class Bar
-    def call(&_) # to ignore unused block
+    def call &_ # to ignore unused block
       puts "hi"
     end
   end
@@ -836,7 +839,7 @@ class TestMinitestStub < Minitest::Test
   end
 
   class Keywords
-    def self.args req, kw1:, kw2:24
+    def self.args req, kw1:, kw2: 24
       [req, kw1, kw2]
     end
   end
@@ -850,7 +853,7 @@ class TestMinitestStub < Minitest::Test
   def test_stub__hash_as_last_real_arg
     with_kwargs_env do
       token = Object.new
-      def token.create_with_retry u, p; raise "shouldn't see this"; end
+      def token.create_with_retry _u, _p; raise "shouldn't see this"; end
 
       controller = Object.new
       controller.define_singleton_method :create do |u, p|
@@ -976,7 +979,7 @@ class TestMinitestStub < Minitest::Test
     io = StringIO.new(+"", "w")
     File.stub6 :open, lambda { |p, m, &blk| blk.call io } do
       File.open "foo.txt", "r" do |f|
-        rs = f.write("woot")
+        rs = f.write "woot"
       end
     end
     @tc.assert_equal 4, rs
@@ -989,7 +992,7 @@ class TestMinitestStub < Minitest::Test
     io = StringIO.new(+"", "w")
     File.stub5(:open, lambda { |p, m, &blk| blk and blk.call io }, :WTF?) do
       File.open "foo.txt", "r" do |f|
-        rs = f.write("woot")
+        rs = f.write "woot"
       end
     end
     @tc.assert_equal 4, rs
@@ -1004,7 +1007,7 @@ class TestMinitestStub < Minitest::Test
     io = StringIO.new(+"", "w")
     File.stub6(:open, lambda { |p, m, &blk| blk.call io }, :WTF?) do
       File.open "foo.txt", "r" do |f|
-        rs = f.write("woot")
+        rs = f.write "woot"
       end
     end
     @tc.assert_equal 4, rs
@@ -1020,7 +1023,7 @@ class TestMinitestStub < Minitest::Test
     @tc.assert_raises ArgumentError do
       File.stub6_2(:open, lambda { |p, m, &blk| blk.call io }, :WTF?) do
         File.open "foo.txt", "r" do |f|
-          rs = f.write("woot")
+          rs = f.write "woot"
         end
       end
     end
@@ -1069,7 +1072,7 @@ class TestMinitestStub < Minitest::Test
     io = StringIO.new(+"", "w")
     File.stub5 :open, :value, io do
       result = File.open "foo.txt", "r" do |f|
-        rs = f.write("woot")
+        rs = f.write "woot"
       end
       @tc.assert_equal :value, result
     end
@@ -1098,7 +1101,7 @@ class TestMinitestStub < Minitest::Test
     assert_deprecated do
       File.stub6 :open, :value, io do
         result = File.open "foo.txt", "r" do |f|
-          rs = f.write("woot")
+          rs = f.write "woot"
         end
         @tc.assert_equal :value, result
       end

data/test/minitest/test_minitest_reporter.rb

@@ -13,10 +13,6 @@ 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)
@@ -37,7 +33,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
   def error_test
     unless defined? @et then
-      @et = Minitest::Test.new(:woot)
+      @et = Minitest::Test.new :woot
       @et.failures << Minitest::UnexpectedError.new(begin
                                                       raise "no"
                                                     rescue => e
@@ -60,7 +56,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
       ex.set_backtrace ary
 
-      @sse = Minitest::Test.new(:woot)
+      @sse = Minitest::Test.new :woot
       @sse.failures << Minitest::UnexpectedError.new(ex)
       @sse = Minitest::Result.from @sse
     end
@@ -69,7 +65,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
 
   def fail_test
     unless defined? @ft then
-      @ft = Minitest::Test.new(:woot)
+      @ft = Minitest::Test.new :woot
       @ft.failures <<   begin
                           raise Minitest::Assertion, "boo"
                         rescue Minitest::Assertion => e
@@ -85,14 +81,14 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def passing_test_with_metadata
-    test = Minitest::Test.new(:woot)
+    test = Minitest::Test.new :woot
     test.metadata[:meta] = :data
     @pt ||= Minitest::Result.from test
   end
 
   def skip_test
     unless defined? @st then
-      @st = Minitest::Test.new(:woot)
+      @st = Minitest::Test.new :woot
       @st.failures << begin
                         raise Minitest::Skip
                       rescue Minitest::Assertion => e
@@ -248,7 +244,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.start
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -268,7 +264,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record passing_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -288,7 +284,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record fail_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -312,7 +308,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record error_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -338,7 +334,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
     r.record system_stack_error_test
     r.report
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running:
@@ -377,7 +373,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
       r.report
     end
 
-    exp = clean <<-EOM
+    exp = <<~EOM
       Run options:
 
       # Running: