1 files changed, 62 insertions, 51 deletions
diff --git a/actionpack/test/journey/route/definition/scanner_test.rb b/actionpack/test/journey/route/definition/scanner_test.rb
index 7a510f1e07..092177d315 100644
--- a/actionpack/test/journey/route/definition/scanner_test.rb
+++ b/actionpack/test/journey/route/definition/scanner_test.rb
@@ -1,4 +1,6 @@
-require 'abstract_unit'
+# frozen_string_literal: true
+
+require "abstract_unit"
 
 module ActionDispatch
   module Journey
@@ -8,61 +10,70 @@ module ActionDispatch
           @scanner = Scanner.new
         end
 
-        # /page/:id(/:action)(.:format)
-        def test_tokens
-          [
-            ['/',       [[:SLASH, '/']]],
-            ['*omg',    [[:STAR, '*omg']]],
-            ['/page',   [[:SLASH, '/'], [:LITERAL, 'page']]],
-            ['/page!',  [[:SLASH, '/'], [:LITERAL, 'page!']]],
-            ['/page$',  [[:SLASH, '/'], [:LITERAL, 'page$']]],
-            ['/page&',  [[:SLASH, '/'], [:LITERAL, 'page&']]],
-            ["/page'",  [[:SLASH, '/'], [:LITERAL, "page'"]]],
-            ['/page*',  [[:SLASH, '/'], [:LITERAL, 'page*']]],
-            ['/page+',  [[:SLASH, '/'], [:LITERAL, 'page+']]],
-            ['/page,',  [[:SLASH, '/'], [:LITERAL, 'page,']]],
-            ['/page;',  [[:SLASH, '/'], [:LITERAL, 'page;']]],
-            ['/page=',  [[:SLASH, '/'], [:LITERAL, 'page=']]],
-            ['/page@',  [[:SLASH, '/'], [:LITERAL, 'page@']]],
-            ['/page\:', [[:SLASH, '/'], [:LITERAL, 'page:']]],
-            ['/page\(', [[:SLASH, '/'], [:LITERAL, 'page(']]],
-            ['/page\)', [[:SLASH, '/'], [:LITERAL, 'page)']]],
-            ['/~page',  [[:SLASH, '/'], [:LITERAL, '~page']]],
-            ['/pa-ge',  [[:SLASH, '/'], [:LITERAL, 'pa-ge']]],
-            ['/:page',  [[:SLASH, '/'], [:SYMBOL, ':page']]],
-            ['/(:page)', [
-                          [:SLASH, '/'],
-                          [:LPAREN, '('],
-                          [:SYMBOL, ':page'],
-                          [:RPAREN, ')'],
-                        ]],
-            ['(/:action)', [
-                            [:LPAREN, '('],
-                            [:SLASH, '/'],
-                            [:SYMBOL, ':action'],
-                            [:RPAREN, ')'],
-                           ]],
-            ['(())', [[:LPAREN, '('],
-                     [:LPAREN, '('], [:RPAREN, ')'], [:RPAREN, ')']]],
-            ['(.:format)', [
-                            [:LPAREN, '('],
-                            [:DOT, '.'],
-                            [:SYMBOL, ':format'],
-                            [:RPAREN, ')'],
+        CASES = [
+          ["/",       [[:SLASH, "/"]]],
+          ["*omg",    [[:STAR, "*omg"]]],
+          ["/page",   [[:SLASH, "/"], [:LITERAL, "page"]]],
+          ["/page!",  [[:SLASH, "/"], [:LITERAL, "page!"]]],
+          ["/page$",  [[:SLASH, "/"], [:LITERAL, "page$"]]],
+          ["/page&",  [[:SLASH, "/"], [:LITERAL, "page&"]]],
+          ["/page'",  [[:SLASH, "/"], [:LITERAL, "page'"]]],
+          ["/page*",  [[:SLASH, "/"], [:LITERAL, "page*"]]],
+          ["/page+",  [[:SLASH, "/"], [:LITERAL, "page+"]]],
+          ["/page,",  [[:SLASH, "/"], [:LITERAL, "page,"]]],
+          ["/page;",  [[:SLASH, "/"], [:LITERAL, "page;"]]],
+          ["/page=",  [[:SLASH, "/"], [:LITERAL, "page="]]],
+          ["/page@",  [[:SLASH, "/"], [:LITERAL, "page@"]]],
+          ['/page\:', [[:SLASH, "/"], [:LITERAL, "page:"]]],
+          ['/page\(', [[:SLASH, "/"], [:LITERAL, "page("]]],
+          ['/page\)', [[:SLASH, "/"], [:LITERAL, "page)"]]],
+          ["/~page",  [[:SLASH, "/"], [:LITERAL, "~page"]]],
+          ["/pa-ge",  [[:SLASH, "/"], [:LITERAL, "pa-ge"]]],
+          ["/:page",  [[:SLASH, "/"], [:SYMBOL, ":page"]]],
+          ["/:page|*foo", [
+                            [:SLASH, "/"],
+                            [:SYMBOL, ":page"],
+                            [:OR, "|"],
+                            [:STAR, "*foo"]
                           ]],
-          ].each do |str, expected|
-            @scanner.scan_setup str
-            assert_tokens expected, @scanner
+          ["/(:page)", [
+                        [:SLASH, "/"],
+                        [:LPAREN, "("],
+                        [:SYMBOL, ":page"],
+                        [:RPAREN, ")"],
+                      ]],
+          ["(/:action)", [
+                          [:LPAREN, "("],
+                          [:SLASH, "/"],
+                          [:SYMBOL, ":action"],
+                          [:RPAREN, ")"],
+                         ]],
+          ["(())", [[:LPAREN, "("],
+                   [:LPAREN, "("], [:RPAREN, ")"], [:RPAREN, ")"]]],
+          ["(.:format)", [
+                          [:LPAREN, "("],
+                          [:DOT, "."],
+                          [:SYMBOL, ":format"],
+                          [:RPAREN, ")"],
+                        ]],
+        ]
+
+        CASES.each do |pattern, expected_tokens|
+          test "Scanning `#{pattern}`" do
+            @scanner.scan_setup pattern
+            assert_tokens expected_tokens, @scanner, pattern
           end
         end
 
-        def assert_tokens tokens, scanner
-          toks = []
-          while tok = scanner.next_token
-            toks << tok
+        private
+
+          def assert_tokens(expected_tokens, scanner, pattern)
+            actual_tokens = []
+            while token = scanner.next_token
+              actual_tokens << token
+            end
+            assert_equal expected_tokens, actual_tokens, "Wrong tokens for `#{pattern}`"
           end
-          assert_equal tokens, toks
-        end
       end
     end
   end