Harden window closing code upon session reset

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->getWebDriver()->getWindowHandle();
         } catch (\Throwable $e) {
             throw new DriverException("Could not start driver: {$e->getMessage()}", 0, $e);
         }
@@ -136,16 +136,23 @@ public function stop(): void
      */
     public function reset(): void
     {
-        // switch to default window..
+        $webDriver = $this->getWebDriver();
+
+        // Switch to default window.
         $this->switchToWindow();
-        // ..and close all other windows
-        foreach ($this->getWindowNames() as $name) {
-            if ($name !== $this->initialWindowName) {
-                $this->withWindow($name, fn() => $this->getWebDriver()->close());
+
+        // 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();
         }
 
-        $this->getWebDriver()->manage()->deleteAllCookies();
+        $webDriver->manage()->deleteAllCookies();
     }
 
     public function visit(string $url): void
@@ -175,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);
     }

tests/Custom/SessionResetTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Mink\WebdriverClassDriver\Tests\Custom;
+
+use Behat\Mink\Tests\Driver\TestCase;
+
+class SessionResetTest extends TestCase
+{
+    /**
+     * @dataProvider initialWindowNameDataProvider
+     */
+    public function testSessionResetClosesWindows(?string $initialWindowName): void
+    {
+        $session = $this->getSession();
+        $session->visit($this->pathTo('/window.html'));
+
+        if (null !== $initialWindowName) {
+            $session->executeScript('window.name = "'.$initialWindowName.'";');
+        }
+
+        $page = $session->getPage();
+
+        $page->clickLink('Popup #1');
+        $page->clickLink('Popup #2');
+
+        $expectedInitialWindowName = $session->evaluateScript('window.name');
+
+        $windowNames = $session->getWindowNames();
+        $this->assertCount(3, $windowNames);
+
+        $session->reset();
+
+        $windowNames = $session->getWindowNames();
+        $this->assertCount(1, $windowNames);
+
+        $actualInitialWindowName = $session->evaluateScript('window.name');
+        $this->assertEquals($expectedInitialWindowName, $actualInitialWindowName);
+    }
+
+    public static function initialWindowNameDataProvider(): array
+    {
+        return array(
+            'no name' => array(null),
+            'non-empty name' => array('initial-window'),
+        );
+    }
+
+    /**
+     * @after
+     */
+    protected function resetSessions()
+    {
+        $session = $this->getSession();
+
+        // Stop the session instead of resetting, because resetting behavior is being tested.
+        if ($session->isStarted()) {
+            $session->stop();
+        }
+
+        parent::resetSessions();
+    }
+}