Merge pull request #5219 from mattfawcett/2781-fix-querystring-route-constraint-for-testing

Fix for #2781

2 files changed, 5 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 57c6972078..0ec4e41470 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -594,6 +594,7 @@ module ActionDispatch
       def recognize_path(path, environment = {})
         method = (environment[:method] || "GET").to_s.upcase
         path = Journey::Router::Utils.normalize_path(path) unless path =~ %r{://}
+        extras = environment[:extras] || {}
 
         begin
           env = Rack::MockRequest.env_for(path, {:method => method})
@@ -603,6 +604,7 @@ module ActionDispatch
 
         req = @request_class.new(env)
         @router.recognize(req) do |route, matches, params|
+          params.merge!(extras)
           params.each do |key, value|
             if value.is_a?(String)
               value = value.dup.force_encoding(Encoding::BINARY)
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 1552676fbb..1f4b905d18 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -39,10 +39,9 @@ module ActionDispatch
       #   # Test a custom route
       #   assert_recognizes({:controller => 'items', :action => 'show', :id => '1'}, 'view/item1')
       def assert_recognizes(expected_options, path, extras={}, message=nil)
-        request = recognized_request_for(path)
+        request = recognized_request_for(path, extras)
 
         expected_options = expected_options.clone
-        extras.each_key { |key| expected_options.delete key } unless extras.nil?
 
         expected_options.stringify_keys!
 
@@ -181,7 +180,7 @@ module ActionDispatch
 
       private
         # Recognizes the route for a given path.
-        def recognized_request_for(path)
+        def recognized_request_for(path, extras = {})
           if path.is_a?(Hash)
             method = path[:method]
             path   = path[:path]
@@ -209,7 +208,7 @@ module ActionDispatch
 
           request.request_method = method if method
 
-          params = @routes.recognize_path(path, { :method => method })
+          params = @routes.recognize_path(path, { :method => method, :extras => extras })
           request.path_parameters = params.with_indifferent_access
 
           request