aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-10-07 22:47:05 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-10-07 22:49:41 +0200
commit54f3a18eeceb12c99a7a7463048cd13ee6a51778 (patch)
tree8e1960a6c9361187c4389c98d04d0c20defea62e
parent11a3e02237495fcb106297af875b2708d63c279e (diff)
downloadrails-54f3a18eeceb12c99a7a7463048cd13ee6a51778.tar.gz
rails-54f3a18eeceb12c99a7a7463048cd13ee6a51778.tar.bz2
rails-54f3a18eeceb12c99a7a7463048cd13ee6a51778.zip
Output inline is set to true in the plugin.
Change the reporter to just read the option. Pass output_inline where needed in tests.
-rw-r--r--railties/lib/rails/test_unit/reporter.rb2
-rw-r--r--railties/test/test_unit/reporter_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index 8f1116b6af..e1fe92a11b 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -49,7 +49,7 @@ module Rails
private
def output_inline?
- options.fetch(:output_inline, true)
+ options[:output_inline]
end
def fail_fast?
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index 59fdf4bc36..fa6bb71c64 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -8,7 +8,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
setup do
@output = StringIO.new
- @reporter = Rails::TestUnitReporter.new @output
+ @reporter = Rails::TestUnitReporter.new @output, output_inline: true
end
test "prints rerun snippet to run a single failed test" do
@@ -72,7 +72,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
end
test "outputs skipped tests inline if verbose" do
- verbose = Rails::TestUnitReporter.new @output, verbose: true
+ verbose = Rails::TestUnitReporter.new @output, verbose: true, output_inline: true
verbose.record(skipped_test)
verbose.report