diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-05 04:58:13 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-05 04:58:13 -0700 |
| commit | c7afc42b2f346a8a7195213a4e8a682da13e7a3f (patch) | |
| tree | 3605e906a195a588af40b7dd8383be71a1fa8655 | |
| parent | 7faa620fd697fe7323487e893596bc761e8d8b33 (diff) | |
| parent | ffdca21e4489967abcc709333c4835ee45059337 (diff) | |
| download | rails-c7afc42b2f346a8a7195213a4e8a682da13e7a3f.tar.gz rails-c7afc42b2f346a8a7195213a4e8a682da13e7a3f.tar.bz2 rails-c7afc42b2f346a8a7195213a4e8a682da13e7a3f.zip | |
Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2
MIssed backport for 3.2
| -rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/controller/params_wrapper_test.rb | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 1ab436a205..ea71171da2 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -194,7 +194,8 @@ module ActionController 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 diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb index fa1608b9df..5b05f77045 100644 --- a/actionpack/test/controller/params_wrapper_test.rb +++ b/actionpack/test/controller/params_wrapper_test.rb @@ -37,6 +37,14 @@ class ParamsWrapperTest < ActionController::TestCase 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' |