Merge pull request #47942 from ghiculescu/declarative-specs

Fix regression in test name filters with specs

railties/lib/rails/test_unit/runner.rb

@@ -104,9 +104,14 @@ def list_tests(patterns)
           end
 
           def escape_declarative_test_filter(filter)
-            if filter.is_a?(String) && !filter.start_with?("test_")
-              filter = "test_#{filter}" unless regexp_filter?(filter)
-              filter = filter.gsub(/\s+/, "_")
+            # NOTE: This method may be applied multiple times, so any
+            # transformations MUST BE idempotent.
+            if filter.is_a?(String)
+              if regexp_filter?(filter)
+                filter = filter.gsub(/\s+/, '[\s_]+')
+              elsif !filter.start_with?("test_")
+                filter = "test_#{filter.gsub(/\s+/, "_")}"
+              end
             end
             filter
           end

railties/test/application/test_runner_test.rb

@@ -595,7 +595,7 @@ class PostTest < ActiveSupport::TestCase
             assert true
           end
 
-          test "foo again" do
+          test "foo +  + again" do
             puts "hello again"
             assert true
           end
@@ -611,7 +611,7 @@ class PostTest < ActiveSupport::TestCase
         assert_match "1 runs, 1 assertions, 0 failures", output
       end
 
-      run_test_command("test/models/post_test.rb -n 'foo again'").tap do |output|
+      run_test_command("test/models/post_test.rb -n 'foo +  + again'").tap do |output|
         assert_match "hello again", output
         assert_match "1 runs, 1 assertions, 0 failures", output
       end
@@ -632,7 +632,7 @@ class PostTest < ActiveSupport::TestCase
             assert true
           end
 
-          test "greets bar" do
+          test "greets +  + bar" do
             puts "hello bar"
             assert true
           end
@@ -643,7 +643,41 @@ class PostTest < ActiveSupport::TestCase
         end
       RUBY
 
-      run_test_command("test/models/post_test.rb -n '/greets foo|greets bar/'").tap do |output|
+      run_test_command("test/models/post_test.rb -n '/greets foo|greets .  . bar/'").tap do |output|
+        assert_match "hello foo", output
+        assert_match "hello again foo", output
+        assert_match "hello bar", output
+        assert_match "3 runs, 3 assertions, 0 failures", output
+      end
+    end
+
+    def test_declarative_style_regexp_filter_with_minitest_spec
+      app_file "test/models/post_test.rb", <<~RUBY
+        require "minitest/spec"
+
+        class PostTest < Minitest::Spec
+          it "greets foo" do
+            puts "hello foo"
+            assert true
+          end
+
+          it "greets foo again" do
+            puts "hello again foo"
+            assert true
+          end
+
+          it "greets +  + bar" do
+            puts "hello bar"
+            assert true
+          end
+
+          it "greets no one" do
+            assert false
+          end
+        end
+      RUBY
+
+      run_test_command("test/models/post_test.rb -n '/greets foo|greets .  . bar/'").tap do |output|
         assert_match "hello foo", output
         assert_match "hello again foo", output
         assert_match "hello bar", output