diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 9b27bb8b917613df75bb1f4887cb7f4aeb94a56b..b18be602017a44bb9ce467f2df9314c6430a8478 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -163,7 +163,7 @@ def _set_wrapper_defaults(options, model=nil) unless options[:only] || options[:except] model ||= _default_wrap_model - if model.respond_to?(:column_names) + if !(model.respond_to?(:abstract_class?) && model.abstract_class?) && model.respond_to?(:column_names) options[:only] = model.column_names end end diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb index 85464fc780b2834b76037e6eeaef786bd5cb5f54..bed4a6a5533e1bf478aed6610476922df6ad59a6 100644 --- a/actionpack/test/controller/params_wrapper_test.rb +++ b/actionpack/test/controller/params_wrapper_test.rb @@ -133,6 +133,7 @@ def test_nested_params end def test_derived_wrapped_keys_from_matching_model + User.expects(:respond_to?).with(:abstract_class?).returns(false) User.expects(:respond_to?).with(:column_names).returns(true) User.expects(:column_names).returns(["username"]) @@ -145,6 +146,7 @@ def test_derived_wrapped_keys_from_matching_model def test_derived_wrapped_keys_from_specified_model with_default_wrapper_options do + Person.expects(:respond_to?).with(:abstract_class?).returns(false) Person.expects(:respond_to?).with(:column_names).returns(true) Person.expects(:column_names).returns(["username"]) @@ -156,6 +158,17 @@ def test_derived_wrapped_keys_from_specified_model end end + def test_not_wrapping_abstract_model + User.expects(:respond_to?).with(:abstract_class?).returns(true) + User.expects(:abstract_class?).returns(true) + + with_default_wrapper_options do + @request.env['CONTENT_TYPE'] = 'application/json' + post :parse, { 'username' => 'sikachu', 'title' => 'Developer' } + assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }}) + end + end + private def with_default_wrapper_options(&block) @controller.class._wrapper_options = {:format => [:json]} @@ -246,4 +259,4 @@ def with_default_wrapper_options(&block) def assert_parameters(expected) assert_equal expected, Admin::Users::UsersController.last_parameters end -end \ No newline at end of file +end