From 7003b36ecfe6f04a87e913828ab0f8dde4e03ecb Mon Sep 17 00:00:00 2001 From: Dylan Smith Date: Wed, 9 Jan 2013 15:26:12 -0500 Subject: Fix JSON params parsing regression for non-object JSON content. Backports #8855. --- actionpack/test/dispatch/request/json_params_parsing_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'actionpack/test/dispatch/request') diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index fbf2ce1fbe..4886bf13b2 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -120,6 +120,13 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest ) end + test "parses json with non-object JSON content" do + assert_parses( + {"user" => {"_json" => "string content" }, "_json" => "string content" }, + "\"string content\"", { 'CONTENT_TYPE' => 'application/json' } + ) + end + private def assert_parses(expected, actual, headers = {}) with_test_routing(UsersController) do -- cgit v1.2.3