seleniumbase 4.43.1__py3-none-any.whl → 4.43.3__py3-none-any.whl

seleniumbase/plugins/driver_manager.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:

seleniumbase/plugins/page_source.py

@@ -28,7 +28,7 @@ class PageSource(Plugin):
         if not os.path.exists(test_logpath):
             os.makedirs(test_logpath)
         html_file_name = os.path.join(test_logpath, self.logfile_name)
-        html_file = open(html_file_name, "w+", "utf-8")
+        html_file = open(html_file_name, mode="w+", encoding="utf-8")
         rendered_source = log_helper.get_html_source_with_base_href(
             test.driver, page_source
         )
@@ -44,7 +44,7 @@ class PageSource(Plugin):
         if not os.path.exists(test_logpath):
             os.makedirs(test_logpath)
         html_file_name = os.path.join(test_logpath, self.logfile_name)
-        html_file = open(html_file_name, "w+", "utf-8")
+        html_file = open(html_file_name, mode="w+", encoding="utf-8")
         rendered_source = log_helper.get_html_source_with_base_href(
             test.driver, page_source
         )

seleniumbase/plugins/pytest_plugin.py

@@ -7,6 +7,7 @@ import time
 from contextlib import suppress
 from seleniumbase import config as sb_config
 from seleniumbase.config import settings
+from seleniumbase.core import detect_b_ver
 from seleniumbase.core import log_helper
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import shared_utils
@@ -28,6 +29,10 @@ def pytest_addoption(parser):
     --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".)
     --cft  (Shortcut for using `Chrome for Testing`)
     --chs  (Shortcut for using `Chrome-Headless-Shell`)
     --settings-file=FILE  (Override default SeleniumBase settings.)
@@ -186,6 +191,34 @@ def pytest_addoption(parser):
         default=False,
         help="""Shortcut for --browser=safari""",
     )
+    parser.addoption(
+        "--opera",
+        action="store_true",
+        dest="use_opera",
+        default=False,
+        help="""Shortcut for --browser=opera""",
+    )
+    parser.addoption(
+        "--brave",
+        action="store_true",
+        dest="use_brave",
+        default=False,
+        help="""Shortcut for --browser=brave""",
+    )
+    parser.addoption(
+        "--comet",
+        action="store_true",
+        dest="use_comet",
+        default=False,
+        help="""Shortcut for --browser=comet""",
+    )
+    parser.addoption(
+        "--atlas",
+        action="store_true",
+        dest="use_atlas",
+        default=False,
+        help="""Shortcut for --browser=atlas""",
+    )
     parser.addoption(
         "--cft",
         action="store_true",
@@ -1388,8 +1421,14 @@ def pytest_addoption(parser):
 
     arg_join = " ".join(sys_argv)
     sb_config._browser_shortcut = None
+    sb_config._cdp_browser = None
+    sb_config._cdp_bin_loc = None
     sb_config._vd_list = []
-
+    # Check if binary-location in options
+    bin_loc_in_options = False
+    for arg in sys_argv:
+        if arg in ["--binary-location", "--binary_location", "--bl"]:
+            bin_loc_in_options = True
     # SeleniumBase does not support pytest-timeout due to hanging browsers.
     for arg in sys_argv:
         if "--timeout=" in arg:
@@ -1465,6 +1504,46 @@ def pytest_addoption(parser):
         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
@@ -1491,6 +1570,46 @@ def pytest_addoption(parser):
         browser_text = "safari"
         sb_config._browser_shortcut = "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  TOO MANY browser types were entered!"
         message += "\n  There were %s found:\n  >  %s" % (
@@ -1525,7 +1644,7 @@ def pytest_addoption(parser):
         undetectable = True
     if (
         browser_changes == 1
-        and browser_text not in ["chrome"]
+        and browser_text not in ["chrome", "opera", "brave", "comet", "atlas"]
         and undetectable
     ):
         message = (
@@ -1557,6 +1676,8 @@ 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
     sb_config.account = config.getoption("account")
     sb_config.data = config.getoption("data")
     sb_config.var1 = config.getoption("var1")
@@ -1591,6 +1712,8 @@ def pytest_configure(config):
     sb_config.extension_dir = config.getoption("extension_dir")
     sb_config.disable_features = config.getoption("disable_features")
     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
     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:
@@ -1910,24 +2033,24 @@ def _create_dashboard_assets_():
     add_pytest_style_css = True
     if os.path.exists(pytest_style_css):
         existing_pytest_style = None
-        with open(pytest_style_css, "r") as f:
+        with open(pytest_style_css, mode="r") as f:
             existing_pytest_style = f.read()
         if existing_pytest_style == get_pytest_style():
             add_pytest_style_css = False
     if add_pytest_style_css:
-        out_file = open(pytest_style_css, "w+", encoding="utf-8")
+        out_file = open(pytest_style_css, mode="w+", encoding="utf-8")
         out_file.writelines(get_pytest_style())
         out_file.close()
     live_js_file = os.path.join(assets_folder, "live.js")
     add_live_js_file = True
     if os.path.exists(live_js_file):
         existing_live_js = None
-        with open(live_js_file, "r") as f:
+        with open(live_js_file, mode="r") as f:
             existing_live_js = f.read()
         if existing_live_js == live_js:
             add_live_js_file = False
     if add_live_js_file:
-        out_file = open(live_js_file, "w+", encoding="utf-8")
+        out_file = open(live_js_file, mode="w+", encoding="utf-8")
         out_file.writelines(live_js)
         out_file.close()
 
@@ -2228,7 +2351,7 @@ def _perform_pytest_unconfigure_(config):
             and html_report_path
             and os.path.exists(html_report_path)
         ):
-            with open(html_report_path, "r", encoding="utf-8") as f:
+            with open(html_report_path, mode="r", encoding="utf-8") as f:
                 the_html_r = f.read()
             assets_chunk = "if (assets.length === 1) {"
             remove_media = "container.classList.remove('media-container')"
@@ -2274,18 +2397,18 @@ def _perform_pytest_unconfigure_(config):
             the_html_r = (
                 the_html_r[:rc_loc] + new_time + the_html_r[end_rc_loc:]
             )
-            with open(html_report_path, "w", encoding="utf-8") as f:
+            with open(html_report_path, mode="w", encoding="utf-8") as f:
                 f.write(the_html_r)  # Finalize the HTML report
             with suppress(Exception):
                 shared_utils.make_writable(html_report_path)
-            with open(html_report_path_copy, "w", encoding="utf-8") as f:
+            with open(html_report_path_copy, mode="w", encoding="utf-8") as f:
                 f.write(the_html_r)  # Finalize the HTML report copy
             with suppress(Exception):
                 shared_utils.make_writable(html_report_path_copy)
             assets_style = "./assets/style.css"
             if os.path.exists(assets_style):
                 html_style = None
-                with open(assets_style, "r", encoding="utf-8") as f:
+                with open(assets_style, mode="r", encoding="utf-8") as f:
                     html_style = f.read()
                 if html_style:
                     html_style = html_style.replace("top: -50px;", "top: 2px;")
@@ -2297,7 +2420,7 @@ def _perform_pytest_unconfigure_(config):
                     html_style = html_style.replace(".collapsible", ".oldc")
                     html_style = html_style.replace(" (hide details)", "")
                     html_style = html_style.replace(" (show details)", "")
-                with open(assets_style, "w", encoding="utf-8") as f:
+                with open(assets_style, mode="w", encoding="utf-8") as f:
                     f.write(html_style)
                 with suppress(Exception):
                     shared_utils.make_writable(assets_style)
@@ -2332,7 +2455,7 @@ def _perform_pytest_unconfigure_(config):
         # Part 1: Finalizing the dashboard / integrating html report
         if os.path.exists(dashboard_path):
             the_html_d = None
-            with open(dashboard_path, "r", encoding="utf-8") as f:
+            with open(dashboard_path, mode="r", encoding="utf-8") as f:
                 the_html_d = f.read()
             if sb_config._multithreaded and "-c" in sys_argv:
                 # Threads have "-c" in sys.argv, except for the last
@@ -2343,7 +2466,7 @@ def _perform_pytest_unconfigure_(config):
                 if os.path.exists(pie_path):
                     import json
 
-                    with open(pie_path, "r") as f:
+                    with open(pie_path, mode="r") as f:
                         dash_pie = f.read().strip()
                     sb_config._saved_dashboard_pie = json.loads(dash_pie)
             # If the test run doesn't complete by itself, stop refresh
@@ -2374,20 +2497,20 @@ def _perform_pytest_unconfigure_(config):
                 if sb_config._dash_final_summary:
                     the_html_d += sb_config._dash_final_summary
                 time.sleep(0.1)  # Add time for "livejs" to detect changes
-                with open(dashboard_path, "w", encoding="utf-8") as f:
+                with open(dashboard_path, mode="w", encoding="utf-8") as f:
                     f.write(the_html_d)  # Finalize the dashboard
                 time.sleep(0.1)  # Add time for "livejs" to detect changes
                 the_html_d = the_html_d.replace(
                     "</head>", "</head><!-- Dashboard Report Done -->"
                 )
-            with open(dashboard_path, "w", encoding="utf-8") as f:
+            with open(dashboard_path, mode="w", encoding="utf-8") as f:
                 f.write(the_html_d)  # Finalize the dashboard
             with suppress(Exception):
                 shared_utils.make_writable(dashboard_path)
             assets_style = "./assets/style.css"
             if os.path.exists(assets_style):
                 html_style = None
-                with open(assets_style, "r", encoding="utf-8") as f:
+                with open(assets_style, mode="r", encoding="utf-8") as f:
                     html_style = f.read()
                 if html_style:
                     html_style = html_style.replace("top: -50px;", "top: 2px;")
@@ -2399,7 +2522,7 @@ def _perform_pytest_unconfigure_(config):
                     html_style = html_style.replace(".collapsible", ".oldc")
                     html_style = html_style.replace(" (hide details)", "")
                     html_style = html_style.replace(" (show details)", "")
-                with open(assets_style, "w", encoding="utf-8") as f:
+                with open(assets_style, mode="w", encoding="utf-8") as f:
                     f.write(html_style)
                 with suppress(Exception):
                     shared_utils.make_writable(assets_style)
@@ -2421,7 +2544,7 @@ def _perform_pytest_unconfigure_(config):
             ):
                 # Add the dashboard pie to the pytest html report
                 the_html_r = None
-                with open(html_report_path, "r", encoding="utf-8") as f:
+                with open(html_report_path, mode="r", encoding="utf-8") as f:
                     the_html_r = f.read()
                 if sb_config._saved_dashboard_pie:
                     h_r_name = sb_config._html_report_name
@@ -2484,11 +2607,13 @@ def _perform_pytest_unconfigure_(config):
                 the_html_r = (
                     the_html_r[:rc_loc] + new_time + the_html_r[end_rc_loc:]
                 )
-                with open(html_report_path, "w", encoding="utf-8") as f:
+                with open(html_report_path, mode="w", encoding="utf-8") as f:
                     f.write(the_html_r)  # Finalize the HTML report
                 with suppress(Exception):
                     shared_utils.make_writable(html_report_path)
-                with open(html_report_path_copy, "w", encoding="utf-8") as f:
+                with open(
+                    html_report_path_copy, mode="w", encoding="utf-8"
+                ) as f:
                     f.write(the_html_r)  # Finalize the HTML report copy
                 with suppress(Exception):
                     shared_utils.make_writable(html_report_path_copy)
@@ -2533,7 +2658,9 @@ def pytest_unconfigure(config):
                     ):
                         # Dash is HTML Report (Multithreaded)
                         sb_config._dash_is_html_report = True
-                        with open(dashboard_path, "w", encoding="utf-8") as f:
+                        with open(
+                            dashboard_path, mode="w", encoding="utf-8"
+                        ) as f:
                             f.write(sb_config._dash_html)
                     # Dashboard Multithreaded
                     _perform_pytest_unconfigure_(config)