diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 63c1b0d636..bb961e45f6 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -412,7 +412,9 @@ module ActionDispatch path.gsub!(%r{/(\(+)/?}, '\1/') # if a path is all optional segments, change the leading "(/" back to # "/(" so it evaluates to "/" when interpreted with no options. - path.sub!(%r{^(\(+)/}, '/\1') if %r{^(\(+[^)]+\)){1,}$}.match?(path) + # Unless, however, at least one secondary segment consists of a static + # part, ex. "(/:locale)(/pages/:page)" + path.sub!(%r{^(\(+)/}, '/\1') if %r{^(\(+[^)]+\))(\(+/:[^)]+\))*$}.match?(path) path end diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index e3d537d84d..f7e812c440 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -1412,6 +1412,53 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest assert_equal "projects#index", @response.body end + def test_optional_scoped_root_multiple_choice + draw do + scope "(:locale)" do + scope "(p/:platform)" do + scope "(b/:browser)" do + root to: "projects#index" + end + end + end + end + + # Note, in this particular case where we rely on pattern matching instead + # of hierarchy to match parameters in a root path, root_path returns "" + # when given no path parameters. + + assert_equal "/en", root_path(locale: "en") + assert_equal "/p/osx", root_path(platform: "osx") + assert_equal "/en/p/osx", root_path(locale: "en", platform: "osx") + assert_equal "/b/chrome", root_path(browser: "chrome") + assert_equal "/en/b/chrome", root_path(locale: "en", browser: "chrome") + assert_equal "/p/osx/b/chrome", + root_path(platform: "osx", browser: "chrome") + assert_equal "/en/p/osx/b/chrome", + root_path(locale: "en", platform: "osx", browser: "chrome") + + get "/en" + assert_equal "projects#index", @response.body + + get "/p/osx" + assert_equal "projects#index", @response.body + + get "/en/p/osx" + assert_equal "projects#index", @response.body + + get "/b/chrome" + assert_equal "projects#index", @response.body + + get "/en/b/chrome" + assert_equal "projects#index", @response.body + + get "/p/osx/b/chrome" + assert_equal "projects#index", @response.body + + get "/en/p/osx/b/chrome" + assert_equal "projects#index", @response.body + end + def test_scope_with_format_option draw do get "direct/index", as: :no_format_direct, format: false