aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-07 22:25:03 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-07 22:25:10 +0200
commit8a4239fc7e6669da9843e5aa28b5ba2a47f26b6f (patch)
treef281057a91ed4ea344f3bb13cca5b5b0b4c6745a
parent0d3d9a150a4ba1084cf28fd26be2a154f4540952 (diff)
downloadrails-8a4239fc7e6669da9843e5aa28b5ba2a47f26b6f.tar.gz
rails-8a4239fc7e6669da9843e5aa28b5ba2a47f26b6f.tar.bz2
rails-8a4239fc7e6669da9843e5aa28b5ba2a47f26b6f.zip
testing.rake should set the default task, closes #2564
-rw-r--r--railties/lib/rails/tasks/misc.rake2
-rw-r--r--railties/lib/rails/test_unit/testing.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index 8b4775d1d3..0dcca36d8b 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -1,5 +1,3 @@
-task :default => :test
-
task :rails_env do
# TODO Do we really need this?
unless defined? RAILS_ENV
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 33da2c0f5a..fa01f42c5b 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -71,6 +71,8 @@ module Kernel
end
end
+task :default => :test
+
desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
task :test do
tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)