From c816f90e765b858e8b83dd249ed67e8cd90419b3 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 22 Jun 2013 00:20:05 +0000 Subject: Imported minitest 4.7.5 (r8724) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/minitest/test_minitest_mock.rb | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'test/minitest') diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb index 8c005e8be8..53216d1aaa 100644 --- a/test/minitest/test_minitest_mock.rb +++ b/test/minitest/test_minitest_mock.rb @@ -293,18 +293,22 @@ class TestMiniTestStub < MiniTest::Unit::TestCase assert_equal @assertion_count, @tc._assertions end + class Time + def self.now + 24 + end + end + def assert_stub val_or_callable @assertion_count += 1 - synchronize do - t = Time.now.to_i - - Time.stub :now, val_or_callable do - @tc.assert_equal 42, Time.now - end + t = Time.now.to_i - @tc.assert_operator Time.now.to_i, :>=, t + Time.stub :now, val_or_callable do + @tc.assert_equal 42, Time.now end + + @tc.assert_operator Time.now.to_i, :>=, t end def test_stub_private_module_method @@ -352,15 +356,13 @@ class TestMiniTestStub < MiniTest::Unit::TestCase def test_stub_block_args @assertion_count += 1 - synchronize do - t = Time.now.to_i - - Time.stub :now, lambda { |n| n * 2 } do - @tc.assert_equal 42, Time.now(21) - end + t = Time.now.to_i - @tc.assert_operator Time.now.to_i, :>=, t + Time.stub :now, lambda { |n| n * 2 } do + @tc.assert_equal 42, Time.now(21) end + + @tc.assert_operator Time.now.to_i, :>=, t end def test_stub_callable -- cgit v1.2.3