diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 08:56:50 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-01-17 10:04:39 -0200 |
| commit | cb650a50bfc561dc00dfc844dac01beeab05bd00 (patch) | |
| tree | 8be9c376e2d580202b0db8da544c6e10a6f3ff5a /actionpack/test/controller/content_type_test.rb | |
| parent | 67c96ab024f008ad1aee8345c1ae0fd7aa9bf072 (diff) | |
| download | rails-cb650a50bfc561dc00dfc844dac01beeab05bd00.tar.gz rails-cb650a50bfc561dc00dfc844dac01beeab05bd00.tar.bz2 rails-cb650a50bfc561dc00dfc844dac01beeab05bd00.zip | |
Remove deprecated default_charset= from AC::Base
This should be set globally as a configuration, using
`config.action_dispatch.default_charset` instead
Diffstat (limited to 'actionpack/test/controller/content_type_test.rb')
| -rw-r--r-- | actionpack/test/controller/content_type_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb index b57f3f1bb5..03d5d27cf4 100644 --- a/actionpack/test/controller/content_type_test.rb +++ b/actionpack/test/controller/content_type_test.rb @@ -68,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: @@ -105,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 |