railties 5.1.2 → 5.1.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7685a90fdb075ddece6002b6b1b064495602bf93
-  data.tar.gz: ece2faf8800420587984148032da7ac92eb396a0
+  metadata.gz: 7b856f7a9711178b06bf7ef9a9e826bf3e47e5cd
+  data.tar.gz: 971b769b568c0fcc83c4a96f8c68a79b09705fea
 SHA512:
-  metadata.gz: '0615908da73a23cabf6ae9ea22b49c1be0e0f60187e7e999933a79882a667f2898b9fa2e2f4a33ea42d6e10142c2da839bfe5e2465b018ea0b790fcbdc845471'
-  data.tar.gz: 228cc16fc2f224cf524cfe573e015f2941b79d595fdd6d20e66b30fd8a989cb12a844689884cb51dd4d1c4e7c2edff921dd7c839b0c623f82203efb3d7e2b905
+  metadata.gz: d9ebadfd36d020f67fbbadba2da90f54978f00d5db751691651a527b0da67c8661647be7f728cad782015cf251a93b43400b993da51f34d110ca719b5a95e8e4
+  data.tar.gz: a095b545bb6e62f2754e34a39eae5021171c9cb3bf1b1e383e7879d0587f12cf9e048811e56c71e0afba092e5ac7fdb837aa1eb223c278a36561d2250eb311de

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## Rails 5.1.3.rc1 (July 19, 2017) ##
+
+*   Make Rails' test runner work better with minitest plugins.
+
+    By demoting the Rails test runner to just another minitest plugin —
+    and thereby not eager loading it — we can co-exist much better with
+    other minitest plugins such as pride and minitest-focus.
+
+    *Kasper Timm Hansen*
+
+*   Load environment file in `dbconsole` command.
+
+    Fixes #29717
+
+    *Yuji Yaginuma*
+
+*   Allow mounting the same engine several times in different locations.
+
+    Fixes #20204.
+
+    *David Rodríguez*
+
+
 ## Rails 5.1.2 (June 26, 2017) ##
 
 *   Add Windows support to `rails secrets:edit`.

data/lib/minitest/rails_plugin.rb

@@ -0,0 +1,49 @@
+require "active_support/core_ext/module/attribute_accessors"
+require "rails/test_unit/reporter"
+
+module Minitest
+  class SuppressedSummaryReporter < SummaryReporter
+    # Disable extra failure output after a run if output is inline.
+    def aggregated_results(*)
+      super unless options[:output_inline]
+    end
+  end
+
+  def self.plugin_rails_options(opts, options)
+    opts.on("-b", "--backtrace", "Show the complete backtrace") do
+      options[:full_backtrace] = true
+    end
+
+    opts.on("-d", "--defer-output", "Output test failures and errors after the test run") do
+      options[:output_inline] = false
+    end
+
+    opts.on("-f", "--fail-fast", "Abort test run on first failure or error") do
+      options[:fail_fast] = true
+    end
+
+    opts.on("-c", "--[no-]color", "Enable color in the output") do |value|
+      options[:color] = value
+    end
+
+    options[:color] = true
+    options[:output_inline] = true
+  end
+
+  # Owes great inspiration to test runner trailblazers like RSpec,
+  # minitest-reporters, maxitest and others.
+  def self.plugin_rails_init(options)
+    unless options[:full_backtrace] || ENV["BACKTRACE"]
+      # Plugin can run without Rails loaded, check before filtering.
+      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
+    end
+
+    # Replace progress reporter for colors.
+    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
+    reporter << SuppressedSummaryReporter.new(options[:io], options)
+    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+  end
+
+  # Backwardscompatibility with Rails 5.0 generated plugin test scripts
+  mattr_reader(:run_via) { Hash.new }
+end

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -11,7 +11,7 @@ module Rails
     end
 
     def start
-      ENV["RAILS_ENV"] = @options[:environment] || environment
+      ENV["RAILS_ENV"] ||= @options[:environment] || environment
 
       case config["adapter"]
       when /^(jdbc)?mysql/
@@ -148,6 +148,10 @@ module Rails
       def perform
         extract_environment_option_from_argument
 
+        # RAILS_ENV needs to be set before config/application is required.
+        ENV["RAILS_ENV"] = options[:environment]
+
+        require_application_and_environment!
         Rails::DBConsole.start(options)
       end
     end

data/lib/rails/commands/test/test_command.rb

@@ -1,21 +1,41 @@
-require "rails/command"
-require "rails/test_unit/minitest_plugin"
+require_relative "../../command"
+require_relative "../../test_unit/runner"
 
 module Rails
   module Command
     class TestCommand < Base # :nodoc:
       no_commands do
         def help
-          perform # Hand over help printing to minitest.
+          require "optparse"
+          require "minitest/rails_plugin"
+
+          opts = OptionParser.new
+          opts.banner = "Usage: #{Rails::TestUnitReporter.executable} [options] [files or directories]"
+          opts.separator ""
+          opts.separator "You can run a single test by appending a line number to a filename:"
+          opts.separator ""
+          opts.separator "    #{Rails::TestUnitReporter.executable} test/models/user_test.rb:27"
+          opts.separator ""
+          opts.separator "You can run multiple files and directories at the same time:"
+          opts.separator ""
+          opts.separator "    #{Rails::TestUnitReporter.executable} test/controllers test/integration/login_test.rb"
+          opts.separator ""
+          opts.separator "By default test failures and errors are reported inline during a run."
+          opts.separator ""
+
+          opts.separator "Rails options:"
+          Rails::TestUnit::Runner.options(opts)
+          Minitest.plugin_rails_options(opts, {})
+
+          say opts
         end
       end
 
       def perform(*)
         $LOAD_PATH << Rails::Command.root.join("test").to_s
 
-        Minitest.run_via = :rails
-
-        require "active_support/testing/autorun"
+        Rails::TestUnit::Runner.parse_options(ARGV)
+        Rails::TestUnit::Runner.run(ARGV)
       end
     end
   end

data/lib/rails/gem_version.rb

@@ -7,8 +7,8 @@ module Rails
   module VERSION
     MAJOR = 5
     MINOR = 1
-    TINY  = 2
-    PRE   = nil
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/plugin/test.rb

@@ -1,7 +1,7 @@
-require "rails/test_unit/minitest_plugin"
+require_relative "../test_unit/runner"
+require_relative "../test_unit/reporter"
 
 Rails::TestUnitReporter.executable = "bin/test"
 
-Minitest.run_via = :rails
-
-require "active_support/testing/autorun"
+Rails::TestUnit::Runner.parse_options(ARGV)
+Rails::TestUnit::Runner.run(ARGV)

data/lib/rails/secrets.rb

@@ -42,7 +42,7 @@ module Rails
         <<-end_of_template.strip_heredoc
           # See `secrets.yml` for tips on generating suitable keys.
           # production:
-          #  external_api_key: 1466aac22e6a869134be3d09b9e89232fc2c2289…
+          #  external_api_key: 1466aac22e6a869134be3d09b9e89232fc2c2289
 
         end_of_template
       end
@@ -100,12 +100,15 @@ module Rails
         end
 
         def writing(contents)
-          tmp_path = File.join(Dir.tmpdir, File.basename(path))
-          File.write(tmp_path, contents)
+          tmp_file = "#{File.basename(path)}.#{Process.pid}"
+          tmp_path = File.join(Dir.tmpdir, tmp_file)
+          IO.binwrite(tmp_path, contents)
 
           yield tmp_path
 
-          write(File.read(tmp_path))
+          updated_contents = IO.binread(tmp_path)
+
+          write(updated_contents) if updated_contents != contents
         ensure
           FileUtils.rm(tmp_path) if File.exist?(tmp_path)
         end

data/lib/rails/test_help.rb

@@ -2,7 +2,6 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require "rails/test_unit/minitest_plugin"
 require "active_support/test_case"
 require "action_controller"
 require "action_controller/test_case"

data/lib/rails/test_unit/line_filtering.rb

@@ -1,78 +1,12 @@
 require "method_source"
+require "rails/test_unit/runner"
 
 module Rails
   module LineFiltering # :nodoc:
     def run(reporter, options = {})
-      if options[:patterns] && options[:patterns].any? { |p| p =~ /:\d+/ }
-        options[:filter] = \
-          CompositeFilter.new(self, options[:filter], options[:patterns])
-      end
+      options[:filter] = Rails::TestUnit::Runner.compose_filter(self, options[:filter])
 
       super
     end
   end
-
-  class CompositeFilter # :nodoc:
-    attr_reader :named_filter
-
-    def initialize(runnable, filter, patterns)
-      @runnable = runnable
-      @named_filter = derive_named_filter(filter)
-      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
-    end
-
-    # Minitest uses === to find matching filters.
-    def ===(method)
-      @filters.any? { |filter| filter === method }
-    end
-
-    private
-      def derive_named_filter(filter)
-        if filter.respond_to?(:named_filter)
-          filter.named_filter
-        elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
-          Regexp.new $1
-        elsif filter.is_a?(String)
-          filter
-        end
-      end
-
-      def derive_line_filters(patterns)
-        patterns.flat_map do |file_and_line|
-          file, *lines = file_and_line.split(":")
-
-          if lines.empty?
-            Filter.new(@runnable, file, nil) if file
-          else
-            lines.map { |line| Filter.new(@runnable, file, line) }
-          end
-        end
-      end
-  end
-
-  class Filter # :nodoc:
-    def initialize(runnable, file, line)
-      @runnable, @file = runnable, File.expand_path(file)
-      @line = line.to_i if line
-    end
-
-    def ===(method)
-      return unless @runnable.method_defined?(method)
-
-      if @line
-        test_file, test_range = definition_for(@runnable.instance_method(method))
-        test_file == @file && test_range.include?(@line)
-      else
-        @runnable.instance_method(method).source_location.first == @file
-      end
-    end
-
-    private
-      def definition_for(method)
-        file, start_line = method.source_location
-        end_line = method.source.count("\n") + start_line - 1
-
-        return file, start_line..end_line
-      end
-  end
 end

data/lib/rails/test_unit/reporter.rb

@@ -72,7 +72,12 @@ module Rails
       end
 
       def app_root
-        @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+        @app_root ||=
+          if defined?(ENGINE_ROOT)
+            ENGINE_ROOT
+          elsif Rails.respond_to?(:root)
+            Rails.root
+          end
       end
 
       def colored_output?

data/lib/rails/test_unit/runner.rb

@@ -0,0 +1,140 @@
+require "shellwords"
+require "method_source"
+require "rake/file_list"
+require "active_support/core_ext/module/attribute_accessors"
+
+module Rails
+  module TestUnit
+    class Runner
+      mattr_reader(:filters) { [] }
+
+      class << self
+        def options(opts)
+          opts.on("--warnings", "-w", "Run with Ruby warnings enabled") {}
+          opts.on("--environment", "-e", "Run tests in the ENV environment") {}
+        end
+
+        def parse_options(argv)
+          # Perform manual parsing and cleanup since option parser raises on unknown options.
+          env_index = argv.index("--environment") || argv.index("-e")
+          if env_index
+            argv.delete_at(env_index)
+            environment = argv.delete_at(env_index).strip
+          end
+          ENV["RAILS_ENV"] = environment || "test"
+
+          w_index = argv.index("--warnings") || argv.index("-w")
+          $VERBOSE = argv.delete_at(w_index) if w_index
+        end
+
+        def rake_run(argv = [])
+          ARGV.replace Shellwords.split(ENV["TESTOPTS"] || "")
+
+          run(argv)
+        end
+
+        def run(argv = [])
+          load_tests(argv)
+
+          require "active_support/testing/autorun"
+        end
+
+        def load_tests(argv)
+          patterns = extract_filters(argv)
+
+          tests = Rake::FileList[patterns.any? ? patterns : "test/**/*_test.rb"]
+          tests.exclude("test/system/**/*") if patterns.empty?
+
+          tests.to_a.each { |path| require File.expand_path(path) }
+        end
+
+        def compose_filter(runnable, filter)
+          if filters.any? { |_, lines| lines.any? }
+            CompositeFilter.new(runnable, filter, filters)
+          else
+            filter
+          end
+        end
+
+        private
+          def extract_filters(argv)
+            argv.select { |arg| arg =~ /^\w+\// }.map do |path|
+              case
+              when path =~ /(:\d+)+$/
+                file, *lines = path.split(":")
+                filters << [ file, lines ]
+                file
+              when Dir.exist?(path)
+                "#{path}/**/*_test.rb"
+              else
+                filters << [ path, [] ]
+                path
+              end
+            end
+          end
+      end
+    end
+
+    class CompositeFilter # :nodoc:
+      attr_reader :named_filter
+
+      def initialize(runnable, filter, patterns)
+        @runnable = runnable
+        @named_filter = derive_named_filter(filter)
+        @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
+      end
+
+      # Minitest uses === to find matching filters.
+      def ===(method)
+        @filters.any? { |filter| filter === method }
+      end
+
+      private
+        def derive_named_filter(filter)
+          if filter.respond_to?(:named_filter)
+            filter.named_filter
+          elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
+            Regexp.new $1
+          elsif filter.is_a?(String)
+            filter
+          end
+        end
+
+        def derive_line_filters(patterns)
+          patterns.flat_map do |file, lines|
+            if lines.empty?
+              Filter.new(@runnable, file, nil) if file
+            else
+              lines.map { |line| Filter.new(@runnable, file, line) }
+            end
+          end
+        end
+    end
+
+    class Filter # :nodoc:
+      def initialize(runnable, file, line)
+        @runnable, @file = runnable, File.expand_path(file)
+        @line = line.to_i if line
+      end
+
+      def ===(method)
+        return unless @runnable.method_defined?(method)
+
+        if @line
+          test_file, test_range = definition_for(@runnable.instance_method(method))
+          test_file == @file && test_range.include?(@line)
+        else
+          @runnable.instance_method(method).source_location.first == @file
+        end
+      end
+
+      private
+        def definition_for(method)
+          file, start_line = method.source_location
+          end_line = method.source.count("\n") + start_line - 1
+
+          return file, start_line..end_line
+        end
+    end
+  end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,6 +1,6 @@
 gem "minitest"
 require "minitest"
-require "rails/test_unit/minitest_plugin"
+require_relative "runner"
 
 task default: :test
 
@@ -9,9 +9,9 @@ task :test do
   $: << "test"
 
   if ENV.key?("TEST")
-    Minitest.rake_run([ENV["TEST"]])
+    Rails::TestUnit::Runner.rake_run([ENV["TEST"]])
   else
-    Minitest.rake_run(["test"], ["test/system/**/*"])
+    Rails::TestUnit::Runner.rake_run
   end
 end
 
@@ -29,28 +29,28 @@ namespace :test do
   ["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
     $: << "test"
-    Minitest.rake_run(["test/lib/generators"])
+    Rails::TestUnit::Runner.rake_run(["test/lib/generators"])
   end
 
   task units: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
+    Rails::TestUnit::Runner.rake_run(["test/models", "test/helpers", "test/unit"])
   end
 
   task functionals: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
+    Rails::TestUnit::Runner.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
 
   desc "Run system tests only"
   task system: "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/system"])
+    Rails::TestUnit::Runner.rake_run(["test/system"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -112,7 +112,9 @@ files:
 - RDOC_MAIN.rdoc
 - README.rdoc
 - exe/rails
+- lib/minitest/rails_plugin.rb
 - lib/rails.rb
+- lib/rails/.DS_Store
 - lib/rails/all.rb
 - lib/rails/api/generator.rb
 - lib/rails/api/task.rb
@@ -129,15 +131,18 @@ files:
 - lib/rails/code_statistics.rb
 - lib/rails/code_statistics_calculator.rb
 - lib/rails/command.rb
+- lib/rails/command/.DS_Store
 - lib/rails/command/actions.rb
 - lib/rails/command/base.rb
 - lib/rails/command/behavior.rb
 - lib/rails/command/environment_argument.rb
 - lib/rails/commands.rb
+- lib/rails/commands/.DS_Store
 - lib/rails/commands/application/application_command.rb
 - lib/rails/commands/console/console_command.rb
 - lib/rails/commands/dbconsole/dbconsole_command.rb
 - lib/rails/commands/destroy/destroy_command.rb
+- lib/rails/commands/generate/.DS_Store
 - lib/rails/commands/generate/generate_command.rb
 - lib/rails/commands/help/USAGE
 - lib/rails/commands/help/help_command.rb
@@ -156,6 +161,7 @@ files:
 - lib/rails/console/helpers.rb
 - lib/rails/dev_caching.rb
 - lib/rails/engine.rb
+- lib/rails/engine/.DS_Store
 - lib/rails/engine/commands.rb
 - lib/rails/engine/configuration.rb
 - lib/rails/engine/railties.rb
@@ -397,10 +403,9 @@ files:
 - lib/rails/templates/rails/welcome/index.html.erb
 - lib/rails/test_help.rb
 - lib/rails/test_unit/line_filtering.rb
-- lib/rails/test_unit/minitest_plugin.rb
 - lib/rails/test_unit/railtie.rb
 - lib/rails/test_unit/reporter.rb
-- lib/rails/test_unit/test_requirer.rb
+- lib/rails/test_unit/runner.rb
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails/welcome_controller.rb
@@ -421,9 +426,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12

data/lib/rails/test_unit/minitest_plugin.rb

@@ -1,145 +0,0 @@
-require "active_support/core_ext/module/attribute_accessors"
-require "rails/test_unit/reporter"
-require "rails/test_unit/test_requirer"
-require "shellwords"
-
-module Minitest
-  class SuppressedSummaryReporter < SummaryReporter
-    # Disable extra failure output after a run if output is inline.
-    def aggregated_results(*)
-      super unless options[:output_inline]
-    end
-  end
-
-  def self.plugin_rails_options(opts, options)
-    executable = ::Rails::TestUnitReporter.executable
-    opts.separator ""
-    opts.separator "Usage: #{executable} [options] [files or directories]"
-    opts.separator "You can run a single test by appending a line number to a filename:"
-    opts.separator ""
-    opts.separator "    #{executable} test/models/user_test.rb:27"
-    opts.separator ""
-    opts.separator "You can run multiple files and directories at the same time:"
-    opts.separator ""
-    opts.separator "    #{executable} test/controllers test/integration/login_test.rb"
-    opts.separator ""
-    opts.separator "By default test failures and errors are reported inline during a run."
-    opts.separator ""
-
-    opts.separator "Rails options:"
-    opts.on("-e", "--environment ENV",
-            "Run tests in the ENV environment") do |env|
-      options[:environment] = env.strip
-    end
-
-    opts.on("-b", "--backtrace",
-            "Show the complete backtrace") do
-      options[:full_backtrace] = true
-    end
-
-    opts.on("-d", "--defer-output",
-            "Output test failures and errors after the test run") do
-      options[:output_inline] = false
-    end
-
-    opts.on("-f", "--fail-fast",
-            "Abort test run on first failure or error") do
-      options[:fail_fast] = true
-    end
-
-    opts.on("-c", "--[no-]color",
-            "Enable color in the output") do |value|
-      options[:color] = value
-    end
-
-    opts.on("-w", "--warnings",
-            "Enable ruby warnings") do
-      $VERBOSE = true
-    end
-
-    options[:color] = true
-    options[:output_inline] = true
-    options[:patterns] = opts.order! unless run_via.rake?
-  end
-
-  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?
-        args = Shellwords.split(ENV["TESTOPTS"] || "")
-      end
-
-      super
-    end
-  end
-
-  singleton_class.prepend RunRespectingRakeTestopts
-
-  # Owes great inspiration to test runner trailblazers like RSpec,
-  # minitest-reporters, maxitest and others.
-  def self.plugin_rails_init(options)
-    ENV["RAILS_ENV"] = options[:environment] || "test"
-
-    # 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?
-      # 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"]
-      # Plugin can run without Rails loaded, check before filtering.
-      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
-    end
-
-    # Replace progress reporter for colors.
-    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
-    reporter << SuppressedSummaryReporter.new(options[:io], options)
-    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
-  end
-
-  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
-# can override or replace our default reporter setup.
-# Since minitest only loads plugins if its extensions are empty we have
-# to call `load_plugins` first.
-Minitest.load_plugins
-Minitest.extensions.unshift "rails"

data/lib/rails/test_unit/test_requirer.rb

@@ -1,31 +0,0 @@
-require "active_support/core_ext/object/blank"
-require "rake/file_list"
-
-module Rails
-  class TestRequirer # :nodoc:
-    class << self
-      def require_files(patterns, exclude_patterns = [])
-        patterns = expand_patterns(patterns)
-
-        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
-
-      private
-        def expand_patterns(patterns)
-          patterns.map do |arg|
-            arg = arg.gsub(/(:\d+)+?$/, "")
-            if Dir.exist?(arg)
-              "#{arg}/**/*_test.rb"
-            else
-              arg
-            end
-          end
-        end
-    end
-  end
-end