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/test/minitest/rails_plugin_test.rb | 42 ++++++++++++++++------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'railties/test') 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 -- cgit v1.2.3