aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/action_pack_assertions_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-02 15:21:19 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-02 15:21:19 -0700
commit186fee48c796b104b76ef69decb32ef396f435db (patch)
tree9f8b8c8c83af7bd2913c1283f51fd3c3492fea82 /actionpack/test/controller/action_pack_assertions_test.rb
parent945bf9c254b5bfb56df874c1a3f7f0f1e89dc8b8 (diff)
parent24affdc88c4a4af03ce1ec5b23c3def18b90effe (diff)
downloadrails-186fee48c796b104b76ef69decb32ef396f435db.tar.gz
rails-186fee48c796b104b76ef69decb32ef396f435db.tar.bz2
rails-186fee48c796b104b76ef69decb32ef396f435db.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 711640f9a9..60957a2f0e 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -514,9 +514,11 @@ class ActionPackHeaderTest < ActionController::TestCase
end
def test_rendering_xml_respects_content_type
- @response.headers['type'] = 'application/pdf'
- process :hello_xml_world
- assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
+ pending do
+ @response.headers['type'] = 'application/pdf'
+ process :hello_xml_world
+ assert_equal('application/pdf; charset=utf-8', @response.headers['Content-Type'])
+ end
end
def test_render_text_with_custom_content_type