diff options
author | Chris Sinjakli <chris@sinjakli.co.uk> | 2014-09-14 12:22:29 +0200 |
---|---|---|
committer | Chris Sinjakli <chris@sinjakli.co.uk> | 2014-12-15 14:51:07 +0000 |
commit | 8f8ccb9901cab457c6e1d52bdb25acf658fd5777 (patch) | |
tree | a98563a5c43183cf3a3f0ed5ddad3e73e9d88801 /actionpack/test/dispatch | |
parent | c308fec0f543c5b5a95bf529b5885964ae8b0f61 (diff) | |
download | rails-8f8ccb9901cab457c6e1d52bdb25acf658fd5777.tar.gz rails-8f8ccb9901cab457c6e1d52bdb25acf658fd5777.tar.bz2 rails-8f8ccb9901cab457c6e1d52bdb25acf658fd5777.zip |
Don't convert empty arrays to nils when deep munging params
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r-- | actionpack/test/dispatch/request/json_params_parsing_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/dispatch/request/query_string_parsing_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index c609075e6b..b765a13fa1 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -39,7 +39,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest test "nils are stripped from collections" do assert_parses( - {"person" => nil}, + {"person" => []}, "{\"person\":[null]}", { 'CONTENT_TYPE' => 'application/json' } ) assert_parses( @@ -47,7 +47,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest "{\"person\":[\"foo\",null]}", { 'CONTENT_TYPE' => 'application/json' } ) assert_parses( - {"person" => nil}, + {"person" => []}, "{\"person\":[null, null]}", { 'CONTENT_TYPE' => 'application/json' } ) end diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb index 4e99c26e03..50daafbb54 100644 --- a/actionpack/test/dispatch/request/query_string_parsing_test.rb +++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb @@ -95,8 +95,8 @@ class QueryStringParsingTest < ActionDispatch::IntegrationTest assert_parses({"action" => nil}, "action") assert_parses({"action" => {"foo" => nil}}, "action[foo]") assert_parses({"action" => {"foo" => { "bar" => nil }}}, "action[foo][bar]") - assert_parses({"action" => {"foo" => { "bar" => nil }}}, "action[foo][bar][]") - assert_parses({"action" => {"foo" => nil }}, "action[foo][]") + assert_parses({"action" => {"foo" => { "bar" => [] }}}, "action[foo][bar][]") + assert_parses({"action" => {"foo" => [] }}, "action[foo][]") assert_parses({"action"=>{"foo"=>[{"bar"=>nil}]}}, "action[foo][][bar]") end |