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, 12 insertions, 4 deletions

diff --git a/railties/lib/rails/test_unit/line_filtering.rb b/railties/lib/rails/test_unit/line_filtering.rb
index b7635c71f4..dd9732bb12 100644
--- a/railties/lib/rails/test_unit/line_filtering.rb
+++ b/railties/lib/rails/test_unit/line_filtering.rb
@@ -13,9 +13,12 @@ module Rails
   end
 
   class CompositeFilter # :nodoc:
+    attr_reader :named_filter
+
     def initialize(runnable, filter, patterns)
       @runnable = runnable
-      @filters = [ derive_regexp(filter), *derive_line_filters(patterns) ].compact
+      @named_filter = derive_named_filter(filter)
+      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
     end
 
     # Minitest uses === to find matching filters.
@@ -24,9 +27,14 @@ module Rails
     end
 
     private
-      def derive_regexp(filter)
-        # Regexp filtering copied from Minitest.
-        Regexp.new $1 if filter =~ %r%/(.*)/%
+      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)