aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/content_type_test.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 11:21:08 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-15 11:21:08 -0700
commit5a8a550a45c5ca7abc9785ed180d5f46189c9958 (patch)
tree57e604e8485e34a6d7058c8f243e941d38bca949 /actionpack/test/controller/content_type_test.rb
parentc50b03b754948b676b74c334edfb277fa45c1d14 (diff)
downloadrails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.tar.gz
rails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.tar.bz2
rails-5a8a550a45c5ca7abc9785ed180d5f46189c9958.zip
Finish making things pass with updated internal content_type semantics
Diffstat (limited to 'actionpack/test/controller/content_type_test.rb')
-rw-r--r--actionpack/test/controller/content_type_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d622ac1e85..511788aec8 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -83,14 +83,14 @@ class ContentTypeTest < ActionController::TestCase
# :ported:
def test_content_type_from_body
get :render_content_type_from_body
- assert_equal "application/rss+xml", @response.content_type
+ assert_equal Mime::RSS, @response.content_type
assert_equal "utf-8", @response.charset
end
# :ported:
def test_content_type_from_render
get :render_content_type_from_render
- assert_equal "application/rss+xml", @response.content_type
+ assert_equal Mime::RSS, @response.content_type
assert_equal "utf-8", @response.charset
end