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 /lib | |
| parent | a59e629868a72b4fb71a5b4930191337264b82e2 (diff) | |
Imported minitest 4.7.5 (r8724)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/minitest/spec.rb | 3 | ||||
| -rw-r--r-- | lib/minitest/unit.rb | 2 |
2 files changed, 2 insertions, 3 deletions
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: |