From 89ad0629e04eeb130b70ac289da343d04a9615f5 Mon Sep 17 00:00:00 2001
From: Wen-Tien Chang <ihower@gmail.com>
Date: Wed, 29 Jun 2011 17:15:55 +0800
Subject: Make "rake test" display not only task name but also exception
 message.

---
 railties/lib/rails/test_unit/testing.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 28dc40379b..f86af7d061 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -79,10 +79,10 @@ task :test do
       Rake::Task[task].invoke
       nil
     rescue => e
-      task
+      { :task => task, :exception => e }
     end
   end.compact
-  abort "Errors running #{errors * ', '}!" if errors.any?
+  abort errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n") if errors.any?
 end
 
 namespace :test do
-- 
cgit v1.2.3


From db87e48b5e7908585a82bdd09e0947be19a4abd6 Mon Sep 17 00:00:00 2001
From: Wen-Tien Chang <ihower@gmail.com>
Date: Thu, 30 Jun 2011 00:09:00 +0800
Subject: Add test to rake test for error messages

---
 railties/lib/rails/test_unit/testing.rake |  6 +++++-
 railties/test/application/rake_test.rb    | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index f86af7d061..b9877a83b5 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -82,7 +82,11 @@ task :test do
       { :task => task, :exception => e }
     end
   end.compact
-  abort errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n") if errors.any?
+  
+  if errors.any?
+    puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
+    abort
+  end
 end
 
 namespace :test do
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 44ac6615de..b61e2851bf 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -59,6 +59,32 @@ module ApplicationTests
         Dir.chdir(app_path){ `rake stats` }
     end
 
+    def test_rake_test_error_output
+      Dir.chdir(app_path){ `rake db:migrate` }
+      
+      app_file "config/database.yml", <<-RUBY
+        development:
+      RUBY
+      
+      app_file "test/unit/one_unit_test.rb", <<-RUBY
+      RUBY
+      
+      app_file "test/functional/one_functional_test.rb", <<-RUBY
+        raise RuntimeError
+      RUBY
+      
+      app_file "test/integration/one_integration_test.rb", <<-RUBY
+        raise RuntimeError
+      RUBY
+      
+      silence_stderr do
+        output = Dir.chdir(app_path){ `rake test` }
+        assert_match /Errors running test:units! #<ActiveRecord::AdapterNotSpecified/, output
+        assert_match /Errors running test:functionals! #<RuntimeError/, output
+        assert_match /Errors running test:integration! #<RuntimeError/, output
+      end
+    end
+
     def test_rake_routes_output_strips_anchors_from_http_verbs
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-- 
cgit v1.2.3