build and assign parameters rather than rely on mutations

We should assign parameters to the request object rather than mutate the
hash that is returned by `query_parameters` or `request_parameters`

2 files changed, 18 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 788fc9fe7d..aec21eb35e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -34,10 +34,18 @@ module ActionController
       self.session_options = TestSession::DEFAULT_OPTIONS
     end
 
+    def query_parameters=(params)
+      @env["action_dispatch.request.query_parameters"] = params
+    end
+
+    def request_parameters=(params)
+      @env["action_dispatch.request.request_parameters"] = params
+    end
+
     def assign_parameters(routes, controller_path, action, parameters = {})
       parameters = parameters.symbolize_keys
       extra_keys = routes.extra_keys(parameters.merge(:controller => controller_path, :action => action))
-      non_path_parameters = get? ? query_parameters : request_parameters
+      non_path_parameters = {}.with_indifferent_access
 
       parameters.each do |key, value|
         if value.is_a?(Array) && (value.frozen? || value.any?(&:frozen?))
@@ -61,6 +69,12 @@ module ActionController
         end
       end
 
+      if get?
+        self.query_parameters = non_path_parameters
+      else
+        self.request_parameters = non_path_parameters
+      end
+
       path_parameters[:controller] = controller_path
       path_parameters[:action] = action
 
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 270052ae9f..531b9b0a81 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -49,7 +49,7 @@ class TestCaseTest < ActionController::TestCase
     end
 
     def test_query_parameters
-      render text: request.query_parameters.inspect
+      render text: ::JSON.dump(request.query_parameters)
     end
 
     def test_request_parameters
@@ -514,8 +514,8 @@ XML
 
   def test_query_param_named_action
     get :test_query_parameters, params: {action: 'foobar'}
-    parsed_params = eval(@response.body)
-    assert_equal({action: 'foobar'}, parsed_params)
+    parsed_params = JSON.parse(@response.body)
+    assert_equal({'action' => 'foobar'}, parsed_params)
   end
 
   def test_request_param_named_action