minitest 5.14.4 → 5.25.5

data/test/minitest/test_minitest_mock.rb

@@ -1,11 +1,18 @@
 require "minitest/autorun"
 
-class TestMinitestMock < Minitest::Test
-  parallelize_me!
+def with_kwargs_env
+  ENV["MT_KWARGS_HAC\K"] = "1"
+
+  yield
+ensure
+  ENV.delete "MT_KWARGS_HAC\K"
+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
@@ -19,7 +26,7 @@ class TestMinitestMock < Minitest::Test
   def test_blow_up_if_not_called
     @mock.foo
 
-    util_verify_bad "expected meaning_of_life() => 42"
+    util_verify_bad "Expected meaning_of_life() => 42"
   end
 
   def test_not_blow_up_if_everything_called
@@ -30,34 +37,34 @@ 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"
+    util_verify_bad "Expected bar() => true"
   end
 
   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
     end
 
-    assert_equal "mocked method :sum expects 2 arguments, got 0", e.message
+    assert_equal "mocked method :sum expects 2 arguments, got []", e.message
   end
 
   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
@@ -66,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
@@ -107,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
 
@@ -118,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]"
@@ -133,7 +138,7 @@ class TestMinitestMock < Minitest::Test
       @mock.expect :blah, 3, false
     end
 
-    assert_equal "args must be an array", e.message
+    assert_match "args must be an array", e.message
   end
 
   def test_respond_appropriately
@@ -150,15 +155,15 @@ class TestMinitestMock < Minitest::Test
 
     expected = "unmocked method :bar, expected one of [:foo, :meaning_of_life]"
 
-    assert_equal expected, e.message
+    assert_match expected, e.message
   end
 
   def test_assign_per_mock_return_values
     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
@@ -166,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
@@ -175,10 +180,77 @@ 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
 
+  def test_assert_mock__pass
+    mock = Minitest::Mock.new
+    mock.expect :loose_expectation, true, [Integer]
+    mock.loose_expectation 1
+
+    result = assert_mock mock
+
+    assert_equal true, result
+  end
+
+  def assert_bad_mock klass, msg
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, [:bar]
+    mock.expect :foo, nil, [:baz]
+
+    mock.foo :bar
+
+    e = assert_raises klass do
+      yield mock
+    end
+
+    assert_equal msg, e.message
+  end
+
+  def test_verify__error
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
+    assert_bad_mock MockExpectationError, exp do |mock|
+      mock.verify
+    end
+  end
+
+  def test_assert_mock__fail
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      assert_mock mock
+    end
+  end
+
+  def test_assert_mock__fail_msg
+    exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      assert_mock mock, "BLAH"
+    end
+  end
+
+  def test_assert_mock__fail_exp
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      describe "X" do
+        it "y" do
+          _(mock).must_verify
+        end
+      end.new(:blah).send(:test_0001_y)
+    end
+  end
+
+  def test_assert_mock__fail_exp_msg
+    exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+    assert_bad_mock Minitest::Assertion, exp do |mock|
+      describe "X" do
+        it "y" do
+          _(mock).must_verify "BLAH"
+        end
+      end.new(:blah).send(:test_0001_y)
+    end
+  end
+
   def test_verify_allows_called_args_to_be_loosely_specified
     mock = Minitest::Mock.new
     mock.expect :loose_expectation, true, [Integer]
@@ -210,7 +282,7 @@ class TestMinitestMock < Minitest::Test
       mock.a
     end
 
-    assert_equal "No more expects available for :a: []", e.message
+    assert_equal "No more expects available for :a: [] {}", e.message
   end
 
   def test_same_method_expects_are_verified_when_all_called
@@ -233,7 +305,7 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(:baz) => nil, got [foo(:bar) => nil]"
+    exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
 
     assert_equal exp, e.message
   end
@@ -247,11 +319,36 @@ class TestMinitestMock < Minitest::Test
 
     e = assert_raises(MockExpectationError) { mock.verify }
 
-    exp = "expected foo(:bar) => nil, got [foo(:bar) => nil]"
+    exp = "Expected foo(:bar) => nil, got [foo(:bar) => nil]"
 
     assert_equal exp, e.message
   end
 
+  def test_delegator_calls_are_propagated
+    delegator = Object.new
+    mock = Minitest::Mock.new delegator
+
+    refute delegator.nil?
+    refute mock.nil?
+    assert_mock mock
+  end
+
+  def test_handles_kwargs_in_error_message
+    mock = Minitest::Mock.new
+
+    mock.expect :foo, nil, [], kw: true
+    mock.expect :foo, nil, [], kw: false
+
+    mock.foo kw: true
+
+    e = assert_raises(MockExpectationError) { mock.verify }
+
+    exp = "Expected foo(%p) => nil, got [foo(%p) => nil]" \
+      % [{ :kw => false }, { :kw => true  }]
+
+    assert_equal exp.delete("{}"), e.message
+  end
+
   def test_verify_passes_when_mock_block_returns_true
     mock = Minitest::Mock.new
     mock.expect :foo, nil do
@@ -270,22 +367,210 @@ class TestMinitestMock < Minitest::Test
       a1 == arg1 && a2 == arg2 && a3 == arg3
     end
 
-    mock.foo arg1, arg2, arg3
+    assert_silent do
+      if RUBY_VERSION > "3" then
+        mock.foo arg1, arg2, arg3
+      else
+        mock.foo arg1, arg2, **arg3 # oddity just for ruby 2.7
+      end
+    end
+
+    assert_mock mock
+  end
+
+  def test_mock_block_is_passed_keyword_args__block
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil do |k1:, k2:, k3:|
+      k1 == arg1 && k2 == arg2 && k3 == arg3
+    end
+
+    mock.foo k1: arg1, k2: arg2, k3: arg3
 
     assert_mock mock
   end
 
+  def test_mock_block_is_passed_keyword_args__block_bad_missing
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil do |k1:, k2:, k3:|
+      k1 == arg1 && k2 == arg2 && k3 == arg3
+    end
+
+    e = assert_raises ArgumentError do
+      mock.foo k1: arg1, k2: arg2
+    end
+
+    # basically testing ruby ... need ? for ruby < 2.7 :(
+    assert_match(/missing keyword: :?k3/, e.message)
+  end
+
+  def test_mock_block_is_passed_keyword_args__block_bad_extra
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil do |k1:, k2:|
+      k1 == arg1 && k2 == arg2 && k3 == arg3
+    end
+
+    e = assert_raises ArgumentError do
+      mock.foo k1: arg1, k2: arg2, k3: arg3
+    end
+
+    # basically testing ruby ... need ? for ruby < 2.7 :(
+    assert_match(/unknown keyword: :?k3/, e.message)
+  end
+
+  def test_mock_block_is_passed_keyword_args__block_bad_value
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil do |k1:, k2:, k3:|
+      k1 == arg1 && k2 == arg2 && k3 == arg3
+    end
+
+    e = assert_raises MockExpectationError do
+      mock.foo k1: arg1, k2: arg2, k3: :BAD!
+    end
+
+    exp = "mocked method :foo failed block w/ [] %p" \
+      % [{ :k1 => :bar, :k2 => [1, 2, 3], :k3 => :BAD! }]
+
+    assert_equal exp, e.message
+  end
+
+  def test_mock_block_is_passed_keyword_args__args
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
+
+    mock.foo k1: arg1, k2: arg2, k3: arg3
+
+    assert_mock mock
+  end
+
+  def test_mock_allow_all_kwargs__old_style_env
+    with_kwargs_env do
+      mock = Minitest::Mock.new
+      mock.expect :foo, true, [Hash]
+      assert_equal true, mock.foo(bar: 42)
+    end
+  end
+
+  def test_mock_allow_all_kwargs__old_style_env__rewrite
+    with_kwargs_env do
+      mock = Minitest::Mock.new
+      mock.expect :foo, true, [], bar: Integer
+      assert_equal true, mock.foo(bar: 42)
+    end
+  end
+
+  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 }]
+
+    e = assert_raises ArgumentError do
+      mock.foo k1: arg1, k2: arg2, k3: arg3
+    end
+
+    assert_equal "mocked method :foo expects 1 arguments, got []", e.message
+  end
+
+  def test_mock_block_is_passed_keyword_args__args__old_style_env
+    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.foo k1: arg1, k2: arg2, k3: arg3
+
+      assert_mock mock
+    end
+  end
+
+  def test_mock_block_is_passed_keyword_args__args__old_style_both
+    with_kwargs_env do
+      arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+      mock = Minitest::Mock.new
+
+      assert_deprecation(/Using MT_KWARGS_HAC. yet passing kwargs/) do
+        mock.expect :foo, nil, [{}], k1: arg1, k2: arg2, k3: arg3
+      end
+
+      skip "-Werror" if error_on_warn? # mock above raised, so this is dead
+
+      mock.foo({}, k1: arg1, k2: arg2, k3: arg3)
+
+      assert_mock mock
+    end
+  end
+
+  def test_mock_block_is_passed_keyword_args__args_bad_missing
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
+
+    e = assert_raises ArgumentError do
+      mock.foo k1: arg1, k2: arg2
+    end
+
+    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
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, k1: arg1, k2: arg2
+
+    e = assert_raises ArgumentError do
+      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
+  end
+
+  def test_mock_block_is_passed_keyword_args__args_bad_key
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
+
+    e = assert_raises MockExpectationError do
+      mock.foo k1: arg1, k2: arg2, BAD: arg3
+    end
+
+    assert_includes e.message, "unexpected keywords [:k1, :k2, :k3]"
+    assert_includes e.message, "vs [:k1, :k2, :BAD]"
+  end
+
+  def test_mock_block_is_passed_keyword_args__args_bad_val
+    arg1, arg2, arg3 = :bar, [1, 2, 3], { :a => "a" }
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, k1: arg1, k2: arg2, k3: arg3
+
+    e = assert_raises MockExpectationError do
+      mock.foo k1: arg1, k2: :BAD!, k3: arg3
+    end
+
+    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
   end
 
+  def test_mock_forward_keyword_arguments
+    mock = Minitest::Mock.new
+    mock.expect(:foo, nil) { |bar:| bar == "bar" }
+    mock.foo bar: "bar"
+    assert_mock mock
+  end
+
   def test_verify_fails_when_mock_block_returns_false
     mock = Minitest::Mock.new
     mock.expect :foo, nil do
@@ -293,15 +578,15 @@ class TestMinitestMock < Minitest::Test
     end
 
     e = assert_raises(MockExpectationError) { mock.foo }
-    exp = "mocked method :foo failed block w/ []"
+    exp = "mocked method :foo failed block w/ [] {}"
 
     assert_equal exp, e.message
   end
 
-  def test_mock_block_throws_if_args_passed
+  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
@@ -309,12 +594,26 @@ class TestMinitestMock < Minitest::Test
 
     exp = "args ignored when block given"
 
-    assert_equal exp, e.message
+    assert_match exp, e.message
+  end
+
+  def test_mock_block_raises_if_kwargs_passed
+    mock = Minitest::Mock.new
+
+    e = assert_raises ArgumentError do
+      mock.expect :foo, nil, kwargs: 1 do
+        true
+      end
+    end
+
+    exp = "kwargs ignored when block given"
+
+    assert_match exp, e.message
   end
 
   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
 
@@ -333,7 +632,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
@@ -341,7 +640,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
@@ -349,9 +648,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
 
@@ -427,7 +726,7 @@ class TestMinitestStub < Minitest::Test
     end
   end
 
-  def test_stub_value
+  def test_stub_value__literal
     assert_stub 42
   end
 
@@ -458,7 +757,7 @@ class TestMinitestStub < Minitest::Test
   end
 
   def test_stub_yield_self
-    obj = "foo"
+    obj = +"foo"
 
     val = obj.stub :to_s, "bar" do |s|
       s.to_s
@@ -484,7 +783,7 @@ class TestMinitestStub < Minitest::Test
       end
     end
 
-    val = dynamic.stub(:found, true) do |s|
+    val = dynamic.stub :found, true do |s|
       s.found
     end
 
@@ -499,13 +798,17 @@ class TestMinitestStub < Minitest::Test
       end
     end
 
-    exp = /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
@@ -518,7 +821,18 @@ class TestMinitestStub < Minitest::Test
     @tc.assert_equal true, rs
   end
 
-  alias test_stub_value__old test_stub_value # TODO: remove/rename
+  def test_mock_with_yield_kwargs
+    mock = Minitest::Mock.new
+    rs = nil
+
+    File.stub :open, true, mock, kw: 42 do
+      File.open "foo.txt", "r" do |f, kw:|
+        rs = kw
+      end
+    end
+
+    @tc.assert_equal 42, rs
+  end
 
   ## Permutation Sets:
 
@@ -574,7 +888,7 @@ class TestMinitestStub < Minitest::Test
   # [:value,  :block_call, :args] =>  N/A
 
   class Bar
-    def call
+    def call &_ # to ignore unused block
       puts "hi"
     end
   end
@@ -592,7 +906,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
@@ -603,6 +917,26 @@ class TestMinitestStub < Minitest::Test
     end
   end
 
+  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
+
+      controller = Object.new
+      controller.define_singleton_method :create do |u, p|
+        token.create_with_retry u, p
+      end
+
+      params = Object.new
+      def params.to_hash; raise "nah"; end
+
+      token.stub(:create_with_retry, ->(u, p) { 42 }) do
+        act = controller.create :u, params
+        @tc.assert_equal 42, act
+      end
+    end
+  end
+
   def test_stub_callable_block_5 # from tenderlove
     @assertion_count += 1
     Foo.stub5 :blocking, Bar.new do
@@ -694,7 +1028,7 @@ class TestMinitestStub < Minitest::Test
   def test_stub_lambda_block_call_5
     @assertion_count += 1
     rs = nil
-    io = StringIO.new "", "w"
+    io = StringIO.new(+"", "w")
     File.stub5 :open, lambda { |p, m, &blk| blk and blk.call io } do
       File.open "foo.txt", "r" do |f|
         rs = f && f.write("woot")
@@ -709,10 +1043,10 @@ class TestMinitestStub < Minitest::Test
 
     @assertion_count += 1
     rs = nil
-    io = StringIO.new "", "w"
+    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
@@ -722,10 +1056,10 @@ class TestMinitestStub < Minitest::Test
   def test_stub_lambda_block_call_args_5
     @assertion_count += 1
     rs = nil
-    io = StringIO.new "", "w"
+    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
@@ -737,10 +1071,10 @@ class TestMinitestStub < Minitest::Test
 
     @assertion_count += 1
     rs = nil
-    io = StringIO.new "", "w"
+    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
@@ -752,11 +1086,11 @@ class TestMinitestStub < Minitest::Test
 
     @assertion_count += 2
     rs = nil
-    io = StringIO.new "", "w"
+    io = StringIO.new(+"", "w")
     @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
@@ -802,10 +1136,10 @@ class TestMinitestStub < Minitest::Test
   def test_stub_value_block_args_5
     @assertion_count += 2
     rs = nil
-    io = StringIO.new "", "w"
+    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
@@ -821,8 +1155,8 @@ class TestMinitestStub < Minitest::Test
         end
       end
     end
-    exp = "undefined method `write' for nil:NilClass"
-    assert_equal exp, e.message
+    exp = /undefined method [`']write' for nil/
+    assert_match exp, e.message
   end
 
   def test_stub_value_block_args_6
@@ -830,11 +1164,11 @@ class TestMinitestStub < Minitest::Test
 
     @assertion_count += 2
     rs = nil
-    io = StringIO.new "", "w"
+    io = StringIO.new(+"", "w")
     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
@@ -848,7 +1182,7 @@ class TestMinitestStub < Minitest::Test
 
     @assertion_count += 2
     rs = nil
-    io = StringIO.new "", "w"
+    io = StringIO.new(+"", "w")
     @tc.assert_raises ArgumentError do
       File.stub6_2 :open, :value, io do
         result = File.open "foo.txt", "r" do |f|