Fix mixing line filters with Minitest's -n filter.

Previous commit accidentally broke mixing line filters with string -n filter.

Fix by checking if it is a string and returning it.

We also need to ensure the -n filter carry forward into any other composite filters.

Fix by letting the named filter be extractable, so we'll keep this for the next runnable's
run.

1 files changed, 24 insertions, 0 deletions

diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 821ac9b033..7ecadb60ca 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -406,6 +406,30 @@ module ApplicationTests
       end
     end
 
+    def test_line_filter_with_minitest_string_filter
+      app_file 'test/models/post_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class PostTest < ActiveSupport::TestCase
+          test 'by line' do
+            puts 'by line'
+            assert true
+          end
+
+          test 'by name' do
+            puts 'by name'
+            assert true
+          end
+        end
+      RUBY
+
+      run_test_command('test/models/post_test.rb:4 -n test_by_name').tap do |output|
+        assert_match 'by line', output
+        assert_match 'by name', output
+        assert_match '2 runs, 2 assertions', output
+      end
+    end
+
     def test_shows_filtered_backtrace_by_default
       create_backtrace_test