From 6cc000c34cc6ecea9262033c46ad795f9bc56f07 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sun, 18 Feb 2018 21:35:30 +0100 Subject: Clean up reporter replacement a bit. * Don't use :: for class methods, we don't do that elsewhere. * Don't install a needless method on minitest. Prefer assigning the reporter anyway as that's what minitest does internally. * Don't bother opting out when the reporter ain't a Minitest::CompositeReporter. It's hardcoded: https://github.com/seattlerb/minitest/blob/005a3ba42c07d04797e2d00ac2c53e3be127c12f/lib/minitest.rb#L125 And overrides have to create delegate reporters: https://github.com/kern/minitest-reporters/blob/1018b1b42f34b01d4de179c8aad2fa06771fe9b0/lib/minitest/minitest_reporter_plugin.rb#L72 --- railties/lib/minitest/rails_plugin.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/minitest/rails_plugin.rb b/railties/lib/minitest/rails_plugin.rb index 8b2f15a842..7193abbc33 100644 --- a/railties/lib/minitest/rails_plugin.rb +++ b/railties/lib/minitest/rails_plugin.rb @@ -43,18 +43,14 @@ module Minitest Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner) end - self.plugin_rails_replace_reporters(reporter, options) - end - - def self.plugin_rails_replace_reporters(minitest_reporter, options) - return unless minitest_reporter.kind_of?(Minitest::CompositeReporter) + # Suppress summary reports when outputting inline rerun snippets. + if reporter.reporters.reject! { |reporter| reporter.kind_of?(SummaryReporter) } + reporter << SuppressedSummaryReporter.new(options[:io], options) + end # Replace progress reporter for colors. - if minitest_reporter.reporters.reject! { |reporter| reporter.kind_of?(SummaryReporter) } != nil - minitest_reporter << SuppressedSummaryReporter.new(options[:io], options) - end - if minitest_reporter.reporters.reject! { |reporter| reporter.kind_of?(ProgressReporter) } != nil - minitest_reporter << ::Rails::TestUnitReporter.new(options[:io], options) + if reporter.reporters.reject! { |reporter| reporter.kind_of?(ProgressReporter) } + reporter << ::Rails::TestUnitReporter.new(options[:io], options) end end -- cgit v1.2.3