Merge pull request #1506 from seleniumbase/a-few-optimizations

A few optimizations (for new tabs and undetected-chromedriver mode)

Author: mdmintz

examples/hack_the_planet.py

@@ -365,6 +365,7 @@ def test_all_your_base_are_belong_to_us(self):
         self.highlight("h1", loops=6, scroll=False)
 
         self.open("https://status.iboss.com/ibcloud/app/cloudStatus.html")
+        self.wait_for_element_clickable('div[translate*="cloudStatus"]')
         self.set_text_content('div[translate*="cloudStatus"]', ayb)
         self.set_text_content('div[translate*="maintenance"]', "ARE")
         self.set_text_content('div[translate*="advisory"]', "BELONG")

examples/wordle_archive_test.py

@@ -54,6 +54,10 @@ def skip_if_incorrect_env(self):
             message = "This test doesn't run in headless mode!"
             print(message)
             self.skip(message)
+        if not self.is_chromium():
+            message = "This test requires a Chromium-based browser!"
+            print(message)
+            self.skip(message)
         if version_info < [2, 4, 4]:
             message = "This test requires SeleniumBase 2.4.4 or newer!"
             print(message)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.3.6"
+__version__ = "4.3.7"

seleniumbase/core/browser_launcher.py

@@ -610,7 +610,14 @@ def _set_chrome_options(
     chrome_options.add_argument("--dns-prefetch-disable")
     chrome_options.add_argument("--disable-translate")
     chrome_options.add_argument("--disable-3d-apis")
-    if is_using_uc(undetectable, browser_name):
+    if (
+        is_using_uc(undetectable, browser_name)
+        and (
+            not headless
+            or "linux" in PLATFORM  # switches to Xvfb (non-headless)
+        )
+    ):
+        # Skip remaining options that trigger anti-bot services
         return chrome_options
     chrome_options.add_argument("--test-type")
     chrome_options.add_argument("--log-level=3")
@@ -2428,6 +2435,7 @@ def get_local_driver(
                                             uc_path = os.path.realpath(uc_path)
                                         driver = undetected.Chrome(
                                             options=chrome_options,
+                                            user_data_dir=user_data_dir,
                                             driver_executable_path=uc_path,
                                             headless=False,  # Xvfb needed!
                                             version_main=uc_chrome_version,
@@ -2444,6 +2452,7 @@ def get_local_driver(
                                             )
                                             driver = undetected.Chrome(
                                                 options=chrome_options,
+                                                user_data_dir=user_data_dir,
                                                 driver_executable_path=uc_path,
                                                 headless=False,  # Xvfb needed!
                                                 version_main=uc_chrome_version,

seleniumbase/fixtures/base_case.py

@@ -3103,9 +3103,14 @@ def set_content_to_parent_frame(self):
     def open_new_window(self, switch_to=True):
         """Opens a new browser tab/window and switches to it by default."""
         self.wait_for_ready_state_complete()
-        self.driver.execute_script("window.open('');")
+        if selenium4_or_newer and switch_to:
+            self.driver.switch_to.new_window("tab")
+        else:
+            self.driver.execute_script("window.open('');")
         time.sleep(0.01)
-        if switch_to:
+        if self.browser == "safari":
+            self.wait_for_ready_state_complete()
+        if switch_to and not selenium4_or_newer:
             self.switch_to_newest_window()
             time.sleep(0.01)
             if self.browser == "safari":

seleniumbase/fixtures/page_actions.py

@@ -1296,6 +1296,16 @@ def switch_to_window(driver, window, timeout=settings.SMALL_TIMEOUT):
     start_ms = time.time() * 1000.0
     stop_ms = start_ms + (timeout * 1000.0)
     if isinstance(window, int):
+        caps = driver.capabilities
+        if (
+            caps["browserName"].lower() == "safari"
+            and "safari:platformVersion" in caps
+            and caps["safari:platformVersion"].split(".") < ["10", "15"]
+        ):
+            # Fix reversed window_handles on Safari 10.14 or lower
+            window = len(driver.window_handles) - 1 - window
+            if window < 0:
+                window = 0
         for x in range(int(timeout * 10)):
             shared_utils.check_if_time_limit_exceeded()
             try:

seleniumbase/undetected/__init__.py

@@ -148,7 +148,7 @@ def __init__(
         options.add_argument("--remote-debugging-host=%s" % debug_host)
         options.add_argument("--remote-debugging-port=%s" % debug_port)
         if user_data_dir:
-            options.add_argument('--user-data-dir=%s' % user_data_dir)
+            options.add_argument("--user-data-dir=%s" % user_data_dir)
         language, keep_user_data_dir = None, bool(user_data_dir)
         # See if a custom user profile is specified in options
         for arg in options.arguments: