aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Calavera <david.calavera@gmail.com>2010-10-08 18:16:40 +0530
committerXavier Noria <fxn@hashref.com>2010-10-10 12:22:40 +0200
commitab2f2b22a6d0656f719c294d40e35d21c752ba8c (patch)
tree0a671dcc8e84fa9d718628d8fb15afef86397f85 /railties
parentb3cadf338b948640e2203d677cc2b19fd2422ae8 (diff)
downloadrails-ab2f2b22a6d0656f719c294d40e35d21c752ba8c.tar.gz
rails-ab2f2b22a6d0656f719c294d40e35d21c752ba8c.tar.bz2
rails-ab2f2b22a6d0656f719c294d40e35d21c752ba8c.zip
prevent rake test to run the test suite three times when ENV['TEST'] is set [#3572 state:resolved]
Signed-off-by: Xavier Noria <fxn@hashref.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/test_unit/testing.rake7
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 713833f884..28dc40379b 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -73,7 +73,8 @@ end
desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
task :test do
- errors = %w(test:units test:functionals test:integration).collect do |task|
+ tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)
+ errors = tests_to_run.collect do |task|
begin
Rake::Task[task].invoke
nil
@@ -123,6 +124,10 @@ namespace :test do
end
Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
+ Rake::TestTask.new(:single => "test:prepare") do |t|
+ t.libs << "test"
+ end
+
TestTaskWithoutDescription.new(:units => "test:prepare") do |t|
t.libs << "test"
t.pattern = 'test/unit/**/*_test.rb'