From 0db310586ac3e15be95d2ef27ff40cfa24c05c10 Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Thu, 12 Nov 2015 21:39:58 +0100
Subject: Prefer Minitest's location for test failures.

When running tests, the Rails test runner would report the start of the test method as the test failure.

For this test:

```ruby
1 require 'test_helper
2
3 class BunnyTest < ActiveSupport::TestCase
4   test "something failing" do
5     assert false, 'This failed'
6   end
7 end
```

The runner outputs 5 instead of 4:

```
............................................F

This failed

bin/rails test test/models/bunny_test.rb:5

........
```
---
 railties/lib/rails/test_unit/reporter.rb      | 10 ++++++++--
 railties/test/application/test_runner_test.rb |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index e1fe92a11b..de4b002e55 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -57,8 +57,14 @@ module Rails
       end
 
       def format_rerun_snippet(result)
-        location, line = result.method(result.name).source_location
-        "#{self.executable} #{relative_path_for(location)}:#{line}"
+        # Try to extract path to assertion from backtrace.
+        if result.location =~ /\[(.*)\]\z/
+          assertion_path = $1
+        else
+          assertion_path = result.method(result.name).source_location.join(':')
+        end
+
+        "#{self.executable} #{relative_path_for(assertion_path)}"
       end
   end
 end
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 0aa6ce2252..4965ab7da0 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -344,7 +344,7 @@ module ApplicationTests
       create_test_file :models, 'post', pass: false
 
       output = run_test_command('test/models/post_test.rb')
-      assert_match %r{Running:\n\nPostTest\nF\n\nwups!\n\nbin/rails test test/models/post_test.rb:4}, output
+      assert_match %r{Running:\n\nPostTest\nF\n\nwups!\n\nbin/rails test test/models/post_test.rb:6}, output
     end
 
     def test_only_inline_failure_output
-- 
cgit v1.2.3