aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-29 17:43:37 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-29 17:51:06 +0100
commit24aba77d9c2c9eb101d3ef5dc36d4d1002fb37b5 (patch)
treea08e2168827f0264dcd0eb39fedf7bf0f260262b
parent17ea8d8d4d81b4b9fb40bd6c6ee80f4acf3bad94 (diff)
downloadrails-24aba77d9c2c9eb101d3ef5dc36d4d1002fb37b5.tar.gz
rails-24aba77d9c2c9eb101d3ef5dc36d4d1002fb37b5.tar.bz2
rails-24aba77d9c2c9eb101d3ef5dc36d4d1002fb37b5.zip
Only load testing tasks if test unit is being used.
-rw-r--r--railties/lib/rails/test_unit/railtie.rb4
-rw-r--r--railties/lib/rails/test_unit/testing.rake (renamed from railties/lib/rails/tasks/testing.rake)0
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index f93dace9bb..21b9dbc074 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -11,7 +11,7 @@ module Rails
end
rake_tasks do
- load "rails/tasks/testing.rake"
- end
+ load "rails/test_unit/testing.rake"
+ end
end
end \ No newline at end of file
diff --git a/railties/lib/rails/tasks/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 57857fb911..57857fb911 100644
--- a/railties/lib/rails/tasks/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake