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/test/test_unit | |
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/test/test_unit')
-rw-r--r-- | railties/test/test_unit/reporter_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb index ad852d0f35..91cb47779b 100644 --- a/railties/test/test_unit/reporter_test.rb +++ b/railties/test/test_unit/reporter_test.rb @@ -163,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 @@ -176,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 |