aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-01-05 17:46:26 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-01-08 12:41:04 -0800
commitc31cc963daac55f6a3bca9da99b619276911dbd7 (patch)
treebfae05fc707ae5529b60dbe10bfd5891dab8de73 /actionpack/test/controller
parent88cc1688d0cb828c17706b41a8bd27870f2a2beb (diff)
downloadrails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.gz
rails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.bz2
rails-c31cc963daac55f6a3bca9da99b619276911dbd7.zip
Revert "Merge branch 'master-sec'"
This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/webservice_test.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 2602540fbe..c0b9833603 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -116,19 +116,6 @@ class WebServiceTest < ActionDispatch::IntegrationTest
end
end
- def test_post_xml_using_a_disallowed_type_attribute
- $stderr = StringIO.new
- with_test_route_set do
- post '/', '<foo type="symbol">value</foo>', 'CONTENT_TYPE' => 'application/xml'
- assert_response 500
-
- post '/', '<foo type="yaml">value</foo>', 'CONTENT_TYPE' => 'application/xml'
- assert_response 500
- end
- ensure
- $stderr = STDERR
- end
-
def test_register_and_use_yaml
with_test_route_set do
with_params_parsers Mime::YAML => Proc.new { |d| YAML.load(d) } do