Merge pull request #9374 from senny/improved_match_shorthand_syntax

determine the match shorthand target early.

1 files changed, 27 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 6ecf011694..b922235944 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -517,6 +517,18 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       get 'search' => 'search'
+
+      scope ':locale' do
+        match 'questions/new', via: [:get]
+      end
+
+      namespace :api do
+        namespace :v3 do
+          scope ':locale' do
+            get "products/list"
+          end
+        end
+      end
     end
   end
 
@@ -1417,6 +1429,21 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_match_shorthand_inside_scope_with_variables_with_controller
+    with_test_routes do
+      get '/de/questions/new'
+      assert_equal 'questions#new', @response.body
+      assert_equal 'de', @request.params[:locale]
+    end
+  end
+
+  def test_match_shorthand_inside_nested_namespaces_and_scopes_with_controller
+    with_test_routes do
+      get '/api/v3/en/products/list'
+      assert_equal 'api/v3/products#list', @response.body
+    end
+  end
+
   def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
     with_test_routes do
       assert_equal '/replies', replies_path