aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-01-11 09:07:05 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-01-11 09:07:05 +0100
commit72c801476bb3bb73232633bc4d09f0cbeba94544 (patch)
tree7a0161470235094ed9843b190e3dc5269f143a91 /railties
parent5465224892281a088422df438e4fc0ce7f6c8f5e (diff)
parentd82bf140030a62d216e68a81e63ea5d97c45125b (diff)
downloadrails-72c801476bb3bb73232633bc4d09f0cbeba94544.tar.gz
rails-72c801476bb3bb73232633bc4d09f0cbeba94544.tar.bz2
rails-72c801476bb3bb73232633bc4d09f0cbeba94544.zip
Merge pull request #22808 from y-yagi/do_not_clear_all_reporters
delete only unnecessary reporter
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/test_unit/minitest_plugin.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index d4ab2ada66..29a3d991b8 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -80,7 +80,8 @@ module Minitest
Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
end
- self.reporter.reporters.clear # Replace progress reporter for colors.
+ # Replace progress reporter for colors.
+ self.reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
self.reporter << SuppressedSummaryReporter.new(options[:io], options)
self.reporter << ::Rails::TestUnitReporter.new(options[:io], options)
end