From c31cc963daac55f6a3bca9da99b619276911dbd7 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 5 Jan 2013 17:46:26 -0700
Subject: Revert "Merge branch 'master-sec'"

This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing
changes made to f049016cd348627bf8db0d72382d7580bf802a79.
---
 .../test/dispatch/request/json_params_parsing_test.rb   | 15 ---------------
 .../test/dispatch/request/xml_params_parsing_test.rb    | 17 -----------------
 2 files changed, 32 deletions(-)

(limited to 'actionpack/test/dispatch')

diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index 2c4a6c2147..c0c3147e37 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -30,21 +30,6 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     )
   end
 
-  test "nils are stripped from collections" do
-    assert_parses(
-      {"person" => nil},
-      "{\"person\":[null]}", { 'CONTENT_TYPE' => 'application/json' }
-    )
-    assert_parses(
-      {"person" => ['foo']},
-      "{\"person\":[\"foo\",null]}", { 'CONTENT_TYPE' => 'application/json' }
-    )
-    assert_parses(
-      {"person" => nil},
-      "{\"person\":[null, null]}", { 'CONTENT_TYPE' => 'application/json' }
-    )
-  end
-
   test "logs error if parsing unsuccessful" do
     with_test_routing do
       output = StringIO.new
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index f13b64a3c7..cb68667002 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -30,23 +30,6 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
     assert_equal "<ok>bar</ok>", resp.body
   end
 
-  def assert_parses(expected, xml)
-    with_test_routing do
-      post "/parse", xml, default_headers
-      assert_response :ok
-      assert_equal(expected, TestController.last_request_parameters)
-    end
-  end
-
-  test "nils are stripped from collections" do
-    assert_parses(
-      {"hash" => { "person" => nil} },
-      "<hash><person type=\"array\"><person nil=\"true\"/></person></hash>")
-    assert_parses(
-      {"hash" => { "person" => ['foo']} },
-      "<hash><person type=\"array\"><person>foo</person><person nil=\"true\"/></person>\n</hash>")
-  end
-
   test "parses hash params" do
     with_test_routing do
       xml = "<person><name>David</name></person>"
-- 
cgit v1.2.3