kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge branch 'master' of github.com:rails/rails

Browse source 
* '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!
This commit is contained in:
Aaron Patterson 2011-04-07 09:35:24 -07:00
commit a7c5d40d80
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_dispatch/middleware/flash.rb
View file

@ -149,7 +149,7 @@ module ActionDispatch
#
# Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
def now
FlashNow.new(self)
@now ||= FlashNow.new(self)
end
# Keeps either the entire current flash or a specific flash entry available for the next action:

6
actionpack/test/dispatch/cookies_test.rb
View file

@ -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) {