seleniumbase 4.33.4__py3-none-any.whl → 4.34.2__py3-none-any.whl

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.33.4"
+__version__ = "4.34.2"

seleniumbase/behave/behave_sb.py

@@ -482,8 +482,8 @@ def get_configured_sb(context):
                 extension_dir = sb.extension_dir  # revert to default
             sb.extension_dir = extension_dir
             continue
-        # Handle: -D binary-location=PATH / binary_location=PATH
-        if low_key in ["binary-location", "binary_location"]:
+        # Handle: -D binary-location=PATH / binary_location=PATH / bl=PATH
+        if low_key in ["binary-location", "binary_location", "bl"]:
             binary_location = userdata[key]
             if binary_location == "true":
                 binary_location = sb.binary_location  # revert to default
@@ -884,6 +884,14 @@ def get_configured_sb(context):
         sb.headless = True  # Firefox has regular headless
     elif sb.browser not in ["chrome", "edge"]:
         sb.headless2 = False  # Only for Chromium browsers
+    if (
+        sb.binary_location
+        and sb.binary_location.lower() == "chs"
+        and sb.browser == "chrome"
+    ):
+        sb.headless = True
+        sb.headless1 = False
+        sb.headless2 = False
     # Recorder Mode only supports Chromium browsers.
     if sb.recorder_ext and (sb.browser not in ["chrome", "edge"]):
         raise Exception(

seleniumbase/console_scripts/run.py

@@ -139,8 +139,8 @@ def show_install_usage():
     print("     OR: seleniumbase get [DRIVER_NAME] [OPTIONS]")
     print("     OR:    sbase install [DRIVER_NAME] [OPTIONS]")
     print("     OR:        sbase get [DRIVER_NAME] [OPTIONS]")
-    print("         (Drivers: chromedriver, geckodriver,")
-    print("                   edgedriver, iedriver, uc_driver)")
+    print("         (Drivers: chromedriver, cft, uc_driver,")
+    print("                   edgedriver, chs, geckodriver)")
     print("  Options:")
     print("     VERSION    Specify the version to download.")
     print("                Tries to detect the needed version.")
@@ -157,11 +157,15 @@ def show_install_usage():
     print("     sbase get chromedriver stable")
     print("     sbase get chromedriver beta")
     print("     sbase get chromedriver -p")
+    print("     sbase get cft 131")
+    print("     sbase get chs")
     print("  Output:")
     print("     Downloads the webdriver to seleniumbase/drivers/")
     print("     (chromedriver is required for Chrome automation)")
     print("     (geckodriver is required for Firefox automation)")
     print("     (edgedriver is required for MS__Edge automation)")
+    print("     (cft is for the `Chrome for Testing` binary exe)")
+    print("     (chs is for the `Chrome-Headless-Shell` binary.)")
     print("")
 
 

seleniumbase/console_scripts/sb_commander.py

@@ -156,9 +156,9 @@ def do_pytest_run(
     if save_screenshots:
         full_run_command += " --screenshot"
 
-    dash_s_needed = False
-    if "-s" not in additional_options.split(" "):
-        dash_s_needed = True
+    capture_needed = False
+    if "--capture" not in additional_options:
+        capture_needed = True
 
     additional_options = additional_options.strip()
     if additional_options:
@@ -168,8 +168,8 @@ def do_pytest_run(
     if verbose:
         full_run_command += " -v"
 
-    if dash_s_needed:
-        full_run_command += " -s"
+    if capture_needed:
+        full_run_command += " --capture=tee-sys"
 
     print(full_run_command)
     subprocess.Popen(full_run_command, shell=True)

seleniumbase/console_scripts/sb_install.py

@@ -3,7 +3,7 @@ Downloads the specified webdriver to "seleniumbase/drivers/"
 
 Usage:
     sbase get {chromedriver|geckodriver|edgedriver|
-               iedriver|uc_driver} [OPTIONS]
+               iedriver|uc_driver|cft|chs} [OPTIONS]
 Options:
     VERSION         Specify the version.
                     Tries to detect the needed version.
@@ -19,6 +19,8 @@ Examples:
     sbase get chromedriver stable
     sbase get chromedriver beta
     sbase get chromedriver -p
+    sbase get cft 131
+    sbase get chs
 Output:
     Downloads the webdriver to seleniumbase/drivers/
     (chromedriver is required for Chrome automation)
@@ -31,6 +33,7 @@ import os
 import platform
 import requests
 import shutil
+import subprocess
 import sys
 import time
 import tarfile
@@ -61,8 +64,8 @@ def invalid_run_command():
     exp += "     OR     sbase install [DRIVER_NAME] [OPTIONS]\n"
     exp += "     OR  seleniumbase get [DRIVER_NAME] [OPTIONS]\n"
     exp += "     OR         sbase get [DRIVER_NAME] [OPTIONS]\n"
-    exp += "         (Drivers: chromedriver, geckodriver,\n"
-    exp += "                   edgedriver, iedriver, uc_driver)\n"
+    exp += "         (Drivers: chromedriver, cft, uc_driver,\n"
+    exp += "                   edgedriver, chs, geckodriver)\n"
     exp += "  Options:\n"
     exp += "     VERSION    Specify the version.\n"
     exp += "                Tries to detect the needed version.\n"
@@ -79,11 +82,15 @@ def invalid_run_command():
     exp += "     sbase get chromedriver stable\n"
     exp += "     sbase get chromedriver beta\n"
     exp += "     sbase get chromedriver -p\n"
+    exp += "     sbase get cft 131\n"
+    exp += "     sbase get chs\n"
     exp += "  Output:\n"
     exp += "     Downloads the webdriver to seleniumbase/drivers/\n"
     exp += "     (chromedriver is required for Chrome automation)\n"
     exp += "     (geckodriver is required for Firefox automation)\n"
     exp += "     (edgedriver is required for MS__Edge automation)\n"
+    exp += "     (cft is for the `Chrome for Testing` binary exe)\n"
+    exp += "     (chs is for the `Chrome-Headless-Shell` binary.)\n"
     print("")
     raise Exception("%s\n\n%s" % (constants.Warnings.INVALID_RUN_COMMAND, exp))
 
@@ -265,6 +272,16 @@ def main(override=None, intel_for_uc=None, force_uc=None):
         elif override.startswith("iedriver "):
             extra = override.split("iedriver ")[1]
             sys.argv = ["seleniumbase", "get", "iedriver", extra]
+        elif override == "cft":
+            sys.argv = ["seleniumbase", "get", "cft"]
+        elif override.startswith("cft "):
+            extra = override.split("cft ")[1]
+            sys.argv = ["seleniumbase", "get", "cft", extra]
+        elif override == "chs":
+            sys.argv = ["seleniumbase", "get", "chs"]
+        elif override.startswith("chs "):
+            extra = override.split("chs ")[1]
+            sys.argv = ["seleniumbase", "get", "chs", extra]
         if found_proxy:
             sys.argv.append(found_proxy)
 
@@ -550,6 +567,134 @@ def main(override=None, intel_for_uc=None, force_uc=None):
             raise Exception("Could not find chromedriver to download!\n")
         if not get_latest:
             pass
+    elif name == "chrome" or name == "cft":
+        set_version = None
+        found_version = None
+        use_version = None
+        major_version = None
+        if num_args >= 4:
+            set_version = sys.argv[3]
+        if (
+            set_version
+            and set_version.split(".")[0].isnumeric()
+            and int(set_version.split(".")[0]) >= 113
+        ):
+            major_version = set_version.split(".")[0]
+        elif (
+            not set_version
+            or set_version.lower() == "latest"
+            or set_version.lower() == "stable"
+        ):
+            found_version = get_latest_stable_chromedriver_version()
+        elif (
+            set_version and (
+                set_version.lower() == "latest-1"
+                or set_version.lower() == "previous"
+            )
+        ):
+            found_version = get_latest_stable_chromedriver_version()
+            major_version = str(int(found_version.split(".")[0]) - 1)
+            found_version = None
+        elif (set_version and set_version.lower() == "beta"):
+            found_version = get_latest_beta_chromedriver_version()
+        elif (set_version and set_version.lower() == "dev"):
+            found_version = get_latest_dev_chromedriver_version()
+        elif (set_version and set_version.lower() == "canary"):
+            found_version = get_latest_canary_chromedriver_version()
+        if found_version and found_version.split(".")[0].isnumeric():
+            major_version = found_version.split(".")[0]
+            use_version = found_version
+        if not use_version:
+            use_version = get_cft_latest_version_from_milestone(major_version)
+        msg = c2 + "Chrome for Testing to download" + cr
+        p_version = c3 + use_version + cr
+        log_d("\n*** %s = %s" % (msg, p_version))
+        if IS_MAC:
+            if IS_ARM_MAC:
+                platform_code = "mac-arm64"
+                file_name = "chrome-mac-arm64.zip"
+            else:
+                platform_code = "mac-x64"
+                file_name = "chrome-mac-x64.zip"
+        elif IS_LINUX:
+            platform_code = "linux64"
+            file_name = "chrome-linux64.zip"
+        elif IS_WINDOWS:
+            if "64" in ARCH:
+                platform_code = "win64"
+                file_name = "chrome-win64.zip"
+            else:
+                platform_code = "win32"
+                file_name = "chrome-win32.zip"
+        plat_arch = file_name.split(".zip")[0]
+        download_url = (
+            "https://storage.googleapis.com/chrome-for-testing-public/"
+            "%s/%s/%s" % (use_version, platform_code, file_name)
+        )
+    elif name == "chrome-headless-shell" or name == "chs":
+        set_version = None
+        found_version = None
+        use_version = None
+        major_version = None
+        if num_args >= 4:
+            set_version = sys.argv[3]
+        if (
+            set_version
+            and set_version.split(".")[0].isnumeric()
+            and int(set_version.split(".")[0]) >= 113
+        ):
+            major_version = set_version.split(".")[0]
+        elif (
+            not set_version
+            or set_version.lower() == "latest"
+            or set_version.lower() == "stable"
+        ):
+            found_version = get_latest_stable_chromedriver_version()
+        elif (
+            set_version and (
+                set_version.lower() == "latest-1"
+                or set_version.lower() == "previous"
+            )
+        ):
+            found_version = get_latest_stable_chromedriver_version()
+            major_version = str(int(found_version.split(".")[0]) - 1)
+            found_version = None
+        elif (set_version and set_version.lower() == "beta"):
+            found_version = get_latest_beta_chromedriver_version()
+        elif (set_version and set_version.lower() == "dev"):
+            found_version = get_latest_dev_chromedriver_version()
+        elif (set_version and set_version.lower() == "canary"):
+            found_version = get_latest_canary_chromedriver_version()
+        if found_version and found_version.split(".")[0].isnumeric():
+            major_version = found_version.split(".")[0]
+            use_version = found_version
+        if not use_version:
+            use_version = get_cft_latest_version_from_milestone(major_version)
+        msg = c2 + "Chrome-Headless-Shell to download" + cr
+        p_version = c3 + use_version + cr
+        log_d("\n*** %s = %s" % (msg, p_version))
+        if IS_MAC:
+            if IS_ARM_MAC:
+                platform_code = "mac-arm64"
+                file_name = "chrome-headless-shell-mac-arm64.zip"
+            else:
+                platform_code = "mac-x64"
+                file_name = "chrome-headless-shell-mac-x64.zip"
+        elif IS_LINUX:
+            platform_code = "linux64"
+            file_name = "chrome-headless-shell-linux64.zip"
+        elif IS_WINDOWS:
+            if "64" in ARCH:
+                platform_code = "win64"
+                file_name = "chrome-headless-shell-win64.zip"
+            else:
+                platform_code = "win32"
+                file_name = "chrome-headless-shell-win32.zip"
+        plat_arch = file_name.split(".zip")[0]
+        download_url = (
+            "https://storage.googleapis.com/chrome-for-testing-public/"
+            "%s/%s/%s" % (use_version, platform_code, file_name)
+        )
     elif name == "geckodriver" or name == "firefoxdriver":
         use_version = DEFAULT_GECKODRIVER_VERSION
         found_geckodriver = False
@@ -1029,10 +1174,14 @@ def main(override=None, intel_for_uc=None, force_uc=None):
             if os.path.exists(os.path.join(downloads_folder, "Driver_Notes/")):
                 # Only works if the directory is empty
                 os.rmdir(os.path.join(downloads_folder, "Driver_Notes/"))
-            pr_driver_path = c3 + driver_path + cr
+            driver_base = os.sep.join(driver_path.split(os.sep)[:-1])
+            driver_file = driver_path.split(os.sep)[-1]
+            pr_driver_base = c3 + driver_base + cr
+            pr_sep = c3 + os.sep + cr
+            pr_driver_file = c3 + driver_file + cr
             log_d(
-                "The file [%s] was saved to:\n%s\n"
-                % (driver_file, pr_driver_path)
+                "The file [%s] was saved to:\n%s%s\n%s\n"
+                % (driver_file, pr_driver_base, pr_sep, pr_driver_file)
             )
             log_d("Making [%s %s] executable ..." % (driver_file, use_version))
             make_executable(driver_path)
@@ -1046,6 +1195,86 @@ def main(override=None, intel_for_uc=None, force_uc=None):
                 make_executable(path_file)
                 log_d("Also copied to: %s%s%s" % (c3, path_file, cr))
             log_d("")
+        elif name == "chrome" or name == "cft":
+            # Zip file is valid. Proceed.
+            driver_path = None
+            driver_file = None
+            base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
+            folder_name = contents[0].split(os.sep)[0]
+            folder_path = os.path.join(base_path, folder_name)
+            if IS_MAC or IS_LINUX:
+                if (
+                    "chrome-" in folder_path
+                    and "drivers" in folder_path
+                    and os.path.exists(folder_path)
+                ):
+                    shutil.rmtree(folder_path)
+                subprocess.run(
+                    ["unzip", zip_file_path, "-d", downloads_folder]
+                )
+            elif IS_WINDOWS:
+                subprocess.run(
+                    [
+                        "powershell",
+                        "Expand-Archive",
+                        "-Path",
+                        zip_file_path,
+                        "-DestinationPath",
+                        downloads_folder,
+                    ]
+                )
+            else:
+                zip_ref.extractall(downloads_folder)
+                zip_ref.close()
+            os.remove(zip_file_path)
+            log_d("%sUnzip Complete!%s\n" % (c2, cr))
+            pr_base_path = c3 + base_path + cr
+            pr_sep = c3 + os.sep + cr
+            pr_folder_name = c3 + folder_name + cr
+            log_d(
+                "Chrome for Testing was saved inside:\n%s%s\n%s\n"
+                % (pr_base_path, pr_sep, pr_folder_name)
+            )
+        elif name == "chrome-headless-shell" or name == "chs":
+            # Zip file is valid. Proceed.
+            driver_path = None
+            driver_file = None
+            base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
+            folder_name = contents[0].split(os.sep)[0]
+            folder_path = os.path.join(base_path, folder_name)
+            if IS_MAC or IS_LINUX:
+                if (
+                    "chrome-headless-shell-" in folder_path
+                    and "drivers" in folder_path
+                    and os.path.exists(folder_path)
+                ):
+                    shutil.rmtree(folder_path)
+                subprocess.run(
+                    ["unzip", zip_file_path, "-d", downloads_folder]
+                )
+            elif IS_WINDOWS:
+                subprocess.run(
+                    [
+                        "powershell",
+                        "Expand-Archive",
+                        "-Path",
+                        zip_file_path,
+                        "-DestinationPath",
+                        downloads_folder,
+                    ]
+                )
+            else:
+                zip_ref.extractall(downloads_folder)
+                zip_ref.close()
+            os.remove(zip_file_path)
+            log_d("%sUnzip Complete!%s\n" % (c2, cr))
+            pr_base_path = c3 + base_path + cr
+            pr_sep = c3 + os.sep + cr
+            pr_folder_name = c3 + folder_name + cr
+            log_d(
+                "Chrome-Headless-Shell was saved inside:\n%s%s\n%s\n"
+                % (pr_base_path, pr_sep, pr_folder_name)
+            )
         elif len(contents) == 0:
             raise Exception("Zip file %s is empty!" % zip_file_path)
         else:

seleniumbase/console_scripts/sb_mkdir.py

@@ -259,6 +259,7 @@ def main():
     data.append("report_archives")
     data.append("archived_reports")
     data.append("html_report.html")
+    data.append("last_report.html")
     data.append("report.html")
     data.append("report.xml")
     data.append("dashboard.html")