aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-06-18 13:16:56 -0400
committerGitHub <noreply@github.com>2018-06-18 13:16:56 -0400
commitb43aa17b8acfa85b2ddfcf71ca7ba0f876a6d4db (patch)
tree3915ab41b31fe9877c80655f6f2e128c0c74fb85
parentc47c289ac02cb60e8b01bb8b1892c040794b418f (diff)
parent3928e52bf849b618584540ee9229c7974f5c9de1 (diff)
downloadrails-b43aa17b8acfa85b2ddfcf71ca7ba0f876a6d4db.tar.gz
rails-b43aa17b8acfa85b2ddfcf71ca7ba0f876a6d4db.tar.bz2
rails-b43aa17b8acfa85b2ddfcf71ca7ba0f876a6d4db.zip
Merge pull request #33150 from vaidehijoshi/test-journey-or-token
Add test case for the `|` token in Journey scanner
-rw-r--r--actionpack/test/journey/route/definition/scanner_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/journey/route/definition/scanner_test.rb b/actionpack/test/journey/route/definition/scanner_test.rb
index bcbe4388c3..092177d315 100644
--- a/actionpack/test/journey/route/definition/scanner_test.rb
+++ b/actionpack/test/journey/route/definition/scanner_test.rb
@@ -30,6 +30,12 @@ module ActionDispatch
["/~page", [[:SLASH, "/"], [:LITERAL, "~page"]]],
["/pa-ge", [[:SLASH, "/"], [:LITERAL, "pa-ge"]]],
["/:page", [[:SLASH, "/"], [:SYMBOL, ":page"]]],
+ ["/:page|*foo", [
+ [:SLASH, "/"],
+ [:SYMBOL, ":page"],
+ [:OR, "|"],
+ [:STAR, "*foo"]
+ ]],
["/(:page)", [
[:SLASH, "/"],
[:LPAREN, "("],