From 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 6 Apr 2011 20:53:48 -0300 Subject: Use freeze instead of close! --- actionpack/test/dispatch/cookies_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'actionpack/test/dispatch/cookies_test.rb') diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index 1d06a755b8..cfa521b2d9 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -502,10 +502,16 @@ class CookiesIntegrationTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def dont_set_cookies + # initialize lazy loaded objects + cookies.permanent + cookies.signed head :ok end def set_cookies + # initialize lazy loaded objects + cookies.permanent + cookies.signed cookies["that"] = "hello" head :ok end -- cgit v1.2.3 From 17205435f8b8c01cc0ef72d8b92faf771bae1b40 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 7 Apr 2011 09:20:35 -0300 Subject: cookies here --- actionpack/test/dispatch/cookies_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/test/dispatch/cookies_test.rb') diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index cfa521b2d9..cd07230a57 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -527,7 +527,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) { @@ -546,7 +546,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) { @@ -565,7 +565,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) { -- cgit v1.2.3 From 03d561ad77085f17ba816ebec619a3d359b2164e Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Thu, 7 Apr 2011 09:26:04 -0300 Subject: Revert "Use freeze instead of close!" This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. --- actionpack/test/dispatch/cookies_test.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'actionpack/test/dispatch/cookies_test.rb') diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb index cd07230a57..ebc16694db 100644 --- a/actionpack/test/dispatch/cookies_test.rb +++ b/actionpack/test/dispatch/cookies_test.rb @@ -502,16 +502,10 @@ class CookiesIntegrationTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def dont_set_cookies - # initialize lazy loaded objects - cookies.permanent - cookies.signed head :ok end def set_cookies - # initialize lazy loaded objects - cookies.permanent - cookies.signed cookies["that"] = "hello" head :ok end -- cgit v1.2.3