summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
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 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