diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2018-01-10 15:46:29 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-10 15:46:29 -0800 |
commit | 013a8abd48a020954ff60524943fec82064147dc (patch) | |
tree | 773afb061e61abf38a14e744ca57e70c532518c5 /railties/lib/rails | |
parent | ae48c65e411e01c1045056562319666384bb1b63 (diff) | |
parent | 76b75ac09406304e4d03f2d643b2ebd7bdaa6224 (diff) | |
download | rails-013a8abd48a020954ff60524943fec82064147dc.tar.gz rails-013a8abd48a020954ff60524943fec82064147dc.tar.bz2 rails-013a8abd48a020954ff60524943fec82064147dc.zip |
Merge pull request #31624 from y-yagi/fix_minitest_511
Add support for Minitest 5.11
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/test_unit/reporter.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb index 7d3164f1eb..28b93cee5a 100644 --- a/railties/lib/rails/test_unit/reporter.rb +++ b/railties/lib/rails/test_unit/reporter.rb @@ -64,11 +64,17 @@ 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) - 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 |