Merge pull request rails#54741 from Edouard-chin/ec-runner-test

Let minitest parse ARGV:

Author: byroot

railties/lib/minitest/rails_plugin.rb

@@ -127,6 +127,11 @@ def self.plugin_rails_options(opts, options)
       options[:profile] = count
     end
 
+    opts.on(/^[^-]/) do |test_file|
+      options[:test_files] ||= []
+      options[:test_files] << test_file
+    end
+
     options[:color] = true
     options[:output_inline] = true
   end
@@ -137,6 +142,10 @@ def self.plugin_rails_init(options)
     # Don't mess with Minitest unless RAILS_ENV is set
     return unless ENV["RAILS_ENV"] || ENV["RAILS_MINITEST_PLUGIN"]
 
+    if ::Rails::TestUnit::Runner.load_test_files
+      ::Rails::TestUnit::Runner.load_tests(options.fetch(:test_files, []))
+    end
+
     unless options[:full_backtrace]
       # Plugin can run without Rails loaded, check before filtering.
       if ::Rails.respond_to?(:backtrace_cleaner)

railties/lib/rails/test_unit/runner.rb

@@ -26,6 +26,7 @@ class Runner
       TEST_FOLDERS = [:models, :helpers, :channels, :controllers, :mailers, :integration, :jobs, :mailboxes]
       PATH_ARGUMENT_PATTERN = %r"^(?!/.+/$)[.\w]*[/\\]"
       mattr_reader :filters, default: []
+      mattr_reader :load_test_files, default: false
 
       class << self
         def attach_before_load_options(opts)
@@ -52,10 +53,14 @@ def run_from_rake(test_command, argv = [])
           success || exit(false)
         end
 
-        def run(argv = [])
-          load_tests(argv)
-
+        def run(args = [])
           require "active_support/testing/autorun"
+
+          @@load_test_files = true
+
+          at_exit do
+            ARGV.replace(args)
+          end
         end
 
         def load_tests(argv)
@@ -93,8 +98,6 @@ def compose_filter(runnable, filter)
           def extract_filters(argv)
             # Extract absolute and relative paths but skip -n /.*/ regexp filters.
             argv.filter_map do |path|
-              next unless path_argument?(path)
-
               path = path.tr("\\", "/")
               case
               when /(:\d+(-\d+)?)+$/.match?(path)

railties/test/application/test_runner_test.rb

@@ -222,6 +222,69 @@ def test_sanae
       end
     end
 
+    def test_run_test_at_root
+      app_file "my_test.rb", <<-RUBY
+        require "test_helper"
+
+        class MyTest < ActiveSupport::TestCase
+          def test_rikka
+            puts 'Rikka'
+          end
+        end
+      RUBY
+
+      run_test_command("my_test.rb").tap do |output|
+        assert_match "Rikka", output
+      end
+    end
+
+    def test_run_test_having_a_slash_in_its_name
+      app_file "my_test.rb", <<-RUBY
+        require "test_helper"
+
+        class MyTest < ActiveSupport::TestCase
+          test "foo/foo" do
+            puts 'Rikka'
+          end
+        end
+      RUBY
+
+      run_test_command("my_test.rb -n foo\/foo").tap do |output|
+        assert_match "Rikka", output
+      end
+    end
+
+    def test_run_test_with_flags_unordered
+      app_file "my_test.rb", <<-RUBY
+        require "test_helper"
+
+        class MyTest < ActiveSupport::TestCase
+          test "foo/foo" do
+            puts 'Rikka'
+          end
+        end
+      RUBY
+
+      run_test_command("--seed 344 my_test.rb --fail-fast -n foo\/foo").tap do |output|
+        assert_match "Rikka", output
+      end
+    end
+
+    def test_run_test_after_a_flag_without_argument
+      app_file "my_test.rb", <<-RUBY
+        require "test_helper"
+        class MyTest < ActiveSupport::TestCase
+          test "foo/foo" do
+            puts 'Rikka'
+          end
+        end
+      RUBY
+
+      run_test_command("--fail-fast my_test.rb -n foo\/foo").tap do |output|
+        assert_match "Rikka", output
+      end
+    end
+
     def test_run_matched_test
       app_file "test/unit/chu_2_koi_test.rb", <<-RUBY
         require "test_helper"