prevent switching to a tab if the last tab is closed

webmaster777 · webmaster777 · commit 27d47aeb08a2 · 2022-09-08T10:15:13.000+02:00
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -3527,9 +3527,12 @@ public function seeNumberOfTabs(int $number): void
      */
     public function closeTab(): void
     {
+        $currentTab = $this->webDriver->getWindowHandle();
         $prevTab = $this->getRelativeTabHandle(-1);
         $this->webDriver->close();
-        $this->webDriver->switchTo()->window($prevTab);
+        if ($prevTab !== $currentTab) {
+            $this->webDriver->switchTo()->window($prevTab);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3527,9 +3527,12 @@ public function seeNumberOfTabs(int $number): void`
`3527`	`3527`	`*/`
`3528`	`3528`	`public function closeTab(): void`
`3529`	`3529`	`{`
	`3530`	`+ $currentTab = $this->webDriver->getWindowHandle();`
`3530`	`3531`	`$prevTab = $this->getRelativeTabHandle(-1);`
`3531`	`3532`	`$this->webDriver->close();`
`3532`		`- $this->webDriver->switchTo()->window($prevTab);`
	`3533`	`+ if ($prevTab !== $currentTab) {`
	`3534`	`+ $this->webDriver->switchTo()->window($prevTab);`
	`3535`	`+ }`
`3533`	`3536`	`}`
`3534`	`3537`
`3535`	`3538`	`/**`