diff options
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/base_test.rb | 6 | ||||
-rw-r--r-- | actionpack/test/controller/content_type_test.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 777ca11d85..6f76ab9596 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -167,7 +167,7 @@ class PerformActionTest < ActionController::TestCase def test_get_on_priv_should_show_selector use_controller MethodMissingController - assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do + assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do get :shouldnt_be_called end assert_response :success @@ -178,7 +178,7 @@ class PerformActionTest < ActionController::TestCase use_controller MethodMissingController assert !@controller.__send__(:action_method?, 'method_missing') - assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do + assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do get :method_missing end assert_response :success @@ -187,7 +187,7 @@ class PerformActionTest < ActionController::TestCase def test_method_missing_should_recieve_symbol use_controller AnotherMethodMissingController - assert_deprecated /Using `method_missing` to handle .* use `action_missing` instead/ do + assert_deprecated(/Using `method_missing` to handle .* use `action_missing` instead/) do get :some_action end assert_kind_of NameError, @controller._exception 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 |