diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 04:05:27 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 04:05:27 +0000 |
| commit | 87ab5ecc1318d959bc5cc2a3774e29093ec7994d (patch) | |
| tree | dcaa8e838b8aeda7632c50266ea94232c3d34171 /lib | |
| parent | dfe8fa1bbcb8f4afb4123a8cf317663e9dd53d6c (diff) | |
merges r20713 from trunk into ruby_1_9_1.
* lib/minitest/test.rb (MinTest::Unit#location):
skips user-defined assertions as MiniTest's.
e.g. for test/ruby/test_m17n.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/minitest/unit.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 77176240c5..7807e2e3eb 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -336,8 +336,12 @@ p $! end def location e - e.backtrace.find { |s| - s !~ /in .(assert|refute|flunk|pass|fail|raise)/ + e.backtrace.reverse.inject(""){ |last, s| + if s =~ /in .(assert|refute|flunk$|pass$|fail$|raise$)/ + break last + else + s + end }.sub(/:in .*$/, '') end |