1 files changed, 27 insertions, 19 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 41921e43f3..32ac27a135 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -1,18 +1,20 @@
-gem 'minitest'
-require 'minitest'
-require 'rails/test_unit/minitest_plugin'
+# frozen_string_literal: true
+
+gem "minitest"
+require "minitest"
+require "rails/test_unit/runner"
 
 task default: :test
 
-desc "Runs all tests in test folder"
+desc "Runs all tests in test folder except system ones"
 task :test do
   $: << "test"
-  pattern = if ENV.key?('TEST')
-               ENV['TEST']
-             else
-               "test"
-             end
-  Minitest.rake_run([pattern])
+
+  if ENV.key?("TEST")
+    Rails::TestUnit::Runner.rake_run([ENV["TEST"]])
+  else
+    Rails::TestUnit::Runner.rake_run
+  end
 end
 
 namespace :test do
@@ -21,30 +23,36 @@ 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"
-      Minitest.rake_run(["test/#{name}"])
+      Rails::TestUnit::Runner.rake_run(["test/#{name}"])
     end
   end
 
-  task :generators => "test:prepare" do
+  task generators: "test:prepare" do
+    $: << "test"
+    Rails::TestUnit::Runner.rake_run(["test/lib/generators"])
+  end
+
+  task units: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/lib/generators"])
+    Rails::TestUnit::Runner.rake_run(["test/models", "test/helpers", "test/unit"])
   end
 
-  task :units => "test:prepare" do
+  task functionals: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
+    Rails::TestUnit::Runner.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
 
-  task :functionals => "test:prepare" do
+  desc "Run system tests only"
+  task system: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
+    Rails::TestUnit::Runner.rake_run(["test/system"])
   end
 end