[Webdriver] fix cookies debug

Codeception · Oct 10, 2019 · 7bf79ce · 7bf79ce
1 parent afc5260
commit 7bf79ce
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -795,6 +795,16 @@ public function resizeWindow($width, $height)
         $this->webDriver->manage()->window()->setSize(new WebDriverDimension($width, $height));
     }
 
+    private function debugCookies()
+    {
+        $result = [];
+        $cookies = $this->webDriver->manage()->getCookies();
+        foreach ($cookies as $cookie) {
+            $result[] = is_array($cookie) ? $cookie : $cookie->toArray();
+        }
+        $this->debugSection('Cookies', json_encode($result));
+    }
+
     public function seeCookie($cookie, array $params = [])
     {
         $cookies = $this->filterCookies($this->webDriver->manage()->getCookies(), $params);
@@ -804,7 +814,7 @@ function ($c) {
             },
             $cookies
         );
-        $this->debugSection('Cookies', json_encode($this->webDriver->manage()->getCookies()));
+        $this->debugCookies();
         $this->assertContains($cookie, $cookies);
     }
 
@@ -817,11 +827,11 @@ function ($c) {
             },
             $cookies
         );
-        $this->debugSection('Cookies', json_encode($this->webDriver->manage()->getCookies()));
+        $this->debugCookies();
         $this->assertNotContains($cookie, $cookies);
     }
 
-    public function setCookie($cookie, $value, array $params = [])
+    public function setCookie($cookie, $value, array $params = [], $showDebug = true)
     {
         $params['name'] = $cookie;
         $params['value'] = $value;
@@ -847,13 +857,15 @@ public function setCookie($cookie, $value, array $params = [])
             }
         }
         $this->webDriver->manage()->addCookie($params);
-        $this->debugSection('Cookies', json_encode($this->webDriver->manage()->getCookies()));
+        if ($showDebug) {
+            $this->debugCookies();
+        }
     }
 
     public function resetCookie($cookie, array $params = [])
     {
         $this->webDriver->manage()->deleteCookieNamed($cookie);
-        $this->debugSection('Cookies', json_encode($this->webDriver->manage()->getCookies()));
+        $this->debugCookies();
     }
 
     public function grabCookie($cookie, array $params = [])
@@ -3117,8 +3129,9 @@ public function loadSessionSnapshot($name)
         }
 
         foreach ($this->sessionSnapshots[$name] as $cookie) {
-            $this->setCookie($cookie['name'], $cookie['value'], (array)$cookie);
+            $this->setCookie($cookie['name'], $cookie['value'], (array)$cookie, false);
         }
+        $this->debugCookies();
         $this->debugSection('Snapshot', "Restored \"$name\" session snapshot");
         return true;
     }