Micro-optimization of the window closing inside the shared session strategy

aik099 · aik099 · commit 21a79f7bdfad · 2024-04-10T11:06:56.000+03:00
diff --git a/library/aik099/PHPUnit/Session/SharedSessionStrategy.php b/library/aik099/PHPUnit/Session/SharedSessionStrategy.php
@@ -98,7 +98,7 @@ protected function stopAndForgetSession()
 	 */
 	private function _switchToMainWindow()
 	{
-		$this->_session->switchToWindow();
+		$this->_session->switchToWindow(); // Switch to the window before attempting to execute any window-based calls.
 		$actual_initial_window_name = $this->_session->getWindowName(); // Account for initial window rename.
 
 		foreach ( $this->_session->getWindowNames() as $name ) {
@@ -108,8 +108,9 @@ private function _switchToMainWindow()
 
 			$this->_session->switchToWindow($name);
 			$this->_session->executeScript('window.close();');
-			$this->_session->switchToWindow();
 		}
+
+		$this->_session->switchToWindow();
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ protected function stopAndForgetSession()`
`98`	`98`	`*/`
`99`	`99`	`private function _switchToMainWindow()`
`100`	`100`	`{`
`101`		`- $this->_session->switchToWindow();`
	`101`	`+ $this->_session->switchToWindow(); // Switch to the window before attempting to execute any window-based calls.`
`102`	`102`	`$actual_initial_window_name = $this->_session->getWindowName(); // Account for initial window rename.`
`103`	`103`
`104`	`104`	`foreach ( $this->_session->getWindowNames() as $name ) {`
`@@ -108,8 +108,9 @@ private function _switchToMainWindow()`
`108`	`108`
`109`	`109`	`$this->_session->switchToWindow($name);`
`110`	`110`	`$this->_session->executeScript('window.close();');`
`111`		`- $this->_session->switchToWindow();`
`112`	`111`	`}`
	`112`	`+`
	`113`	`+ $this->_session->switchToWindow();`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`/**`