1 files changed, 22 insertions, 26 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 957deb8a60..0f26621b59 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,48 +1,44 @@
-require 'rake/testtask'
-require 'rails/test_unit/sub_test_task'
+require "rails/test_unit/runner"
 
 task default: :test
 
-desc 'Runs test:units, test:functionals, test:generators, test:integration, test:jobs together'
+desc "Runs all tests in test folder"
 task :test do
-  Rails::TestTask.test_creator(Rake.application.top_level_tasks).invoke_rake_task
+  $: << "test"
+  args = ARGV[0] == "test" ? ARGV[1..-1] : []
+  Rails::TestRunner.run(args)
 end
 
 namespace :test do
   task :prepare do
-    # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
+    # Placeholder task for other Railtie and plugins to enhance.
+    # If used with Active Record, this task runs before the database schema is synchronized.
   end
 
-  task :run => ['test:units', 'test:functionals', 'test:generators', 'test:integration', 'test:jobs']
+  task :run => %w[test]
 
-  # Inspired by: http://ngauthier.com/2012/02/quick-tests-with-bash.html
-  desc "Run tests quickly by merging all types and not resetting db"
-  Rails::TestTask.new(:all) do |t|
-    t.pattern = "test/**/*_test.rb"
-  end
-
-  namespace :all do
-    desc "Run tests quickly, but also reset db"
-    task :db => %w[db:test:prepare test:all]
-  end
-
-  Rails::TestTask.new(single: "test:prepare")
+  desc "Run tests quickly, but also reset db"
+  task :db => %w[db:test:prepare test]
 
   ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
-    Rails::TestTask.new(name => "test:prepare") do |t|
-      t.pattern = "test/#{name}/**/*_test.rb"
+    task name => "test:prepare" do
+      $: << "test"
+      Rails::TestRunner.run(["test/#{name}"])
     end
   end
 
-  Rails::TestTask.new(generators: "test:prepare") do |t|
-    t.pattern = "test/lib/generators/**/*_test.rb"
+  task :generators => "test:prepare" do
+    $: << "test"
+    Rails::TestRunner.run(["test/lib/generators"])
   end
 
-  Rails::TestTask.new(units: "test:prepare") do |t|
-    t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
+  task :units => "test:prepare" do
+    $: << "test"
+    Rails::TestRunner.run(["test/models", "test/helpers", "test/unit"])
   end
 
-  Rails::TestTask.new(functionals: "test:prepare") do |t|
-    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
+  task :functionals => "test:prepare" do
+    $: << "test"
+    Rails::TestRunner.run(["test/controllers", "test/mailers", "test/functional"])
   end
 end