diff options
author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 00:20:05 +0000 |
---|---|---|
committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 00:20:05 +0000 |
commit | c816f90e765b858e8b83dd249ed67e8cd90419b3 (patch) | |
tree | 9fc414a41f818a489b3ca6a908774532457b93d7 | |
parent | a59e629868a72b4fb71a5b4930191337264b82e2 (diff) | |
download | ruby-c816f90e765b858e8b83dd249ed67e8cd90419b3.tar.gz |
Imported minitest 4.7.5 (r8724)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/minitest/spec.rb | 3 | ||||
-rw-r--r-- | lib/minitest/unit.rb | 2 | ||||
-rw-r--r-- | test/minitest/test_minitest_mock.rb | 30 |
4 files changed, 23 insertions, 17 deletions
@@ -1,3 +1,8 @@ +Sat Jun 22 09:11:33 2013 Ryan Davis <ryand-ruby@zenspider.com> + + * lib/minitest/*: Imported minitest 4.7.5 (r8724) + * test/minitest/*: ditto + Sat Jun 22 07:20:30 2013 Koichi Sasada <ko1@atdot.net> * gc.c (gc_prof_set_heap_info, after_gc_sweep): call diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb index c8584f6e4a..d91fccf5bc 100644 --- a/lib/minitest/spec.rb +++ b/lib/minitest/spec.rb @@ -142,9 +142,8 @@ class MiniTest::Spec < MiniTest::Unit::TestCase }.last end - @@describe_stack = [] def describe_stack # :nodoc: - @@describe_stack + Thread.current[:describe_stack] ||= [] end ## diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index a29c8ec93b..465e5b4c98 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -738,7 +738,7 @@ module MiniTest end class Unit # :nodoc: - VERSION = "4.7.4" # :nodoc: + VERSION = "4.7.5" # :nodoc: attr_accessor :report, :failures, :errors, :skips # :nodoc: attr_accessor :assertion_count # :nodoc: 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 |