1 files changed, 23 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/sub_test_task.rb b/railties/lib/rails/test_unit/sub_test_task.rb
index 87b6f9b5a4..36657dbdd4 100644
--- a/railties/lib/rails/test_unit/sub_test_task.rb
+++ b/railties/lib/rails/test_unit/sub_test_task.rb
@@ -1,6 +1,28 @@
+require 'rake/testtask'
+
 module Rails
+  class TestTask < Rake::TestTask # :nodoc: all
+    def initialize(name = :test)
+      super
+      @libs << "test" # lib *and* test seem like a better default
+    end
+
+    def define
+      task @name do
+        if ENV['TESTOPTS']
+          ARGV.replace Shellwords.split ENV['TESTOPTS']
+        end
+        libs = @libs - $LOAD_PATH
+        $LOAD_PATH.unshift(*libs)
+        file_list.each { |fl|
+          FileList[fl].to_a.each { |f| require File.expand_path f }
+        }
+      end
+    end
+  end
+
   # Silence the default description to cut down on `rake -T` noise.
-  class SubTestTask < Rake::TestTask
+  class SubTestTask < Rake::TestTask # :nodoc:
     def desc(string)
       # Ignore the description.
     end