prevent switching to a tab if the last tab is closed

webmaster777 · Naktibalda · commit 9919a2a76654 · 2022-09-12T07:58:29.000+03:00
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -3505,9 +3505,12 @@ public function seeNumberOfTabs($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
`@@ -3505,9 +3505,12 @@ public function seeNumberOfTabs($number): void`
`3505`	`3505`	`*/`
`3506`	`3506`	`public function closeTab(): void`
`3507`	`3507`	`{`
	`3508`	`+ $currentTab = $this->webDriver->getWindowHandle();`
`3508`	`3509`	`$prevTab = $this->getRelativeTabHandle(-1);`
`3509`	`3510`	`$this->webDriver->close();`
`3510`		`- $this->webDriver->switchTo()->window($prevTab);`
	`3511`	`+ if ($prevTab !== $currentTab) {`
	`3512`	`+ $this->webDriver->switchTo()->window($prevTab);`
	`3513`	`+ }`
`3511`	`3514`	`}`
`3512`	`3515`
`3513`	`3516`	`/**`