diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/testing.rake | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 993b6de71c..4b215a089f 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Stop swallowing errors during rake test [Koz] + * Update Rails Initializer to use ActionController::Base#view_paths [Rick] * Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler] diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake index 59ce7af888..ba50a365c3 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/tasks/testing.rake @@ -40,14 +40,17 @@ end desc 'Test all units and functionals' task :test do - Rake::Task["test:units"].invoke rescue got_error = true - Rake::Task["test:functionals"].invoke rescue got_error = true + exceptions = ["test:units", "test:functionals", "test:integration"].collect do |task| + begin + Rake::Task[task].invoke + nil + rescue => e + e + end + end.compact - if File.exist?("test/integration") - Rake::Task["test:integration"].invoke rescue got_error = true - end - - raise "Test failures" if got_error + exceptions.each {|e| puts e;puts e.backtrace } + raise "Test failures" unless exceptions.empty? end namespace :test do |