Added protection against closing window from non-existing context

minkphp · Mar 21, 2024 · 867a928 · 867a928
1 parent acca0da
commit 867a928
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Selenium2Driver.php b/src/Selenium2Driver.php
@@ -403,16 +403,17 @@ public function stop()
 
     public function reset()
     {
+        $this->switchToWindow();
         $webDriverSession = $this->getWebDriverSession();
 
         foreach ($this->getWindowNames() as $name) {
             if ($name === $this->initialWindowName) {
                 continue;
             }
 
-            $this->switchToWindow($name);
-            $webDriverSession->deleteWindow();
-            $this->switchToWindow();
+            $this->withWindow($name, function () use ($webDriverSession) {
+                $webDriverSession->deleteWindow();
+            });
         }
 
         $webDriverSession->deleteAllCookies();