diff options
| -rw-r--r-- | railties/lib/minitest/rails_plugin.rb | 16 | ||||
| -rw-r--r-- | railties/test/minitest/rails_plugin_test.rb | 42 |
2 files changed, 29 insertions, 29 deletions
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 diff --git a/railties/test/minitest/rails_plugin_test.rb b/railties/test/minitest/rails_plugin_test.rb index 423e74fc66..1620bc312f 100644 --- a/railties/test/minitest/rails_plugin_test.rb +++ b/railties/test/minitest/rails_plugin_test.rb @@ -9,30 +9,34 @@ class Minitest::RailsPluginTest < ActiveSupport::TestCase end test "default reporters are replaced" do - reporter = Minitest::CompositeReporter.new - reporter << Minitest::SummaryReporter.new(@output, @options) - reporter << Minitest::ProgressReporter.new(@output, @options) - reporter << Minitest::Reporter.new(@output, @options) - - Minitest::plugin_rails_replace_reporters(reporter, {}) - - assert_equal 3, reporter.reporters.count - assert reporter.reporters.any? { |candidate| candidate.kind_of?(Minitest::SuppressedSummaryReporter) } - assert reporter.reporters.any? { |candidate| candidate.kind_of?(::Rails::TestUnitReporter) } - assert reporter.reporters.any? { |candidate| candidate.kind_of?(Minitest::Reporter) } + with_reporter Minitest::CompositeReporter.new do |reporter| + reporter << Minitest::SummaryReporter.new(@output, @options) + reporter << Minitest::ProgressReporter.new(@output, @options) + reporter << Minitest::Reporter.new(@output, @options) + + Minitest.plugin_rails_init({}) + + assert_equal 3, reporter.reporters.count + assert reporter.reporters.any? { |candidate| candidate.kind_of?(Minitest::SuppressedSummaryReporter) } + assert reporter.reporters.any? { |candidate| candidate.kind_of?(::Rails::TestUnitReporter) } + assert reporter.reporters.any? { |candidate| candidate.kind_of?(Minitest::Reporter) } + end end test "no custom reporters are added if nothing to replace" do - reporter = Minitest::CompositeReporter.new + with_reporter Minitest::CompositeReporter.new do |reporter| + Minitest.plugin_rails_init({}) - Minitest::plugin_rails_replace_reporters(reporter, {}) - - assert_equal 0, reporter.reporters.count + assert_empty reporter.reporters + end end - test "handle the case when reporter is not CompositeReporter" do - reporter = Minitest::Reporter.new + private + def with_reporter(reporter) + old_reporter, Minitest.reporter = Minitest.reporter, reporter - Minitest::plugin_rails_replace_reporters(reporter, {}) - end + yield reporter + ensure + Minitest.reporter = old_reporter + end end |