diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 14:12:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 14:12:49 -0300 |
| commit | d215620340be7cb29e2aa87aab22da5ec9e6e6a7 (patch) | |
| tree | ae8a01086d98a67677b7af438823a393c3f3fb66 /actionpack/lib/action_controller/test_case.rb | |
| parent | bbbbfe1ac02162ecb5e9a7b560134a3221f129f3 (diff) | |
| parent | 242c5c7ae4b9dbc1558ee9d673335f2b1e209188 (diff) | |
| download | rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.gz rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.bz2 rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.zip | |
Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error
Fix fails to force_ssl_redirection if session_store is disabled
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 33c24999f9..6ffd7a7d2b 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -659,7 +659,9 @@ module ActionController @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters) @request.session.update(session) if session - @request.flash.update(flash || {}) + + is_request_flash_enabled = @request.respond_to?(:flash) + @request.flash.update(flash || {}) if is_request_flash_enabled if xhr @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest' @@ -685,7 +687,8 @@ module ActionController @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {} - if flash_value = @request.flash.to_session_value + flash_value = is_request_flash_enabled ? @request.flash.to_session_value : nil + if flash_value @request.session['flash'] = flash_value else @request.session.delete('flash') |