Add support for more Chromium browsers

Author: mdmintz

README.md

@@ -652,6 +652,10 @@ pytest test_coffee_cart.py --trace
 --edge  # (Shortcut for "--browser=edge".)
 --firefox  # (Shortcut for "--browser=firefox".)
 --safari  # (Shortcut for "--browser=safari".)
+--opera  # (Shortcut for "--browser=opera".)
+--brave  # (Shortcut for "--browser=brave".)
+--comet  # (Shortcut for "--browser=comet".)
+--atlas  # (Shortcut for "--browser=atlas".)
 --settings-file=FILE  # (Override default SeleniumBase settings.)
 --env=ENV  # (Set the test env. Access with "self.env" in tests.)
 --account=STR  # (Set account. Access with "self.account" in tests.)

pyproject.toml

@@ -43,6 +43,10 @@ packages = [
     "seleniumbase.drivers",
     "seleniumbase.drivers.cft_drivers",
     "seleniumbase.drivers.chs_drivers",
+    "seleniumbase.drivers.opera_drivers",
+    "seleniumbase.drivers.brave_drivers",
+    "seleniumbase.drivers.comet_drivers",
+    "seleniumbase.drivers.atlas_drivers",
     "seleniumbase.extensions",
     "seleniumbase.fixtures",
     "seleniumbase.js_code",

seleniumbase/core/browser_launcher.py

@@ -28,6 +28,10 @@
 from seleniumbase import drivers  # webdriver storage folder for SeleniumBase
 from seleniumbase.drivers import cft_drivers  # chrome-for-testing
 from seleniumbase.drivers import chs_drivers  # chrome-headless-shell
+from seleniumbase.drivers import opera_drivers  # still uses chromedriver
+from seleniumbase.drivers import brave_drivers  # still uses chromedriver
+from seleniumbase.drivers import comet_drivers  # still uses chromedriver
+from seleniumbase.drivers import atlas_drivers  # still uses chromedriver
 from seleniumbase import extensions  # browser extensions storage folder
 from seleniumbase.config import settings
 from seleniumbase.core import detect_b_ver
@@ -44,6 +48,10 @@
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 DRIVER_DIR_CFT = os.path.dirname(os.path.realpath(cft_drivers.__file__))
 DRIVER_DIR_CHS = os.path.dirname(os.path.realpath(chs_drivers.__file__))
+DRIVER_DIR_OPERA = os.path.dirname(os.path.realpath(opera_drivers.__file__))
+DRIVER_DIR_BRAVE = os.path.dirname(os.path.realpath(brave_drivers.__file__))
+DRIVER_DIR_COMET = os.path.dirname(os.path.realpath(comet_drivers.__file__))
+DRIVER_DIR_ATLAS = os.path.dirname(os.path.realpath(atlas_drivers.__file__))
 # Make sure that the SeleniumBase DRIVER_DIR is at the top of the System PATH
 # (Changes to the System PATH with os.environ only last during the test run)
 if not os.environ["PATH"].startswith(DRIVER_DIR):
@@ -1218,8 +1226,8 @@ def uc_gui_click_x_y(driver, x, y, timeframe=0.25):
             driver.cdp.minimize()
             driver.cdp.set_window_rect(win_x, win_y, width, height)
         if IS_WINDOWS:
-            x = x * width_ratio
-            y = y * width_ratio
+            x = x * (width_ratio + 0.03)
+            y = y * (width_ratio - 0.03)
             _uc_gui_click_x_y(driver, x, y, timeframe=timeframe, uc_lock=False)
             return
         with suppress(Exception):
@@ -1260,7 +1268,7 @@ def _uc_gui_click_captcha(
     ctype=None,
 ):
     cdp_mode_on_at_start = __is_cdp_swap_needed(driver)
-    if cdp_mode_on_at_start and (not ctype or ctype == "cf_t"):
+    if cdp_mode_on_at_start:
         return driver.cdp.gui_click_captcha()
     _on_a_captcha_page = None
     if ctype == "cf_t":
@@ -1952,6 +1960,15 @@ def get_valid_binary_names_for_browser(browser):
         raise Exception("Invalid combination for OS browser binaries!")
 
 
+def _special_binary_exists(location, name):
+    filename = str(location).split("/")[-1].split("\\")[-1]
+    return (
+        location
+        and str(name).lower() in filename.lower()
+        and os.path.exists(location)
+    )
+
+
 def _repair_chromedriver(chrome_options, headless_options, mcv=None):
     if mcv:
         subprocess.check_call(
@@ -2960,6 +2977,14 @@ def get_driver(
         and sb_config.binary_location == "chs"
     ):
         driver_dir = DRIVER_DIR_CHS
+    if _special_binary_exists(binary_location, "opera"):
+        driver_dir = DRIVER_DIR_OPERA
+    if _special_binary_exists(binary_location, "brave"):
+        driver_dir = DRIVER_DIR_BRAVE
+    if _special_binary_exists(binary_location, "comet"):
+        driver_dir = DRIVER_DIR_COMET
+    if _special_binary_exists(binary_location, "atlas"):
+        driver_dir = DRIVER_DIR_ATLAS
     if (
         hasattr(sb_config, "settings")
         and hasattr(sb_config.settings, "NEW_DRIVER_DIR")
@@ -3919,6 +3944,18 @@ def get_local_driver(
     ):
         special_chrome = True
         driver_dir = DRIVER_DIR_CHS
+    if _special_binary_exists(binary_location, "opera"):
+        special_chrome = True
+        driver_dir = DRIVER_DIR_OPERA
+    if _special_binary_exists(binary_location, "brave"):
+        special_chrome = True
+        driver_dir = DRIVER_DIR_BRAVE
+    if _special_binary_exists(binary_location, "comet"):
+        special_chrome = True
+        driver_dir = DRIVER_DIR_COMET
+    if _special_binary_exists(binary_location, "atlas"):
+        special_chrome = True
+        driver_dir = DRIVER_DIR_ATLAS
     if (
         hasattr(sb_config, "settings")
         and hasattr(sb_config.settings, "NEW_DRIVER_DIR")
@@ -4756,6 +4793,27 @@ def get_local_driver(
         )
         return extend_driver(driver)
     elif browser_name == constants.Browser.GOOGLE_CHROME:
+        set_chromium = None
+        if _special_binary_exists(binary_location, "opera"):
+            set_chromium = "opera"
+            local_chromedriver = DRIVER_DIR_OPERA + "/chromedriver"
+            if IS_WINDOWS:
+                local_chromedriver = DRIVER_DIR_OPERA + "/chromedriver.exe"
+        if _special_binary_exists(binary_location, "brave"):
+            set_chromium = "brave"
+            local_chromedriver = DRIVER_DIR_BRAVE + "/chromedriver"
+            if IS_WINDOWS:
+                local_chromedriver = DRIVER_DIR_BRAVE + "/chromedriver.exe"
+        if _special_binary_exists(binary_location, "comet"):
+            set_chromium = "comet"
+            local_chromedriver = DRIVER_DIR_COMET + "/chromedriver"
+            if IS_WINDOWS:
+                local_chromedriver = DRIVER_DIR_COMET + "/chromedriver.exe"
+        if _special_binary_exists(binary_location, "atlas"):
+            set_chromium = "atlas"
+            local_chromedriver = DRIVER_DIR_ATLAS + "/chromedriver"
+            if IS_WINDOWS:
+                local_chromedriver = DRIVER_DIR_ATLAS + "/chromedriver.exe"
         try:
             chrome_options = _set_chrome_options(
                 browser_name,
@@ -4877,6 +4935,12 @@ def get_local_driver(
                 major_chrome_version = None
             if major_chrome_version:
                 use_version = major_chrome_version
+            if (
+                set_chromium == "opera"
+                and use_version.isnumeric()
+                and int(use_version) < 130
+            ):
+                use_version = "130"  # Special case
             ch_driver_version = None
             path_chromedriver = chromedriver_on_path()
             if os.path.exists(local_chromedriver):
@@ -4894,7 +4958,7 @@ def get_local_driver(
                         ch_driver_version = output
                         if driver_version == "keep":
                             driver_version = ch_driver_version
-            elif path_chromedriver:
+            elif path_chromedriver and not set_chromium:
                 try:
                     make_driver_executable_if_not(path_chromedriver)
                 except Exception as e:

seleniumbase/drivers/atlas_drivers/__init__.py

@@ -387,6 +387,20 @@ class ValidBrowsers:
         "ie",
         "safari",
         "remote",
+        "opera",
+        "brave",
+        "comet",
+        "atlas",
+    ]
+
+
+class ChromiumSubs:
+    # Chromium browsers that still use chromedriver
+    chromium_subs = [
+        "opera",
+        "brave",
+        "comet",
+        "atlas",
     ]
 
 
@@ -430,8 +444,12 @@ class ValidBinaries:
         "Google Chrome Beta",
         "Google Chrome Dev",
         "Brave Browser",
+        "Brave",
+        "Opera Browser",
         "Opera",
+        "Comet Browser",
         "Comet",
+        "Atlas Browser",
         "Atlas",
     ]
     valid_edge_binaries_on_macos = [

seleniumbase/drivers/brave_drivers/__init__.py

@@ -239,6 +239,7 @@ def Driver(
     from seleniumbase import config as sb_config
     from seleniumbase.config import settings
     from seleniumbase.core import browser_launcher
+    from seleniumbase.core import detect_b_ver
     from seleniumbase.fixtures import constants
     from seleniumbase.fixtures import shared_utils
 
@@ -271,10 +272,37 @@ def Driver(
             )
     elif existing_runner:
         sb_config._context_of_runner = True
+    sb_config._browser_shortcut = None
+    sb_config._cdp_browser = None
+    sb_config._cdp_bin_loc = None
     browser_changes = 0
     browser_set = None
     browser_text = None
     browser_list = []
+    # Check if binary-location in options
+    bin_loc_in_options = False
+    if (
+        binary_location
+        and len(str(binary_location)) > 5
+        and os.path.exists(str(binary_location))
+    ):
+        bin_loc_in_options = True
+    else:
+        for arg in sys_argv:
+            if arg in ["--binary-location", "--binary_location", "--bl"]:
+                bin_loc_in_options = True
+    if (
+        browser
+        and browser in constants.ChromiumSubs.chromium_subs
+        and not bin_loc_in_options
+    ):
+        bin_loc = detect_b_ver.get_binary_location(browser)
+        if bin_loc and os.path.exists(bin_loc):
+            if browser in bin_loc.lower().split("/")[-1].split("\\")[-1]:
+                sb_config._cdp_browser = browser
+                sb_config._cdp_bin_loc = bin_loc
+                binary_location = bin_loc
+                bin_loc_in_options = True
     # As a shortcut, you can use "--edge" instead of "--browser=edge", etc,
     # but you can only specify one default browser for tests. (Default: chrome)
     if "--browser=chrome" in sys_argv or "--browser chrome" in sys_argv:
@@ -301,6 +329,46 @@ def Driver(
         browser_changes += 1
         browser_set = "remote"
         browser_list.append("--browser=remote")
+    if "--browser=opera" in sys_argv or "--browser opera" in sys_argv:
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("opera")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_set = "opera"
+                sb_config._browser_shortcut = "opera"
+                sb_config._cdp_browser = "opera"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--browser=opera")
+    if "--browser=brave" in sys_argv or "--browser brave" in sys_argv:
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("brave")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_set = "brave"
+                sb_config._browser_shortcut = "brave"
+                sb_config._cdp_browser = "brave"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--browser=brave")
+    if "--browser=comet" in sys_argv or "--browser comet" in sys_argv:
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("comet")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_set = "comet"
+                sb_config._browser_shortcut = "comet"
+                sb_config._cdp_browser = "comet"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--browser=comet")
+    if "--browser=atlas" in sys_argv or "--browser atlas" in sys_argv:
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("atlas")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_set = "atlas"
+                sb_config._browser_shortcut = "atlas"
+                sb_config._cdp_browser = "atlas"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--browser=atlas")
     browser_text = browser_set
     if "--chrome" in sys_argv and not browser_set == "chrome":
         browser_changes += 1
@@ -322,6 +390,46 @@ def Driver(
         browser_changes += 1
         browser_text = "safari"
         browser_list.append("--safari")
+    if "--opera" in sys_argv and not browser_set == "opera":
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("opera")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_text = "opera"
+                sb_config._browser_shortcut = "opera"
+                sb_config._cdp_browser = "opera"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--opera")
+    if "--brave" in sys_argv and not browser_set == "brave":
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("brave")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_text = "brave"
+                sb_config._browser_shortcut = "brave"
+                sb_config._cdp_browser = "brave"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--brave")
+    if "--comet" in sys_argv and not browser_set == "comet":
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("comet")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_text = "comet"
+                sb_config._browser_shortcut = "comet"
+                sb_config._cdp_browser = "comet"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--comet")
+    if "--atlas" in sys_argv and not browser_set == "atlas":
+        if not bin_loc_in_options:
+            bin_loc = detect_b_ver.get_binary_location("atlas")
+            if os.path.exists(bin_loc):
+                browser_changes += 1
+                browser_text = "atlas"
+                sb_config._browser_shortcut = "atlas"
+                sb_config._cdp_browser = "atlas"
+                sb_config._cdp_bin_loc = bin_loc
+                browser_list.append("--atlas")
     if browser_changes > 1:
         message = "\n\n  TOO MANY browser types were entered!"
         message += "\n  There were %s found:\n  >  %s" % (
@@ -345,6 +453,10 @@ def Driver(
             "Browser: {%s} is not a valid browser option. "
             "Valid options = {%s}" % (browser, valid_browsers)
         )
+    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
@@ -534,6 +646,8 @@ def Driver(
             count += 1
     user_agent = agent
     found_bl = None
+    if hasattr(sb_config, "_cdp_bin_loc") and sb_config._cdp_bin_loc:
+        binary_location = sb_config._cdp_bin_loc
     if binary_location is None and "--binary-location" in arg_join:
         count = 0
         for arg in sys_argv: