From 8198a7b41a5eb4efb3f4e3ae10527171f515df47 Mon Sep 17 00:00:00 2001
From: Alex <aik099@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:12:18 +0300
Subject: [PATCH] Use initial window handle instead of name

---
 src/WebdriverClassicDriver.php | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php
index 31357bd..5fdb7ca 100644
--- a/src/WebdriverClassicDriver.php
+++ b/src/WebdriverClassicDriver.php
@@ -78,7 +78,7 @@ class WebdriverClassicDriver extends CoreDriver
 
     private string $webDriverHost;
 
-    private ?string $initialWindowName = null;
+    private ?string $initialWindowHandle = null;
 
     /**
      * @param string $browserName One of 'edge', 'firefox', 'chrome' or any one of {@see WebDriverBrowserType} constants.
@@ -104,7 +104,7 @@ public function start(): void
         try {
             $this->webDriver = RemoteWebDriver::create($this->webDriverHost, $this->desiredCapabilities);
             $this->applyTimeouts();
-            $this->initialWindowName = $this->getWindowName();
+            $this->initialWindowHandle = $this->webDriver->getWindowHandle();
         } catch (\Throwable $e) {
             throw new DriverException("Could not start driver: {$e->getMessage()}", 0, $e);
         }
@@ -138,17 +138,18 @@ public function reset(): void
     {
         $webDriver = $this->getWebDriver();
 
-        // switch to default window..
-        $initialWindow = substr((string)$this->initialWindowName, strlen(self::W3C_WINDOW_HANDLE_PREFIX));
-        $webDriver->switchTo()->window($initialWindow);
+        // Switch to default window.
+        $this->switchToWindow();
 
-        // ..and close all other windows
-        foreach ($webDriver->getWindowHandles() as $tempWindow) {
-            if ($tempWindow !== $initialWindow) {
-                $webDriver->switchTo()->window($tempWindow);
-                $webDriver->close();
-                $webDriver->switchTo()->window($initialWindow);
+        // Close all windows except the initial one.
+        foreach ($webDriver->getWindowHandles() as $windowHandle) {
+            if ($windowHandle === $this->initialWindowHandle) {
+                continue;
             }
+
+            $webDriver->switchTo()->window($windowHandle);
+            $webDriver->close();
+            $this->switchToWindow();
         }
 
         $webDriver->manage()->deleteAllCookies();
@@ -181,13 +182,9 @@ public function back(): void
 
     public function switchToWindow(?string $name = null): void
     {
-        if ($name === null) {
-            $name = $this->initialWindowName;
-        }
-
-        if (is_string($name)) {
-            $name = $this->getWindowHandleFromName($name);
-        }
+        $name = $name === null
+            ? $this->initialWindowHandle
+            : $this->getWindowHandleFromName($name);
 
         $this->getWebDriver()->switchTo()->window((string)$name);
     }