- Rails' default backtrace filter can't currently work with caller_locations, so reverting back to caller.

zenspider · zenspider · commit 9f78d3a6ca59 · 2024-01-11T17:08:07.000-08:00
[git-p4: depot-paths = "//src/minitest/dev/": change = 14008]
diff --git a/lib/minitest/assertions.rb b/lib/minitest/assertions.rb
@@ -199,8 +199,8 @@ def assert_empty obj, msg = nil
     end
 
     def _where # :nodoc:
-      where = Minitest.filter_backtrace(caller_locations).first
-      [where.path, where.lineno].join ":"
+      where = Minitest.filter_backtrace(caller).first
+      where = where.split(/:in /, 2).first # clean up noise
     end
 
     E = "" # :nodoc:
diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb
@@ -13,8 +13,8 @@ def infect_an_assertion meth, new_name, dont_flip = false # :nodoc:
     # warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
     self.class_eval <<-EOM, __FILE__, __LINE__ + 1
       def #{new_name} *args
-        where = Minitest.filter_backtrace(caller_locations).first
-        where = [where.path, where.lineno].join ":"
+        where = Minitest.filter_backtrace(caller).first
+        where = where.split(/:in /, 2).first # clean up noise
         Kernel.warn "DEPRECATED: global use of #{new_name} from #\{where}. Use #{target_obj}.#{new_name} instead. This will fail in Minitest 6."
         Minitest::Expectation.new(self, Minitest::Spec.current).#{new_name}(*args)
       end
