aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-02 10:55:46 +0200
committerGitHub <noreply@github.com>2017-07-02 10:55:46 +0200
commita8427bbb15508bc23eb05c273692bd21b37ec195 (patch)
treead441731e0c5e53fabbc7a64c334b34bb78971a0 /actionpack/test
parentafee464b6dc45033bad81b3677016fb45daea92d (diff)
parentab491134a355257eec4730c48977b618c04549a7 (diff)
downloadrails-a8427bbb15508bc23eb05c273692bd21b37ec195.tar.gz
rails-a8427bbb15508bc23eb05c273692bd21b37ec195.tar.bz2
rails-a8427bbb15508bc23eb05c273692bd21b37ec195.zip
Merge pull request #29566 from eugeneius/wrap_parameters_query
Don't wrap parameters if query parameter exists
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/params_wrapper_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 4cbb28ef60..c0f01e6df8 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -226,6 +226,14 @@ class ParamsWrapperTest < ActionController::TestCase
end
end
+ def test_preserves_query_string_params_in_filtered_params
+ with_default_wrapper_options do
+ @request.env["CONTENT_TYPE"] = "application/json"
+ get :parse, params: { "user" => { "username" => "nixon" } }
+ assert_equal({ "controller" => "params_wrapper_test/users", "action" => "parse", "user" => { "username" => "nixon" } }, @request.filtered_parameters)
+ end
+ end
+
def test_empty_parameter_set
with_default_wrapper_options do
@request.env["CONTENT_TYPE"] = "application/json"