Merge pull request #108 from webmaster777/negative-tab-offset-crashes

Negative tab offset crashes

Author: Naktibalda

src/Codeception/Module/WebDriver.php

@@ -3525,7 +3525,11 @@ public function seeNumberOfTabs(int $number): void
      */
     public function closeTab(): void
     {
+        $currentTab = $this->webDriver->getWindowHandle();
         $prevTab = $this->getRelativeTabHandle(-1);
+        if ($prevTab === $currentTab) {
+            throw new ModuleException($this, 'Will not close the last open tab');
+        }
         $this->webDriver->close();
         $this->webDriver->switchTo()->window($prevTab);
     }
@@ -3573,8 +3577,12 @@ protected function getRelativeTabHandle($offset)
 
         $handle = $this->webDriver->getWindowHandle();
         $handles = $this->webDriver->getWindowHandles();
-        $idx = array_search($handle, $handles);
-        return $handles[($idx + $offset) % count($handles)];
+        $currentHandleIdx = array_search($handle, $handles);
+        $newHandleIdx = ($currentHandleIdx + $offset) % count($handles);
+        if ($newHandleIdx < 0) {
+            $newHandleIdx = count($handles) + $newHandleIdx;
+        }
+        return $handles[$newHandleIdx];
     }
 
     /**

tests/web/WebDriverTest.php

@@ -1040,6 +1040,9 @@ public function testBrowserTabs()
         $this->module->switchToNextTab(2);
         $this->module->seeInCurrentUrl('example1');
         $this->module->seeNumberOfTabs(3);
+        $this->module->closeTab();
+        $this->module->seeNumberOfTabs(2);
+        $this->module->closeTab();
     }
 
     public function testPerformOnWithArray()