fixing cookie expiration math

src/behaviors/TestableResponseBehavior.php

@@ -2,6 +2,7 @@
 
 namespace markhuot\craftpest\behaviors;
 
+use Carbon\Carbon;
 use Illuminate\Support\Arr;
 use markhuot\craftpest\dom\Form;
 use markhuot\craftpest\dom\NodeList;
@@ -267,7 +268,13 @@ public function assertCookieExpired(string $name)
 
         // Then check the expiration of it
         $cookie = $this->response->cookies->get($name);
-        if ($cookie->expire === 0 || $cookie->expire >= time()) {
+
+        if ($cookie->expire === null) {
+            Assert::fail('Cookie `'.$name.'` does not have an expiration date.');
+        }
+
+        $expiration = Carbon::parse($cookie->expire);
+        if ($expiration->isAfter(Carbon::now())) {
             Assert::fail('Cookie `'.$name.'` does not have an expiration in the past.');
         }
 
@@ -288,8 +295,14 @@ public function assertCookieNotExpired(string $name)
 
         // Then check the expiration of it
         $cookie = $this->response->cookies->get($name);
-        if ($cookie->expire !== 0 && $cookie->expire < time()) {
-            Assert::fail('Cookie `'.$name.'` does not have an expiration in the future.');
+
+        if ($cookie->expire === null) {
+            Assert::fail('Cookie `'.$name.'` does not have an expiration date.');
+        }
+
+        $expiration = Carbon::parse($cookie->expire);
+        if ($expiration->isAfter(Carbon::now())) {
+            Assert::fail('Cookie `'.$name.'` does not have an expiration in the past.');
         }
 
         return $this->response;

src/http/RequestBuilder.php

@@ -42,11 +42,12 @@ public function addHeader(string $name, $value): self
         return $this;
     }
 
-    public function addCookie(string $key, $value): self
+    public function addCookie(string $key, $value, $expire=0): self
     {
         $this->request->cookies->add(new Cookie([
             'name' => $key,
             'value' => $value,
+            'expire' => $expire,
         ]));
 
         return $this;

src/test/CookieState.php

@@ -2,6 +2,7 @@
 
 namespace markhuot\craftpest\test;
 
+use Carbon\Carbon;
 use yii\web\Cookie;
 use yii\web\CookieCollection;
 
@@ -94,7 +95,9 @@ public function storeCookieCollection(?CookieCollection $cookies)
         // We have to manually clear our expired cookies because this is normally handled
         // by the browser for us
         foreach ($this->cookies as $cookie) {
-            if ($cookie->expire !== 0 && $cookie->expire < time()) {
+            $expiration = Carbon::parse($cookie->expire);
+
+            if ($cookie->expire !== 0 && $expiration->isBefore(Carbon::now())) {
                 $this->cookies->remove($cookie, false);
             }
         }

tests/CookieTest.php

@@ -13,6 +13,11 @@
     expect(trim($content))->toBe(json_encode(['theName' => 'theValue']));
 });
 
+it('tests expired cookies', function () {
+    $this->get('responses/expired-cookie')
+        ->assertCookieExpired('cookieName');
+});
+
 it('retains cookies', function () {
     $this->get('response-test')
         ->assertOk()

tests/templates/responses/expired-cookie.twig

@@ -0,0 +1,6 @@
+{% set cookie = create('yii\\web\\Cookie', {config: {
+    name: 'cookieName',
+    value: 'cookieValue',
+    expire: 0,
+}}) %}
+{% do craft.app.response.cookies.add(cookie) %}