diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 10:19:41 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 10:19:41 -0700 |
| commit | 71827489e90f91da18ebac68c2d9e10379220a43 (patch) | |
| tree | d4598ec99e226234dcb3af2ff646311c0d3551db /actionpack/test/dispatch/request | |
| parent | d3e5d1c295365238412fc3aa2666d09ddb69bb1d (diff) | |
| parent | dff6db18840e2fd1dd3f3e4ef0ae7a9a3986d01d (diff) | |
| download | rails-71827489e90f91da18ebac68c2d9e10379220a43.tar.gz rails-71827489e90f91da18ebac68c2d9e10379220a43.tar.bz2 rails-71827489e90f91da18ebac68c2d9e10379220a43.zip | |
Merge branch '3-2-stable-sec' into 3-2-rel
* 3-2-stable-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
Diffstat (limited to 'actionpack/test/dispatch/request')
| -rw-r--r-- | actionpack/test/dispatch/request/query_string_parsing_test.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb index f6a1475d04..181f51add5 100644 --- a/actionpack/test/dispatch/request/query_string_parsing_test.rb +++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb @@ -81,7 +81,12 @@ class QueryStringParsingTest < ActionDispatch::IntegrationTest end test "query string without equal" do - assert_parses({ "action" => nil }, "action") + 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"=>nil}]}}, "action[foo][][bar]") end test "query string with empty key" do |