1 files changed, 37 insertions, 22 deletions

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 3c247f32c0..877dd6d254 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -48,10 +48,17 @@ task default: :test
 
 desc 'Runs test:units, test:functionals, test:integration together'
 task :test do
-  if ENV['TEST']
-    exec "bundle exec rails test #{ENV['TEST'].inspect}"
+  info = Rails::TestTask.test_info Rake.application.top_level_tasks
+  if info.files.any?
+    Rails::TestTask.new('test:single') { |t|
+      t.test_files = info.files
+    }
+    ENV['TESTOPTS'] ||= info.opts
+    Rake.application.top_level_tasks.replace info.tasks
+
+    Rake::Task['test:single'].invoke
   else
-    exec 'bundle exec rails test'
+    Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
   end
 end
 
@@ -60,15 +67,11 @@ namespace :test do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
-  task :run do
-    ActiveSupport::Deprecation.warn "`rake test:run` is deprecated. Please use `rails test`."
-    exec 'bundle exec rails test'
-  end
+  task :run => ['test:units', 'test:functionals', 'test:integration']
 
   # 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
 
@@ -90,7 +93,6 @@ 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 = "Deprecated; Test recent changes"
@@ -114,23 +116,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 = "Deprecated; Test changes since last checkin (only Subversion and Git)"
 
-  desc "Deprecated; Please use `rails test \"#{ENV['TEST']}\"`"
-  task :single do
-    ActiveSupport::Deprecation.warn "`rake test:single` is deprecated. Please use `rails test \"#{ENV['TEST']}\"`."
-    exec "bundle exec rails test #{test_suit_name}"
+  Rails::TestTask.new(single: "test:prepare")
+
+  Rails::TestTask.new(models: "test:prepare") do |t|
+    t.pattern = 'test/models/**/*_test.rb'
   end
 
-  [:models, :helpers, :units, :controllers, :functionals, :integration].each do |test_suit_name|
-    desc "Deprecated; Please use `rails test #{test_suit_name}`"
-    task test_suit_name do
-      ActiveSupport::Deprecation.warn "`rake test:#{test_suit_name}` is deprecated. Please use `rails test #{test_suit_name}`."
+  Rails::TestTask.new(helpers: "test:prepare") do |t|
+    t.pattern = 'test/helpers/**/*_test.rb'
+  end
 
-      exec "bundle exec rails test #{test_suit_name}"
-    end
+  Rails::TestTask.new(units: "test:prepare") do |t|
+    t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(controllers: "test:prepare") do |t|
+    t.pattern = 'test/controllers/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(mailers: "test:prepare") do |t|
+    t.pattern = 'test/mailers/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(functionals: "test:prepare") do |t|
+    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
+  end
+
+  Rails::TestTask.new(integration: "test:prepare") do |t|
+    t.pattern = 'test/integration/**/*_test.rb'
   end
 end