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

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

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index ffee7f050716f647146482a84a9e4f6ba5e4c4de..720530256e59494ceac956fb43d828c177031e90 100644 (file)
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -1,5 +1,10 @@
+task :test => :environment do
+  Rails::TestUnit::Runner.rake_run(["test/system"]) unless ENV.key?("TEST")
+end
+
 namespace :test do
-  Rails::TestTask.new(lib: "test:prepare") do |t|
-    t.pattern = "test/lib/**/*_test.rb"
+  task "lib" => "test:prepare" do
+    $LOAD_PATH << "test"
+    Rails::TestUnit::Runner.rake_run(["test/lib"])
   end
 end