diff options
| author | kennyj <kennyj@gmail.com> | 2012-02-10 20:55:10 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-02-21 12:43:41 +0900 |
| commit | 39d461703361834c2e51dd9179afce0f8a0a83ff (patch) | |
| tree | 71a06a722a6259f946c3eaeca76dcb9c0c8d0384 /actionpack/test/controller/content_type_test.rb | |
| parent | b80d8f71112279f989ad3accbfed277a25cedd57 (diff) | |
| download | rails-39d461703361834c2e51dd9179afce0f8a0a83ff.tar.gz rails-39d461703361834c2e51dd9179afce0f8a0a83ff.tar.bz2 rails-39d461703361834c2e51dd9179afce0f8a0a83ff.zip | |
Fix some warnings on 3-2-stable
Diffstat (limited to 'actionpack/test/controller/content_type_test.rb')
| -rw-r--r-- | actionpack/test/controller/content_type_test.rb | 4 |
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 d0dabb29ca..e8e445532a 100644 --- a/actionpack/test/controller/content_type_test.rb +++ b/actionpack/test/controller/content_type_test.rb @@ -70,7 +70,7 @@ class ContentTypeTest < ActionController::TestCase end def test_render_changed_charset_default - assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do + assert_deprecated(/Setting default charset at controller.*config\.action_dispatch\.default_charset/) do begin OldContentTypeController.default_charset = "utf-16" get :render_defaults @@ -111,7 +111,7 @@ class ContentTypeTest < ActionController::TestCase end def test_nil_default_for_erb - assert_deprecated /Setting default charset at controller.*config\.action_dispatch\.default_charset/ do + assert_deprecated(/Setting default charset at controller.*config\.action_dispatch\.default_charset/) do begin OldContentTypeController.default_charset = nil get :render_default_for_erb |