Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2

MIssed backport for 3.2
  • Loading branch information...
commit c7afc42b2f346a8a7195213a4e8a682da13e7a3f 2 parents 7faa620 + ffdca21
Rafael Mendonça França rafaelfranca authored
3  actionpack/lib/action_controller/metal/params_wrapper.rb
View
@@ -194,7 +194,8 @@ def _set_wrapper_defaults(options, model=nil)
def process_action(*args)
if _wrapper_enabled?
wrapped_hash = _wrap_parameters request.request_parameters
- wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
+ wrapped_keys = request.request_parameters.keys
+ wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
# This will make the wrapped hash accessible from controller and view
request.parameters.merge! wrapped_hash
8 actionpack/test/controller/params_wrapper_test.rb
View
@@ -37,6 +37,14 @@ def teardown
UsersController.last_parameters = nil
end
+ def test_filtered_parameters
+ with_default_wrapper_options do
+ @request.env['CONTENT_TYPE'] = 'application/json'
+ post :parse, { 'username' => 'sikachu' }
+ assert_equal @request.filtered_parameters, { 'controller' => 'params_wrapper_test/users', 'action' => 'parse', 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' } }
+ end
+ end
+
def test_derived_name_from_controller
with_default_wrapper_options do
@request.env['CONTENT_TYPE'] = 'application/json'
Please sign in to comment.
Something went wrong with that request. Please try again.