summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 03:41:01 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 03:41:01 +0000
commit0f5d079571e359e843bd9528ba5a9bc1979f37d1 (patch)
tree1166c480960e5d79a51b6730b20a751f70c1aead /lib
parentff9c025185890d7113f96834e272dbf81fa1a1d0 (diff)
downloadruby-0f5d079571e359e843bd9528ba5a9bc1979f37d1.tar.gz
ruby-0f5d079571e359e843bd9528ba5a9bc1979f37d1.tar.xz
ruby-0f5d079571e359e843bd9528ba5a9bc1979f37d1.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@20713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/minitest/unit.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index 77176240c..7807e2e3e 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