diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:58:11 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:58:11 -0800 |
| commit | e6d8f435a921dce360bce9faae7dabaf753d4d23 (patch) | |
| tree | 198b5b03afbf8f9d3574030230176c8c1b907725 /actionpack/lib/action_controller/test_case.rb | |
| parent | bf1716bc61938e56e96181ffecb94920e3bbb3b3 (diff) | |
| parent | 3f528e371c9ac2cf8e240a29d500a18ab8f5439d (diff) | |
| download | rails-e6d8f435a921dce360bce9faae7dabaf753d4d23.tar.gz rails-e6d8f435a921dce360bce9faae7dabaf753d4d23.tar.bz2 rails-e6d8f435a921dce360bce9faae7dabaf753d4d23.zip | |
Merge pull request #18721 from sj26/pre-discard-flash
Pre-discard flash messages
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index afe95e3fec..b05700aace 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -677,6 +677,8 @@ module ActionController if flash_value = @request.flash.to_session_value @request.session['flash'] = flash_value + else + @request.session.delete('flash') end @response |