Merge remote-tracking branch 'upstream/pull/2685'

[rails.git] / lib / tasks / testing.rake

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 924698c7fb115584a78dc11e2bd2dff87ba45f23..720530256e59494ceac956fb43d828c177031e90 100644 (file)
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -1,5 +1,5 @@
-task "test" do
-  Rails::TestUnit::Runner.rake_run(["test/system"])
+task :test => :environment do
+  Rails::TestUnit::Runner.rake_run(["test/system"]) unless ENV.key?("TEST")
 end
 
 namespace :test do