aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/misc.rake6
2 files changed, 7 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 06c59619d3..79c43bbe3e 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* rake should run functional tests even if the unit tests have failures [Jim Weirich]
+
* Back off cleanpath to be symlink friendly. Closes #2533 [Nicholas Seckar]
* Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
diff --git a/railties/lib/tasks/misc.rake b/railties/lib/tasks/misc.rake
index 713f622547..60dc2e21d2 100644
--- a/railties/lib/tasks/misc.rake
+++ b/railties/lib/tasks/misc.rake
@@ -1,5 +1,9 @@
desc "Run all the tests on a fresh test database"
-task :default => [ :test_units, :test_functional ]
+task :default do
+ Rake::Task[:test_units].invoke rescue got_error = true
+ Rake::Task[:test_functional].invoke rescue got_error = true
+ raise "Test failures" if got_error
+end
task :environment do
require(File.join(RAILS_ROOT, 'config', 'environment'))