1 files changed, 18 insertions, 12 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 0f26621b59..4c157c1262 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,12 +1,18 @@
-require "rails/test_unit/runner"
+gem "minitest"
+require "minitest"
+require "rails/test_unit/minitest_plugin"
 
 task default: :test
 
 desc "Runs all tests in test folder"
 task :test do
   $: << "test"
-  args = ARGV[0] == "test" ? ARGV[1..-1] : []
-  Rails::TestRunner.run(args)
+  pattern = if ENV.key?("TEST")
+    ENV["TEST"]
+  else
+    "test"
+  end
+  Minitest.rake_run([pattern])
 end
 
 namespace :test do
@@ -15,30 +21,30 @@ namespace :test do
     # If used with Active Record, this task runs before the database schema is synchronized.
   end
 
-  task :run => %w[test]
+  task run: %w[test]
 
   desc "Run tests quickly, but also reset db"
-  task :db => %w[db:test:prepare test]
+  task db: %w[db:test:prepare test]
 
   ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
     task name => "test:prepare" do
       $: << "test"
-      Rails::TestRunner.run(["test/#{name}"])
+      Minitest.rake_run(["test/#{name}"])
     end
   end
 
-  task :generators => "test:prepare" do
+  task generators: "test:prepare" do
     $: << "test"
-    Rails::TestRunner.run(["test/lib/generators"])
+    Minitest.rake_run(["test/lib/generators"])
   end
 
-  task :units => "test:prepare" do
+  task units: "test:prepare" do
     $: << "test"
-    Rails::TestRunner.run(["test/models", "test/helpers", "test/unit"])
+    Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
   end
 
-  task :functionals => "test:prepare" do
+  task functionals: "test:prepare" do
     $: << "test"
-    Rails::TestRunner.run(["test/controllers", "test/mailers", "test/functional"])
+    Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
 end