1 files changed, 5 insertions, 7 deletions
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d51882066d..03d5d27cf4 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -48,8 +48,6 @@ class OldContentTypeController < ActionController::Base
       format.rss  { render :text   => "hello world!", :content_type => Mime::XML }
     end
   end
-
-  def rescue_action(e) raise end
 end
 
 class ContentTypeTest < ActionController::TestCase
@@ -59,7 +57,7 @@ class ContentTypeTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
   end
 
   # :ported:
@@ -70,12 +68,12 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_render_changed_charset_default
-    OldContentTypeController.default_charset = "utf-16"
+    ActionDispatch::Response.default_charset = "utf-16"
     get :render_defaults
     assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
   ensure
-    OldContentTypeController.default_charset = "utf-8"
+    ActionDispatch::Response.default_charset = "utf-8"
   end
 
   # :ported:
@@ -107,12 +105,12 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_nil_default_for_erb
-    OldContentTypeController.default_charset = nil
+    ActionDispatch::Response.default_charset = nil
     get :render_default_for_erb
     assert_equal Mime::HTML, @response.content_type
     assert_nil @response.charset, @response.headers.inspect
   ensure
-    OldContentTypeController.default_charset = "utf-8"
+    ActionDispatch::Response.default_charset = "utf-8"
   end
 
   def test_default_for_erb