diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 22:53:44 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 22:53:44 -0800 |
| commit | 3211eb17b999523d19d7e5e4431e0f1ac25a740f (patch) | |
| tree | d100fa9b22d47dcf58212f56c4f98e5226d37005 /actionpack/test | |
| parent | d564ee06a8430df809397a64e2d5f9d797be7106 (diff) | |
| parent | 7003b36ecfe6f04a87e913828ab0f8dde4e03ecb (diff) | |
| download | rails-3211eb17b999523d19d7e5e4431e0f1ac25a740f.tar.gz rails-3211eb17b999523d19d7e5e4431e0f1ac25a740f.tar.bz2 rails-3211eb17b999523d19d7e5e4431e0f1ac25a740f.zip | |
Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-params
3-2-stable: Fix JSON params parsing regression for non-object JSON content.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/request/json_params_parsing_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
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 |