aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/minitest
diff options
context:
space:
mode:
authorKevin Robatel <kevinrob2@gmail.com>2018-02-05 12:04:25 +0100
committerKevin Robatel <kevin.robatel@qoqa.com>2018-02-15 10:02:26 +0100
commit40a5ba30fb41eba633106509c5b362761b18d497 (patch)
treeb3b82b19cdf8dea29d8da30dc3fabbf09bf35aba /railties/lib/minitest
parent4865f6b58965078e314a22fdcefdf57ee56675b1 (diff)
downloadrails-40a5ba30fb41eba633106509c5b362761b18d497.tar.gz
rails-40a5ba30fb41eba633106509c5b362761b18d497.tar.bz2
rails-40a5ba30fb41eba633106509c5b362761b18d497.zip
Add SuppressedSummaryReporter and TestUnitReporter only if necessary
Diffstat (limited to 'railties/lib/minitest')
-rw-r--r--railties/lib/minitest/rails_plugin.rb15
1 files changed, 12 insertions, 3 deletions
diff --git a/railties/lib/minitest/rails_plugin.rb b/railties/lib/minitest/rails_plugin.rb
index 6901b0bbc8..8b2f15a842 100644
--- a/railties/lib/minitest/rails_plugin.rb
+++ b/railties/lib/minitest/rails_plugin.rb
@@ -43,10 +43,19 @@ 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)
+
# Replace progress reporter for colors.
- reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
- reporter << SuppressedSummaryReporter.new(options[:io], options)
- reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+ 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)
+ end
end
# Backwardscompatibility with Rails 5.0 generated plugin test scripts