diff options
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 6ffd7a7d2b..33c24999f9 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -659,9 +659,7 @@ module ActionController @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters) @request.session.update(session) if session - - is_request_flash_enabled = @request.respond_to?(:flash) - @request.flash.update(flash || {}) if is_request_flash_enabled + @request.flash.update(flash || {}) if xhr @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' @@ -687,8 +685,7 @@ module ActionController @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {} - flash_value = is_request_flash_enabled ? @request.flash.to_session_value : nil - if flash_value + if flash_value = @request.flash.to_session_value @request.session['flash'] = flash_value else @request.session.delete('flash') |