yugui	2008-12-13 12:41:01 +0900 (Sat, 13 Dec 2008)

  New Revision: 20713

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20713

  Log:
    * lib/minitest/test.rb (MinTest::Unit#location): 
      skips user-defined assertions as MiniTest's.
      e.g. for test/ruby/test_m17n.rb.

  Modified files:
    trunk/ChangeLog
    trunk/lib/minitest/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20712)
+++ ChangeLog	(revision 20713)
@@ -1,3 +1,9 @@
+Sat Dec 13 12:38:16 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* lib/minitest/test.rb (MinTest::Unit#location): 
+	  skips user-defined assertions as MiniTest's.
+	  e.g. for test/ruby/test_m17n.rb.
+
 Sat Dec 13 09:17:33 2008  Ryan Davis  <ryand-ruby@z...>
 
 	* lib/minitest/*.rb: Imported minitest 1.3.2 r4503.
Index: lib/minitest/unit.rb
===================================================================
--- lib/minitest/unit.rb	(revision 20712)
+++ lib/minitest/unit.rb	(revision 20713)
@@ -336,8 +336,12 @@
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/