diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-20 02:53:13 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-20 02:53:13 -0700 |
| commit | 3655d66edacde2db4d04e939260a3585452c16ad (patch) | |
| tree | 497c8a003fcc2e345d44d8541b435bf100260aa9 | |
| parent | 2575508a385f4a8003ea1277025c018583971e1d (diff) | |
| parent | 32a433e1c04264b891a4b4793ac0c75f0acaf9df (diff) | |
| download | rails-3655d66edacde2db4d04e939260a3585452c16ad.tar.gz rails-3655d66edacde2db4d04e939260a3585452c16ad.tar.bz2 rails-3655d66edacde2db4d04e939260a3585452c16ad.zip | |
Merge pull request #6050 from route/wrapped_keys_in_log
Show in log correct wrapped keys
| -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 1f52c164de..aa67fa7f23 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -193,7 +193,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' |