diff --git a/Gemfile.lock b/Gemfile.lock index 66bd2e8e118e6..55cd2439bb76e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,7 +347,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.25.0) + minitest (5.25.1) minitest-bisect (1.7.0) minitest-server (~> 1.0) path_expander (~> 1.1) diff --git a/activesupport/lib/active_support/testing/parallelization/worker.rb b/activesupport/lib/active_support/testing/parallelization/worker.rb index 154f6fdb93509..393355a25fe15 100644 --- a/activesupport/lib/active_support/testing/parallelization/worker.rb +++ b/activesupport/lib/active_support/testing/parallelization/worker.rb @@ -46,29 +46,8 @@ def perform_job(job) set_process_title("#{klass}##{method}") - result = nil - - # TODO: Remove conditional when we support on minitest 5.25+ - if klass.method(:with_info_handler).arity == 2 - t0 = nil - - handler = lambda do - unless reporter.passed? then - warn "Current results:" - warn reporter.reporters.grep(SummaryReporter).first - end - - warn "Current: %s#%s %.2fs" % [klass, method, Minitest.clock_time - t0] - end - - result = klass.with_info_handler reporter, handler do - t0 = Minitest.clock_time - Minitest.run_one_method(klass, method) - end - else - result = klass.with_info_handler reporter do - Minitest.run_one_method(klass, method) - end + result = klass.with_info_handler reporter do + Minitest.run_one_method(klass, method) end safe_record(reporter, result)