diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-07 09:35:24 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-07 09:35:24 -0700 |
| commit | a7c5d40d80179c19a249bed7a5f808dadf92b54c (patch) | |
| tree | 96bf63a29e68898a0add3a93664c4fdd11801841 /actionpack/test/dispatch/cookies_test.rb | |
| parent | 1e90229e044b82846078d370a9539bd2457793b9 (diff) | |
| parent | 0e624ce9eb9056c8986621f3e6b7f5ca67b4cb12 (diff) | |
| download | rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.tar.gz rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.tar.bz2 rails-a7c5d40d80179c19a249bed7a5f808dadf92b54c.zip | |
Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
Cache flash now
Revert "Use freeze instead of close!"
Revert "Eagerly load Signed and Permanent cookies"
cookies here
Eagerly load Signed and Permanent cookies
Use freeze instead of close!
Diffstat (limited to 'actionpack/test/dispatch/cookies_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/cookies_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index 1d06a755b8..ebc16694db 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -521,7 +521,7 @@ class CookiesIntegrationTest < ActionDispatch::IntegrationTest end end - def test_setting_cookies_raises_after_stream_back_to_client_even_with_an_empty_flash + def test_setting_cookies_raises_after_stream_back_to_client_even_without_cookies with_test_route_set do get '/dont_set_cookies' assert_raise(ActionDispatch::ClosedError) { @@ -540,7 +540,7 @@ class CookiesIntegrationTest < ActionDispatch::IntegrationTest end end - def test_setting_permanent_cookies_raises_after_stream_back_to_client_even_with_an_empty_flash + def test_setting_permanent_cookies_raises_after_stream_back_to_client_even_without_cookies with_test_route_set do get '/dont_set_cookies' assert_raise(ActionDispatch::ClosedError) { @@ -559,7 +559,7 @@ class CookiesIntegrationTest < ActionDispatch::IntegrationTest end end - def test_setting_signed_cookies_raises_after_stream_back_to_client_even_with_an_empty_flash + def test_setting_signed_cookies_raises_after_stream_back_to_client_even_without_cookies with_test_route_set do get '/dont_set_cookies' assert_raise(ActionDispatch::ClosedError) { |