From c94754e2f0bc488907157382ece309baf4ddb1b0 Mon Sep 17 00:00:00 2001 From: Petri Avikainen Date: Sun, 3 Feb 2019 23:34:02 +0200 Subject: Define word boundary for unanchored path regexp --- actionpack/test/journey/path/pattern_test.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'actionpack/test/journey/path/pattern_test.rb') diff --git a/actionpack/test/journey/path/pattern_test.rb b/actionpack/test/journey/path/pattern_test.rb index 3e7aea57f1..97d99064f2 100644 --- a/actionpack/test/journey/path/pattern_test.rb +++ b/actionpack/test/journey/path/pattern_test.rb @@ -34,17 +34,17 @@ module ActionDispatch end { - "/:controller(/:action)" => %r{\A/(#{x})(?:/([^/.?]+))?}, - "/:controller/foo" => %r{\A/(#{x})/foo}, - "/:controller/:action" => %r{\A/(#{x})/([^/.?]+)}, - "/:controller" => %r{\A/(#{x})}, - "/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?}, - "/:controller/:action.xml" => %r{\A/(#{x})/([^/.?]+)\.xml}, - "/:controller.:format" => %r{\A/(#{x})\.([^/.?]+)}, - "/:controller(.:format)" => %r{\A/(#{x})(?:\.([^/.?]+))?}, - "/:controller/*foo" => %r{\A/(#{x})/(.+)}, - "/:controller/*foo/bar" => %r{\A/(#{x})/(.+)/bar}, - "/:foo|*bar" => %r{\A/(?:([^/.?]+)|(.+))}, + "/:controller(/:action)" => %r{\A/(#{x})(?:/([^/.?]+))?\b}, + "/:controller/foo" => %r{\A/(#{x})/foo\b}, + "/:controller/:action" => %r{\A/(#{x})/([^/.?]+)\b}, + "/:controller" => %r{\A/(#{x})\b}, + "/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?\b}, + "/:controller/:action.xml" => %r{\A/(#{x})/([^/.?]+)\.xml\b}, + "/:controller.:format" => %r{\A/(#{x})\.([^/.?]+)\b}, + "/:controller(.:format)" => %r{\A/(#{x})(?:\.([^/.?]+))?\b}, + "/:controller/*foo" => %r{\A/(#{x})/(.+)\b}, + "/:controller/*foo/bar" => %r{\A/(#{x})/(.+)/bar\b}, + "/:foo|*bar" => %r{\A/(?:([^/.?]+)|(.+))\b}, }.each do |path, expected| define_method(:"test_to_non_anchored_regexp_#{Regexp.escape(path)}") do path = Pattern.build( -- cgit v1.2.3