Permalink
Browse files

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!
  • Loading branch information...
tenderlove committed Apr 7, 2011
2 parents 1e90229 + 0e624ce commit a7c5d40d80179c19a249bed7a5f808dadf92b54c
Showing with 4 additions and 4 deletions.
  1. +1 −1 actionpack/lib/action_dispatch/middleware/flash.rb
  2. +3 −3 actionpack/test/dispatch/cookies_test.rb
@@ -149,7 +149,7 @@ def replace(h) #:nodoc:
#
# 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:
@@ -521,7 +521,7 @@ def test_setting_cookies_raises_after_stream_back_to_client
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 @@ def test_setting_permanent_cookies_raises_after_stream_back_to_client
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 @@ def test_setting_signed_cookies_raises_after_stream_back_to_client
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) {

4 comments on commit a7c5d40

@josevalim

This comment has been minimized.

Show comment Hide comment
@josevalim

josevalim Apr 8, 2011

Contributor

Contributor

josevalim replied Apr 8, 2011

@matthuhiggins

This comment has been minimized.

Show comment Hide comment
@matthuhiggins

matthuhiggins Apr 8, 2011

How can you expect him to rebase when he won't even text me back.

How can you expect him to rebase when he won't even text me back.

@dmathieu

This comment has been minimized.

Show comment Hide comment
@dmathieu

dmathieu Apr 8, 2011

Contributor

What a noob ! :)

Contributor

dmathieu replied Apr 8, 2011

What a noob ! :)

@sferik

This comment has been minimized.

Show comment Hide comment
@sferik

sferik Apr 8, 2011

Contributor

Didn't realize GitHub's @mentions work on images too. Awesome!

Contributor

sferik replied Apr 8, 2011

Didn't realize GitHub's @mentions work on images too. Awesome!

Please sign in to comment.