More Chromium updates

Author: mdmintz

seleniumbase/core/browser_launcher.py

@@ -551,6 +551,19 @@ def uc_open_with_tab(driver, url):
 
 def uc_open_with_reconnect(driver, url, reconnect_time=None):
     """Open a url, disconnect chromedriver, wait, and reconnect."""
+    if (
+        hasattr(sb_config, "_cdp_browser")
+        and sb_config._cdp_browser in ["comet", "opera", "atlas"]
+    ):
+        if not __is_cdp_swap_needed(driver):
+            if not driver.current_url.startswith(
+                ("about", "data", "chrome")
+            ):
+                driver.get("about:blank")
+            uc_activate_cdp_mode(driver, url)
+        else:
+            driver.cdp.open(url)
+        return
     url = shared_utils.fix_url_as_needed(url)
     if __is_cdp_swap_needed(driver):
         driver.cdp.get(url)
@@ -2979,12 +2992,16 @@ def get_driver(
         driver_dir = DRIVER_DIR_CHS
     if _special_binary_exists(binary_location, "opera"):
         driver_dir = DRIVER_DIR_OPERA
+        sb_config._cdp_browser = "opera"
     if _special_binary_exists(binary_location, "brave"):
         driver_dir = DRIVER_DIR_BRAVE
+        sb_config._cdp_browser = "brave"
     if _special_binary_exists(binary_location, "comet"):
         driver_dir = DRIVER_DIR_COMET
+        sb_config._cdp_browser = "comet"
     if _special_binary_exists(binary_location, "atlas"):
         driver_dir = DRIVER_DIR_ATLAS
+        sb_config._cdp_browser = "atlas"
     if (
         hasattr(sb_config, "settings")
         and hasattr(sb_config.settings, "NEW_DRIVER_DIR")
@@ -2997,6 +3014,8 @@ def get_driver(
             browser_name = browser
         else:
             browser_name = "chrome"  # The default if not specified
+    if browser_name in constants.ChromiumSubs.chromium_subs:
+        browser_name = "chrome"
     browser_name = browser_name.lower()
     if headless2 and browser_name == constants.Browser.FIREFOX:
         headless2 = False  # Only for Chromium

seleniumbase/core/detect_b_ver.py

@@ -278,6 +278,7 @@ def opera_on_windows_path(browser_type=None):
         ),
     ):
         for subitem in (
+            "Programs/Opera",
             "Opera",
             "Opera/Application",
         ):
@@ -336,6 +337,7 @@ def comet_on_windows_path(browser_type=None):
     ):
         for subitem in (
             "Comet/Application",
+            "Programs/Comet",
         ):
             try:
                 candidates.append(os.sep.join((item, subitem, "Comet.exe")))
@@ -364,6 +366,7 @@ def atlas_on_windows_path(browser_type=None):
     ):
         for subitem in (
             "Atlas/Application",
+            "Programs/Atlas",
         ):
             try:
                 candidates.append(os.sep.join((item, subitem, "Atlas.exe")))

seleniumbase/fixtures/base_case.py

@@ -4354,7 +4354,7 @@ def get_new_driver(
                 elif self.browser == "firefox":
                     try:
                         if self.maximize_option:
-                            self.driver.maximize_window()
+                            self.maximize_window()
                             self.wait_for_ready_state_complete()
                         else:
                             with suppress(Exception):
@@ -4364,7 +4364,7 @@ def get_new_driver(
                 elif self.browser == "safari":
                     if self.maximize_option:
                         try:
-                            self.driver.maximize_window()
+                            self.maximize_window()
                             self.wait_for_ready_state_complete()
                         except Exception:
                             pass  # Keep existing browser resolution
@@ -11408,7 +11408,13 @@ def __get_new_timeout(self, timeout):
 
     def __is_cdp_swap_needed(self):
         """If the driver is disconnected, use a CDP method when available."""
-        return shared_utils.is_cdp_swap_needed(self.driver)
+        cdp_swap_needed = shared_utils.is_cdp_swap_needed(self.driver)
+        if cdp_swap_needed:
+            if not self.cdp:
+                self.cdp = self.driver.cdp
+            return True
+        else:
+            return False
 
     ############
 
@@ -14001,7 +14007,7 @@ def __click_with_offset(
             )
             raise Exception(message)
         except InvalidArgumentException:
-            if not self.browser == "chrome":
+            if not self.is_chromium():
                 raise
             chrome_version = self.driver.capabilities["browserVersion"]
             major_chrome_version = chrome_version.split(".")[0]
@@ -14616,7 +14622,7 @@ def __get_shadow_element(
                 try:
                     shadow_root = element.shadow_root
                 except Exception:
-                    if self.browser == "chrome":
+                    if self.is_chromium():
                         chrome_dict = self.driver.capabilities["chrome"]
                         chrome_dr_version = chrome_dict["chromedriverVersion"]
                         chromedriver_version = chrome_dr_version.split(" ")[0]

seleniumbase/plugins/driver_manager.py

@@ -455,8 +455,6 @@ def Driver(
         )
     if sb_config._browser_shortcut:
         browser = sb_config._browser_shortcut
-    if browser in constants.ChromiumSubs.chromium_subs:
-        browser = "chrome"  # Still uses chromedriver
     if headless is None:
         if "--headless" in sys_argv:
             headless = True
@@ -953,6 +951,10 @@ def Driver(
                     driver_version = None
                 break
             count += 1
+    if browser in constants.ChromiumSubs.chromium_subs:
+        if not binary_location:
+            browser = "chrome"  # Still uses chromedriver
+            sb_config._browser_shortcut = browser
     browser_name = browser
 
     # Launch a web browser

seleniumbase/plugins/pytest_plugin.py

@@ -1676,8 +1676,23 @@ def pytest_configure(config):
     sb_config.browser = config.getoption("browser")
     if sb_config._browser_shortcut:
         sb_config.browser = sb_config._browser_shortcut
-    if sb_config.browser in constants.ChromiumSubs.chromium_subs:
-        sb_config.browser = "chrome"  # Still uses chromedriver
+    elif sys_argv == ["-c"]:  # Multithreading messes with args
+        if config.getoption("use_opera"):
+            bin_loc = detect_b_ver.get_binary_location("opera")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.browser = "opera"
+        elif config.getoption("use_brave"):
+            bin_loc = detect_b_ver.get_binary_location("brave")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.browser = "brave"
+        elif config.getoption("use_comet"):
+            bin_loc = detect_b_ver.get_binary_location("comet")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.browser = "comet"
+        elif config.getoption("use_atlas"):
+            bin_loc = detect_b_ver.get_binary_location("atlas")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.browser = "atlas"
     sb_config.account = config.getoption("account")
     sb_config.data = config.getoption("data")
     sb_config.var1 = config.getoption("var1")
@@ -1714,6 +1729,35 @@ def pytest_configure(config):
     sb_config.binary_location = config.getoption("binary_location")
     if hasattr(sb_config, "_cdp_bin_loc") and sb_config._cdp_bin_loc:
         sb_config.binary_location = sb_config._cdp_bin_loc
+    elif not sb_config.binary_location:
+        if (
+            config.getoption("use_opera")
+            or sb_config._browser_shortcut == "opera"
+        ):
+            bin_loc = detect_b_ver.get_binary_location("opera")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.binary_location = bin_loc
+        elif (
+            config.getoption("use_brave")
+            or sb_config._browser_shortcut == "brave"
+        ):
+            bin_loc = detect_b_ver.get_binary_location("brave")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.binary_location = bin_loc
+        elif (
+            config.getoption("use_comet")
+            or sb_config._browser_shortcut == "comet"
+        ):
+            bin_loc = detect_b_ver.get_binary_location("comet")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.binary_location = bin_loc
+        elif (
+            config.getoption("use_atlas")
+            or sb_config._browser_shortcut == "atlas"
+        ):
+            bin_loc = detect_b_ver.get_binary_location("atlas")
+            if bin_loc and os.path.exists(bin_loc):
+                sb_config.binary_location = bin_loc
     if config.getoption("use_cft") and not sb_config.binary_location:
         sb_config.binary_location = "cft"
     elif config.getoption("use_chs") and not sb_config.binary_location:
@@ -1726,6 +1770,10 @@ def pytest_configure(config):
         sb_config.headless = True
         sb_config.headless1 = False
         sb_config.headless2 = False
+    if sb_config.browser in constants.ChromiumSubs.chromium_subs:
+        if not sb_config.binary_location:
+            sb_config.browser = "chrome"  # Still uses chromedriver
+            sb_config._browser_shortcut = sb_config.browser
     sb_config.driver_version = config.getoption("driver_version")
     sb_config.page_load_strategy = config.getoption("page_load_strategy")
     sb_config.with_testing_base = config.getoption("with_testing_base")

seleniumbase/plugins/sb_manager.py

@@ -1132,8 +1132,6 @@ def SB(
     sb_config.browser = browser
     if sb_config._browser_shortcut:
         sb_config.browser = sb_config._browser_shortcut
-    if sb_config.browser in constants.ChromiumSubs.chromium_subs:
-        sb_config.browser = "chrome"  # Still uses chromedriver
     if not hasattr(sb_config, "is_behave"):
         sb_config.is_behave = False
     if not hasattr(sb_config, "is_pytest"):
@@ -1242,6 +1240,10 @@ def SB(
     sb_config.interval = interval
     sb_config.cap_file = cap_file
     sb_config.cap_string = cap_string
+    if sb_config.browser in constants.ChromiumSubs.chromium_subs:
+        if not sb_config.binary_location:
+            sb_config.browser = "chrome"  # Still uses chromedriver
+            sb_config._browser_shortcut = sb_config.browser
 
     sb = BaseCase()
     sb.with_testing_base = sb_config.with_testing_base

seleniumbase/plugins/selenium_plugin.py

@@ -1302,8 +1302,6 @@ def beforeTest(self, test):
         if sb_config._browser_shortcut:
             self.options.browser = sb_config._browser_shortcut
             test.test.browser = sb_config._browser_shortcut
-        if test.test.browser in constants.ChromiumSubs.chromium_subs:
-            test.test.browser = "chrome"  # Still uses chromedriver
         test.test.cap_file = self.options.cap_file
         test.test.cap_string = self.options.cap_string
         test.test.headless = self.options.headless
@@ -1355,6 +1353,10 @@ def beforeTest(self, test):
             test.test.headless = True
             test.test.headless1 = False
             test.test.headless2 = False
+        if test.test.browser in constants.ChromiumSubs.chromium_subs:
+            if not sb_config.binary_location:
+                test.test.browser = "chrome"  # Still uses chromedriver
+                sb_config._browser_shortcut = test.test.browser
         test.test.driver_version = self.options.driver_version
         test.test.page_load_strategy = self.options.page_load_strategy
         test.test.chromium_arg = self.options.chromium_arg