4 files changed, 56 insertions, 15 deletions
diff --git a/railties/lib/rails/test_unit/minitest_plugin.rb b/railties/lib/rails/test_unit/minitest_plugin.rb
index 4df3e7f0f2..8decdb0f4f 100644
--- a/railties/lib/rails/test_unit/minitest_plugin.rb
+++ b/railties/lib/rails/test_unit/minitest_plugin.rb
@@ -59,18 +59,18 @@ module Minitest
 
     options[:color] = true
     options[:output_inline] = true
-    options[:patterns] = opts.order! unless run_via[:rake]
+    options[:patterns] = opts.order! unless run_via.rake?
   end
 
-  def self.rake_run(patterns) # :nodoc:
-    run_via[:rake] = true
-    ::Rails::TestRequirer.require_files(patterns)
+  def self.rake_run(patterns, exclude_patterns = []) # :nodoc:
+    self.run_via = :rake unless run_via.set?
+    ::Rails::TestRequirer.require_files(patterns, exclude_patterns)
     autorun
   end
 
   module RunRespectingRakeTestopts
     def run(args = [])
-      if run_via[:rake]
+      if run_via.rake?
         args = Shellwords.split(ENV["TESTOPTS"] || "")
       end
 
@@ -87,8 +87,14 @@ module Minitest
 
     # If run via `ruby` we've been passed the files to run directly, or if run
     # via `rake` then they have already been eagerly required.
-    unless run_via[:ruby] || run_via[:rake]
-      ::Rails::TestRequirer.require_files(options[:patterns])
+    unless run_via.ruby? || run_via.rake?
+      # If there are no given patterns, we can assume that the user
+      # simply runs the `bin/rails test` command without extra arguments.
+      if options[:patterns].empty?
+        ::Rails::TestRequirer.require_files(options[:patterns], ["test/system/**/*"])
+      else
+        ::Rails::TestRequirer.require_files(options[:patterns])
+      end
     end
 
     unless options[:full_backtrace] || ENV["BACKTRACE"]
@@ -102,7 +108,33 @@ module Minitest
     reporter << ::Rails::TestUnitReporter.new(options[:io], options)
   end
 
-  mattr_accessor(:run_via) { Hash.new }
+  def self.run_via=(runner)
+    if run_via.set?
+      raise ArgumentError, "run_via already assigned"
+    else
+      run_via.runner = runner
+    end
+  end
+
+  class RunVia
+    attr_accessor :runner
+    alias set? runner
+
+    # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
+    def []=(runner, *)
+      @runner = runner
+    end
+
+    def ruby?
+      runner == :ruby
+    end
+
+    def rake?
+      runner == :rake
+    end
+  end
+
+  mattr_reader(:run_via) { RunVia.new }
 end
 
 # Put Rails as the first plugin minitest initializes so other plugins
diff --git a/railties/lib/rails/test_unit/railtie.rb b/railties/lib/rails/test_unit/railtie.rb
index 746120e6a1..9cc3f73a9c 100644
--- a/railties/lib/rails/test_unit/railtie.rb
+++ b/railties/lib/rails/test_unit/railtie.rb
@@ -11,6 +11,7 @@ module Rails
                                    fixture_replacement: nil
 
       c.integration_tool :test_unit
+      c.system_tests :test_unit
     end
 
     initializer "test_unit.line_filtering" do
diff --git a/railties/lib/rails/test_unit/test_requirer.rb b/railties/lib/rails/test_unit/test_requirer.rb
index fe35934abc..92e5fcf0bc 100644
--- a/railties/lib/rails/test_unit/test_requirer.rb
+++ b/railties/lib/rails/test_unit/test_requirer.rb
@@ -4,10 +4,13 @@ require "rake/file_list"
 module Rails
   class TestRequirer # :nodoc:
     class << self
-      def require_files(patterns)
+      def require_files(patterns, exclude_patterns = [])
         patterns = expand_patterns(patterns)
 
-        Rake::FileList[patterns.compact.presence || "test/**/*_test.rb"].to_a.each do |file|
+        file_list = Rake::FileList[patterns.compact.presence || "test/**/*_test.rb"]
+        file_list.exclude(exclude_patterns)
+
+        file_list.to_a.each do |file|
           require File.expand_path(file)
         end
       end
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 4c157c1262..ef19bd7626 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -4,15 +4,15 @@ require "rails/test_unit/minitest_plugin"
 
 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"]
+
+  if ENV.key?("TEST")
+    Minitest.rake_run([ENV["TEST"]])
   else
-    "test"
+    Minitest.rake_run(["test"], ["test/system/**/*"])
   end
-  Minitest.rake_run([pattern])
 end
 
 namespace :test do
@@ -47,4 +47,9 @@ namespace :test do
     $: << "test"
     Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
+
+  task system: "test:prepare" do
+    $: << "test"
+    Minitest.rake_run(["test/system"])
+  end
 end