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

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

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 924698c7fb115584a78dc11e2bd2dff87ba45f23..c9b384cfe48e8ee9c4067949759dd20021bf5cd9 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"])
+  Rails::TestUnit::Runner.rake_run(["test/system"]) unless ENV.key?("TEST")
 end
 
 namespace :test do