diff options
Diffstat (limited to 'actionpack/test/controller/new_render_test.rb')
-rw-r--r-- | actionpack/test/controller/new_render_test.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb index 3eb84e6d24..0765772e06 100644 --- a/actionpack/test/controller/new_render_test.rb +++ b/actionpack/test/controller/new_render_test.rb @@ -460,14 +460,9 @@ class NewRenderTest < Test::Unit::TestCase ActionController::Base.protected_variables_cache = nil get :hello_world - assert assigns.include?('request'), 'request should be in assigns' - assert_deprecated 'request' do - assert_kind_of ActionController::AbstractRequest, assigns['request'] - end - assert_not_deprecated do - assert_kind_of ActionController::AbstractRequest, @response.template.request - assert_kind_of ActionController::AbstractRequest, assigns['_request'] - end + assert !assigns.include?('request'), 'request should not be in assigns' + assert_kind_of ActionController::AbstractRequest, assigns['_request'] + assert_kind_of ActionController::AbstractRequest, @response.template.request ensure ActionController::Base.view_controller_internals = view_internals_old_value |