diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-02-17 18:33:11 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2016-02-17 18:33:11 +0000 |
| commit | d50fbe952fa066de6e0de15a7da95402c3497d54 (patch) | |
| tree | 11dcf6ddd5fdf80ecbec1e5bce7dac27b4e6d2f7 /railties/lib | |
| parent | 310e4418f4db899dcd07ff24f530ef8862c65f8b (diff) | |
| parent | 1b8fc04216099836a05a2cdfa334a28a8687251c (diff) | |
| download | rails-d50fbe952fa066de6e0de15a7da95402c3497d54.tar.gz rails-d50fbe952fa066de6e0de15a7da95402c3497d54.tar.bz2 rails-d50fbe952fa066de6e0de15a7da95402c3497d54.zip | |
Merge pull request #23730 from y-yagi/fail_fast_when_test_error
modify to `error` also abort when specify fail fast option
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/test_unit/minitest_plugin.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/reporter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb index 29a3d991b8..03c705ffef 100644 --- a/railties/lib/rails/test_unit/minitest_plugin.rb +++ b/railties/lib/rails/test_unit/minitest_plugin.rb @@ -42,7 +42,7 @@ module Minitest end opts.on("-f", "--fail-fast", - "Abort test run on first failure") do + "Abort test run on first failure or error") do options[:fail_fast] = true end diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb index ce99dbd585..e81bd9df7e 100644 --- a/railties/lib/rails/test_unit/reporter.rb +++ b/railties/lib/rails/test_unit/reporter.rb @@ -24,7 +24,7 @@ module Rails io.puts end - if fail_fast? && result.failure && !result.error? && !result.skipped? + if fail_fast? && result.failure && !result.skipped? raise Interrupt end end |