Support implicit and explicit content types

1 files changed, 10 insertions, 0 deletions

diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index 7377546631..64b8b10d5b 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -1,24 +1,29 @@
 require 'abstract_unit'
 
 class ContentTypeController < ActionController::Base
+  # :ported:
   def render_content_type_from_body
     response.content_type = Mime::RSS
     render :text => "hello world!"
   end
 
+  # :ported:
   def render_defaults
     render :text => "hello world!"
   end
 
+  # :ported:
   def render_content_type_from_render
     render :text => "hello world!", :content_type => Mime::RSS
   end
 
+  # :ported:
   def render_charset_from_body
     response.charset = "utf-16"
     render :text => "hello world!"
   end
 
+  # :ported:
   def render_nil_charset_from_body
     response.charset = nil
     render :text => "hello world!"
@@ -60,6 +65,7 @@ class ContentTypeTest < ActionController::TestCase
     @controller.logger = Logger.new(nil)
   end
 
+  # :ported:
   def test_render_defaults
     get :render_defaults
     assert_equal "utf-8", @response.charset
@@ -74,24 +80,28 @@ class ContentTypeTest < ActionController::TestCase
     ContentTypeController.default_charset = "utf-8"
   end
 
+  # :ported:
   def test_content_type_from_body
     get :render_content_type_from_body
     assert_equal "application/rss+xml", @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 "utf-8", @response.charset
   end
 
+  # :ported:
   def test_charset_from_body
     get :render_charset_from_body
     assert_equal Mime::HTML, @response.content_type
     assert_equal "utf-16", @response.charset
   end
 
+  # :ported:
   def test_nil_charset_from_body
     get :render_nil_charset_from_body
     assert_equal Mime::HTML, @response.content_type