Clicks that open new windows will only switch if not blank

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -328,7 +328,7 @@ def click(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if settings.WAIT_FOR_RSC_ON_CLICKS:
             self.wait_for_ready_state_complete()
         if self.demo_mode:
@@ -1038,7 +1038,7 @@ def click_link_text(self, link_text, timeout=None):
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if settings.WAIT_FOR_RSC_ON_CLICKS:
             self.wait_for_ready_state_complete()
         if self.demo_mode:
@@ -1170,7 +1170,7 @@ def click_partial_link_text(self, partial_link_text, timeout=None):
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if settings.WAIT_FOR_RSC_ON_CLICKS:
             self.wait_for_ready_state_complete()
         if self.demo_mode:
@@ -1517,7 +1517,7 @@ def click_visible_elements(
                             )
                         )
                     ):
-                        self.switch_to_newest_window()
+                        self.__switch_to_newest_window_if_not_blank()
                     return  # Probably on new page / Elements are all stale
         latest_window_count = len(self.driver.window_handles)
         if (
@@ -1530,7 +1530,7 @@ def click_visible_elements(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
 
     def click_nth_visible_element(
         self, selector, number, by=By.CSS_SELECTOR, timeout=None
@@ -1587,7 +1587,7 @@ def click_nth_visible_element(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
 
     def click_if_visible(self, selector, by=By.CSS_SELECTOR):
         """If the page selector exists and is visible, clicks on the element.
@@ -1613,7 +1613,7 @@ def click_active_element(self):
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if settings.WAIT_FOR_RSC_ON_CLICKS:
             self.wait_for_ready_state_complete()
         if self.demo_mode:
@@ -1892,7 +1892,7 @@ def hover_and_click(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()
@@ -1972,7 +1972,7 @@ def hover_and_double_click(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if self.demo_mode:
             if self.driver.current_url != pre_action_url:
                 self.__demo_mode_pause_if_active()
@@ -2114,7 +2114,7 @@ def __select_option(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         if settings.WAIT_FOR_RSC_ON_CLICKS:
             self.wait_for_ready_state_complete()
         if self.demo_mode:
@@ -2603,6 +2603,15 @@ def switch_to_window(self, window, timeout=None):
     def switch_to_default_window(self):
         self.switch_to_window(0)
 
+    def __switch_to_newest_window_if_not_blank(self):
+        current_window = self.driver.current_window_handle
+        try:
+            self.switch_to_window(len(self.driver.window_handles) - 1)
+            if self.get_current_url() == "about:blank":
+                self.switch_to_window(current_window)
+        except Exception:
+            self.switch_to_window(current_window)
+
     def switch_to_newest_window(self):
         self.switch_to_window(len(self.driver.window_handles) - 1)
 
@@ -4042,7 +4051,7 @@ def js_click(
                 )
             )
         ):
-            self.switch_to_newest_window()
+            self.__switch_to_newest_window_if_not_blank()
         self.wait_for_ready_state_complete()
         self.__demo_mode_pause_if_active()