Merge branch 'JorisVanEijden-5401-non-null-cookie-expiry' into 2.5

Codeception · Mar 23, 2019 · 2a5b4e5 · 2a5b4e5
2 parents 367de4f + 396f21f
commit 2a5b4e5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -824,6 +824,14 @@ public function setCookie($cookie, $value, array $params = [])
                 $params['domain'] = $urlParts['host'];
             }
         }
+        // #5401 Supply defaults, otherwise chromedriver 2.46 complains.
+        $params = array_filter($params);
+        $params += [
+            'path' => '/',
+            'expiry' => time() + 86400,
+            'secure' => false,
+            'httpOnly' => false,
+        ];
         $this->webDriver->manage()->addCookie($params);
         $this->debugSection('Cookies', json_encode($this->webDriver->manage()->getCookies()));
     }
@@ -3097,7 +3105,7 @@ public function loadSessionSnapshot($name)
         }
 
         foreach ($this->sessionSnapshots[$name] as $cookie) {
-            $this->webDriver->manage()->addCookie($cookie);
+            $this->setCookie($cookie->getName(), $cookie->getValue(), $cookie->toArray());
         }
         $this->debugSection('Snapshot', "Restored \"$name\" session snapshot");
         return true;

diff --git a/tests/web/WebDriverTest.php b/tests/web/WebDriverTest.php
@@ -2,6 +2,7 @@
 
 use Codeception\Step;
 use Codeception\Util\Stub;
+use Facebook\WebDriver\Cookie;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\WebDriverBy;
@@ -675,17 +676,17 @@ public function testSaveSessionSnapshotsExcludeInvalidCookieDomains()
         $fakeWdOptions = Stub::make('\Facebook\WebDriver\WebDriverOptions', [
             'getCookies' => Stub::atLeastOnce(function () {
                 return [
-                    [
+                    Cookie::createFromArray([
                         'name' => 'PHPSESSID',
                         'value' => '123456',
                         'path' => '/',
-                    ],
-                    [
+                    ]),
+                    Cookie::createFromArray([
                         'name' => '3rdParty',
                         'value' => '_value_',
                         'path' => '/',
                         'domain' => '.3rd-party.net',
-                    ]
+                    ]),
                 ];
             }),
         ]);