diff options
author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-18 07:31:39 +0000 |
---|---|---|
committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-18 07:31:39 +0000 |
commit | 58cfb41d2a5f5f42def95ac02ed0089e852cba2a (patch) | |
tree | 0284f806cbbc0d63f2e4bafa13612fa0672edf68 /lib/minitest/unit.rb | |
parent | 7fc9c4a4a0660b05edcfa1f92fef416bc3dcb49d (diff) | |
download | ruby-58cfb41d2a5f5f42def95ac02ed0089e852cba2a.tar.gz |
Imported minitest 1.4.0 r5083.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/minitest/unit.rb')
-rw-r--r-- | lib/minitest/unit.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index df7d6f5d43..3ac89b5fbd 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -343,7 +343,7 @@ module MiniTest def location e last_before_assertion = "" e.backtrace.reverse_each do |s| - break if s =~ /in .(assert|refute|flunk|pass|fail|raise)/ + break if s =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/ last_before_assertion = s end last_before_assertion.sub(/:in .*$/, '') @@ -430,30 +430,30 @@ module MiniTest end class TestCase - attr_reader :name + attr_reader :__name__ def run runner result = '.' begin @passed = nil self.setup - self.__send__ self.name + self.__send__ self.__name__ @passed = true rescue Exception => e @passed = false - result = runner.puke(self.class, self.name, e) + result = runner.puke(self.class, self.__name__, e) ensure begin self.teardown rescue Exception => e - result = runner.puke(self.class, self.name, e) + result = runner.puke(self.class, self.__name__, e) end end result end def initialize name - @name = name + @__name__ = name @passed = nil end |