aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2015-06-23 07:53:17 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2015-06-23 07:53:17 +0900
commit1d3e0f5872c072d7811a2878dd0e86c82031b43f (patch)
tree7183f356bfacd4d2830104ef6dde3ebae2c225ce /railties/lib/rails
parent73aa66342e685b21ece23192bcb0e79c069e962a (diff)
downloadrails-1d3e0f5872c072d7811a2878dd0e86c82031b43f.tar.gz
rails-1d3e0f5872c072d7811a2878dd0e86c82031b43f.tar.bz2
rails-1d3e0f5872c072d7811a2878dd0e86c82031b43f.zip
do not show "Failed tests" message when a failed test is not
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/test_unit/reporter.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/railties/lib/rails/test_unit/reporter.rb b/railties/lib/rails/test_unit/reporter.rb
index faf551f381..09b8675cf8 100644
--- a/railties/lib/rails/test_unit/reporter.rb
+++ b/railties/lib/rails/test_unit/reporter.rb
@@ -7,7 +7,7 @@ module Rails
self.executable = "bin/rails test"
def report
- return if results.empty?
+ return if filtered_results.empty?
io.puts
io.puts "Failed tests:"
io.puts
@@ -15,14 +15,20 @@ module Rails
end
def aggregated_results # :nodoc:
- filtered_results = results.dup
- filtered_results.reject!(&:skipped?) unless options[:verbose]
filtered_results.map do |result|
location, line = result.method(result.name).source_location
"#{self.executable} #{relative_path_for(location)}:#{line}"
end.join "\n"
end
+ def filtered_results
+ if options[:verbose]
+ results
+ else
+ results.reject(&:skipped?)
+ end
+ end
+
def relative_path_for(file)
file.sub(/^#{Rails.root}\/?/, '')
end