aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/test_unit/reporter.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-02-17 18:33:11 +0000
committerAndrew White <pixeltrix@users.noreply.github.com>2016-02-17 18:33:11 +0000
commitd50fbe952fa066de6e0de15a7da95402c3497d54 (patch)
tree11dcf6ddd5fdf80ecbec1e5bce7dac27b4e6d2f7 /railties/lib/rails/test_unit/reporter.rb
parent310e4418f4db899dcd07ff24f530ef8862c65f8b (diff)
parent1b8fc04216099836a05a2cdfa334a28a8687251c (diff)
downloadrails-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/rails/test_unit/reporter.rb')
-rw-r--r--railties/lib/rails/test_unit/reporter.rb2
1 files changed, 1 insertions, 1 deletions
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