Deprecate default_charset= at controller level

2 files changed, 24 insertions, 14 deletions

diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 76292db0b3..21626fde44 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -16,8 +16,10 @@ module ActionController
       # should be able to handle SCRIPT_NAME
       self.config.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
 
-      class << self
-        delegate :default_charset=, :to => "ActionDispatch::Response"
+      def self.default_charset=(new_charset)
+        ActiveSupport::Deprecation.warn "Setting default charset at controller level" \
+          " is deprecated, please use `config.action_dispatch.default_charset` instead", caller
+        ActionDispatch::Response.default_charset = new_charset
       end
 
       self.protected_instance_variables = %w(
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index d51882066d..d0dabb29ca 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -70,12 +70,16 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_render_changed_charset_default
-    OldContentTypeController.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"
+    assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do
+      begin
+        OldContentTypeController.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"
+      end
+    end
   end
 
   # :ported:
@@ -107,12 +111,16 @@ class ContentTypeTest < ActionController::TestCase
   end
 
   def test_nil_default_for_erb
-    OldContentTypeController.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"
+    assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do
+      begin
+        OldContentTypeController.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"
+      end
+    end
   end
 
   def test_default_for_erb