From ff0d5f14504f1aa29ad908ab15bab66b101427b7 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Wed, 3 Jan 2018 08:00:27 +0900
Subject: Correctly get source location

`filtered_results` returns an instance of `Minitest::Result` since https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba13122376
`Minitest::Result` is not test class. So cannot get location directly.
---
 railties/lib/rails/test_unit/reporter.rb | 7 ++++++-
 railties/test/test_unit/reporter_test.rb | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'railties')

diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 7d3164f1eb..c8b7b70611 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -68,7 +68,12 @@ module Rails
       end
 
       def format_rerun_snippet(result)
-        location, line = result.method(result.name).source_location
+        location, line = if result.respond_to?(:source_location)
+          result.source_location
+        else
+          result.method(result.name).source_location
+        end
+
         "#{executable} #{relative_path_for(location)}:#{line}"
       end
 
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index ad852d0f35..09360b2bb0 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -81,6 +81,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
     verbose.record(skipped_test)
     verbose.report
 
+
     expect = %r{\ATestUnitReporterTest::ExampleTest#woot = 10\.00 s = S\n\n\nSkipped:\nTestUnitReporterTest::ExampleTest#woot \[[^\]]+\]:\nskipchurches, misstemples\n\nbin/rails test test/test_unit/reporter_test\.rb:\d+\n\n\z}
     assert_match expect, @output.string
   end
-- 
cgit v1.2.3


From 76b75ac09406304e4d03f2d643b2ebd7bdaa6224 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Wed, 3 Jan 2018 11:19:22 +0900
Subject: Need to use `klass` to get the class name of the test result

Ref: http://docs.seattlerb.org/minitest/Minitest/Result.html#attribute-i-klass
---
 railties/lib/rails/test_unit/reporter.rb | 3 ++-
 railties/test/test_unit/reporter_test.rb | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index c8b7b70611..28b93cee5a 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -64,7 +64,8 @@ module Rails
       end
 
       def format_line(result)
-        "%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
+        klass = result.respond_to?(:klass) ? result.klass : result.class
+        "%s#%s = %.2f s = %s" % [klass, result.name, result.time, result.result_code]
       end
 
       def format_rerun_snippet(result)
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index 09360b2bb0..91cb47779b 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -81,7 +81,6 @@ class TestUnitReporterTest < ActiveSupport::TestCase
     verbose.record(skipped_test)
     verbose.report
 
-
     expect = %r{\ATestUnitReporterTest::ExampleTest#woot = 10\.00 s = S\n\n\nSkipped:\nTestUnitReporterTest::ExampleTest#woot \[[^\]]+\]:\nskipchurches, misstemples\n\nbin/rails test test/test_unit/reporter_test\.rb:\d+\n\n\z}
     assert_match expect, @output.string
   end
@@ -164,7 +163,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
     end
 
     def failed_test
-      ft = ExampleTest.new(:woot)
+      ft = Minitest::Result.from(ExampleTest.new(:woot))
       ft.failures << begin
                        raise Minitest::Assertion, "boo"
                      rescue Minitest::Assertion => e
@@ -177,17 +176,17 @@ class TestUnitReporterTest < ActiveSupport::TestCase
       error = ArgumentError.new("wups")
       error.set_backtrace([ "some_test.rb:4" ])
 
-      et = ExampleTest.new(:woot)
+      et = Minitest::Result.from(ExampleTest.new(:woot))
       et.failures << Minitest::UnexpectedError.new(error)
       et
     end
 
     def passing_test
-      ExampleTest.new(:woot)
+      Minitest::Result.from(ExampleTest.new(:woot))
     end
 
     def skipped_test
-      st = ExampleTest.new(:woot)
+      st = Minitest::Result.from(ExampleTest.new(:woot))
       st.failures << begin
                        raise Minitest::Skip, "skipchurches, misstemples"
                      rescue Minitest::Assertion => e
-- 
cgit v1.2.3