switch to Rails::TestTask

2 files changed, 34 insertions, 25 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
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 44485d9b14..66b1dbe105 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -73,8 +73,7 @@ namespace :test do
 
   # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
   desc "Run tests quickly by merging all types and not resetting db"
-  Rake::TestTask.new(:all) do |t|
-    t.libs << "test"
+  Rails::TestTask.new(:all) do |t|
     t.pattern = "test/**/*_test.rb"
   end
 
@@ -83,7 +82,7 @@ namespace :test do
     task :db => %w[db:test:prepare test:all]
   end
 
-  Rake::TestTask.new(recent: "test:prepare") do |t|
+  Rails::TestTask.new(recent: "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
       recent_tests('app/models/**/*.rb', 'test/models', since) +
@@ -91,12 +90,11 @@ namespace :test do
       recent_tests('app/controllers/**/*.rb', 'test/controllers', since) +
       recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
-    t.libs << 'test'
     t.test_files = touched.uniq
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
 
-  Rake::TestTask.new(uncommitted: "test:prepare") do |t|
+  Rails::TestTask.new(uncommitted: "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
@@ -115,47 +113,36 @@ namespace :test do
                          controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
       (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
-
-    t.libs << 'test'
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(single: "test:prepare") do |t|
-    t.libs << "test"
-  end
+  Rails::TestTask.new(single: "test:prepare")
 
-  Rails::SubTestTask.new(models: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(models: "test:prepare") do |t|
     t.pattern = 'test/models/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(helpers: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(helpers: "test:prepare") do |t|
     t.pattern = 'test/helpers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(units: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(units: "test:prepare") do |t|
     t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(controllers: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(controllers: "test:prepare") do |t|
     t.pattern = 'test/controllers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(mailers: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(mailers: "test:prepare") do |t|
     t.pattern = 'test/mailers/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(functionals: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(functionals: "test:prepare") do |t|
     t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
   end
 
-  Rails::SubTestTask.new(integration: "test:prepare") do |t|
-    t.libs << "test"
+  Rails::TestTask.new(integration: "test:prepare") do |t|
     t.pattern = 'test/integration/**/*_test.rb'
   end
 end