diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-11-21 11:50:27 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-11-21 11:50:27 -0800 |
| commit | 293c121feeb93544c1f9594bd1bee3ce046301d5 (patch) | |
| tree | 70c120d7aa5d06760abb8cf1416641b29c17f1ab /actionpack/lib/action_controller | |
| parent | b6793ba110c990ca00bab39a047287bd0bd825f1 (diff) | |
| parent | 654a2de7a9c6d58f98dc9d4596cbeba2e5caeca2 (diff) | |
| download | rails-293c121feeb93544c1f9594bd1bee3ce046301d5.tar.gz rails-293c121feeb93544c1f9594bd1bee3ce046301d5.tar.bz2 rails-293c121feeb93544c1f9594bd1bee3ce046301d5.zip | |
Merge pull request #8183 from jcoglan/objectless_sessions
Store FlashHashes in the session as plain hashes
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 5aecb59df9..be8055955d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -509,7 +509,7 @@ module ActionController @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters) @request.session.update(session) if session - @request.session["flash"] = @request.flash.update(flash || {}) + @request.flash.update(flash || {}) @controller.request = @request @controller.response = @response @@ -526,6 +526,7 @@ module ActionController @response.prepare! @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {} + @request.session['flash'] = @request.flash.to_session_value @request.session.delete('flash') if @request.session['flash'].blank? @response end |