Simplify window closing code upon session reset

minkphp · Apr 9, 2024 · e58c490 · e58c490
1 parent da234b2
commit e58c490
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php
@@ -138,9 +138,6 @@ public function reset(): void
     {
         $webDriver = $this->getWebDriver();
 
-        // Switch to default window.
-        $this->switchToWindow();
-
         // Close all windows except the initial one.
         foreach ($webDriver->getWindowHandles() as $windowHandle) {
             if ($windowHandle === $this->initialWindowHandle) {
@@ -149,9 +146,9 @@ public function reset(): void
 
             $webDriver->switchTo()->window($windowHandle);
             $webDriver->close();
-            $this->switchToWindow();
         }
 
+        $this->switchToWindow();
         $webDriver->manage()->deleteAllCookies();
     }