From: Yuval Kogman Date: Wed, 9 Nov 2005 09:11:22 +0000 (+0000) Subject: Use finalize_cookies instead of finalize in Session::State::Cookie X-Git-Tag: v0.01~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=commitdiff_plain;h=d52e50798843d02dd22557fbac181a7147c0c608 Use finalize_cookies instead of finalize in Session::State::Cookie --- diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm index 708646d..aa1d9a3 100644 --- a/lib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm @@ -16,7 +16,7 @@ sub setup_session { $c->config->{session}{cookie_name} ||= "session"; } -sub finalize { +sub finalize_cookies { my $c = shift; my $cookie_name = $c->config->{session}{cookie_name}; @@ -36,7 +36,7 @@ sub finalize { } } - return $c->NEXT::finalize(@_); + return $c->NEXT::finalize_cookies(@_); } sub prepare_cookies { @@ -84,7 +84,7 @@ This plugin stores the session ID on the client using the cookie mechanism. Will restore if an appropriate cookie is found. -=item finalize +=item finalize_cookies Will set a cookie called C if it doesn't exist or if it's value is not the current session id. diff --git a/t/basic.t b/t/basic.t index e0ca3b5..3093b00 100644 --- a/t/basic.t +++ b/t/basic.t @@ -56,8 +56,8 @@ is( $cxt->sessionid, "the session id", "session ID was restored from cookie" ); $cxt->clear; $res->clear; -can_ok( $m, "finalize" ); -$cxt->finalize; +can_ok( $m, "finalize_cookies" ); +$cxt->finalize_cookies; ok( !$res->called("cookies"), "response cookie was not set since res cookie is already there" ); @@ -65,7 +65,7 @@ $cxt->clear; $sessionid = undef; $res->clear; -$cxt->finalize; +$cxt->finalize_cookies; ok( !$res->called("cookies"), "response cookie was not set when sessionid was deleted, even if req cookie is still there" ); @@ -74,7 +74,7 @@ $sessionid = "some other ID"; $cxt->clear; $res->clear; -$cxt->finalize; +$cxt->finalize_cookies; $res->called_ok( "cookies", "response cookie was set when sessionid changed" ); is_deeply( \%res_cookies, @@ -88,7 +88,7 @@ $res->clear; %res_cookies = (); $sessionid = undef; -$cxt->finalize; +$cxt->finalize_cookies; ok( !$res->called("cookies"), "response cookie was not set when there is no sessionid or request cookie" ); @@ -98,7 +98,7 @@ $sessionid = "123"; %res_cookies = (); $res->clear; -$cxt->finalize; +$cxt->finalize_cookies; $res->called_ok( "cookies", "response cookie was set when session was created" );