prevent switching to a tab if the last tab is closed

webmaster777 · Naktibalda · commit 072a0b742ad9 · 2022-09-12T07:59:53.000+03:00
diff --git a/src/Codeception/Module/WebDriver.php b/src/Codeception/Module/WebDriver.php
@@ -3454,9 +3454,12 @@ public function seeNumberOfTabs($number)
      */
     public function closeTab()
     {
+        $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
`@@ -3454,9 +3454,12 @@ public function seeNumberOfTabs($number)`
`3454`	`3454`	`*/`
`3455`	`3455`	`public function closeTab()`
`3456`	`3456`	`{`
	`3457`	`+ $currentTab = $this->webDriver->getWindowHandle();`
`3457`	`3458`	`$prevTab = $this->getRelativeTabHandle(-1);`
`3458`	`3459`	`$this->webDriver->close();`
`3459`		`- $this->webDriver->switchTo()->window($prevTab);`
	`3460`	`+ if ($prevTab !== $currentTab) {`
	`3461`	`+ $this->webDriver->switchTo()->window($prevTab);`
	`3462`	`+ }`
`3460`	`3463`	`}`
`3461`	`3464`
`3462`	`3465`	`/**`