Merge pull request #1637 from seleniumbase/driver-updates-and-dependencies

Driver Manager updates and dependencies

Author: mdmintz

examples/my_first_test.py

@@ -22,6 +22,7 @@ def test_swag_labs(self):
         self.click("input#continue")
         self.assert_text("CHECKOUT: OVERVIEW")
         self.assert_text("Backpack", "div.cart_item")
+        self.assert_text("29.99", "div.inventory_item_price")
         self.click("button#finish")
         self.assert_exact_text("THANK YOU FOR YOUR ORDER", "h2")
         self.assert_element('img[alt="Pony Express"]')

examples/raw_file_call.py

@@ -0,0 +1,24 @@
+"""Call a file with "python" instead of using "pytest" directly.
+To run, use: "python raw_file_call.py".
+Works by using pytest.main([__file__])."""
+from seleniumbase import BaseCase
+
+if __name__ == "__main__":
+    from pytest import main
+
+    main([__file__])
+
+
+class TinyMceTest(BaseCase):
+    def test_tinymce(self):
+        self.open("https://seleniumbase.io/tinymce/")
+        self.wait_for_element("div.mce-container-body")
+        self.click('span:contains("File")')
+        self.click('span:contains("New document")')
+        self.click('span:contains("Paragraph")')
+        self.click('span:contains("Heading 1")')
+        with self.frame_switch("iframe"):
+            self.add_text("#tinymce", "SeleniumBase!")
+            self.highlight("#tinymce")
+        self.switch_to_default_content()
+        self.post_message("SeleniumBase is the best!")

examples/test_tinymce.py

@@ -14,7 +14,7 @@ def test_tinymce(self):
         self.switch_to_default_content()
         self.click("button i.mce-i-image")
         self.type('input[aria-label="Width"].mce-textbox', "300")
-        image_url = "https://seleniumbase.io/img/sb_logo_10.png"
+        image_url = "https://seleniumbase.github.io/img/sb_logo_10.png"
         self.type("input.mce-textbox", image_url + "\n")
         self.switch_to_frame("iframe")
         self.click("h2")

examples/upload_file_test.py

@@ -1,5 +1,4 @@
-""" Testing the self.choose_file() and self.assert_attribute() methods. """
-
+"""Testing the self.choose_file() and self.assert_attribute() methods."""
 import os
 from seleniumbase import BaseCase
 

requirements.txt

@@ -12,8 +12,9 @@ tomli>=2.0.1;python_version>="3.7"
 tqdm>=4.64.1
 wheel>=0.37.1;python_version<"3.7"
 wheel>=0.38.4;python_version>="3.7"
-attrs>=21.4.0;python_version<"3.6"
-attrs>=22.1.0;python_version>="3.6"
+attrs==21.4.0;python_version<"3.6"
+attrs==22.1.0;python_version>="3.6" and python_version<"3.7"
+attrs>=22.2.0;python_version>="3.7"
 PyYAML>=6.0;python_version>="3.6"
 certifi>=2021.10.8;python_version<"3.6"
 certifi>=2022.12.7;python_version>="3.6"
@@ -121,7 +122,7 @@ rich==12.6.0;python_version>="3.6" and python_version<"4.0"
 
 coverage==5.5;python_version<"3.6"
 coverage==6.2;python_version>="3.6" and python_version<"3.7"
-coverage==6.5.0;python_version>="3.7"
+coverage==7.0.0;python_version>="3.7"
 pytest-cov==2.12.1;python_version<"3.6"
 pytest-cov==4.0.0;python_version>="3.6"
 flake8==3.7.9;python_version<"3.6"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.9.9"
+__version__ = "4.9.10"

seleniumbase/console_scripts/ReadMe.md

@@ -62,16 +62,16 @@ sbase install [DRIVER] [OPTIONS]
 sbase get chromedriver
 sbase get geckodriver
 sbase get edgedriver
-sbase get chromedriver 107
-sbase get chromedriver 107.0.5304.62
+sbase get chromedriver 108
+sbase get chromedriver 108.0.5359.71
 sbase get chromedriver latest
 sbase get chromedriver latest-1  # (Latest minus one)
 sbase get chromedriver -p
 sbase get chromedriver latest -p
 ```
 
 (Drivers:  ``chromedriver``, ``geckodriver``, ``edgedriver``,
-           ``iedriver``, ``operadriver``)
+           ``iedriver``, ``operadriver``, ``uc_driver``)
 
 (Options:  ``latest`` or a specific driver version.
            For chromedriver, you can also specify the major

seleniumbase/console_scripts/run.py

@@ -129,7 +129,7 @@ def show_install_usage():
     print("           OR:    sbase install [DRIVER_NAME] [OPTIONS]")
     print("           OR:        sbase get [DRIVER_NAME] [OPTIONS]")
     print("                 (Drivers: chromedriver, geckodriver, edgedriver")
-    print("                           iedriver, operadriver)")
+    print("                           iedriver, operadriver, uc_driver)")
     print("  Options:")
     print("           VERSION         Specify the version to download.")
     print("                           Tries to detect the needed version.")
@@ -143,8 +143,8 @@ def show_install_usage():
     print("           sbase get chromedriver")
     print("           sbase get geckodriver")
     print("           sbase get edgedriver")
-    print("           sbase get chromedriver 107")
-    print("           sbase get chromedriver 107.0.5304.62")
+    print("           sbase get chromedriver 108")
+    print("           sbase get chromedriver 108.0.5359.71")
     print("           sbase get chromedriver latest")
     print("           sbase get chromedriver latest-1")
     print("           sbase get chromedriver -p")

seleniumbase/console_scripts/sb_install.py

@@ -14,8 +14,8 @@
          sbase get chromedriver
          sbase get geckodriver
          sbase get edgedriver
-         sbase get chromedriver 107
-         sbase get chromedriver 107.0.5304.62
+         sbase get chromedriver 108
+         sbase get chromedriver 108.0.5359.71
          sbase get chromedriver latest
          sbase get chromedriver latest-1  # (Latest minus one)
          sbase get chromedriver -p
@@ -42,11 +42,20 @@
 selenium4_or_newer = False
 if sys.version_info[0] == 3 and sys.version_info[1] >= 7:
     selenium4_or_newer = True
+IS_ARM_MAC = False
+if (
+    sys.platform.endswith("darwin")
+    and (
+        "arm" in platform.processor().lower()
+        or "arm64" in platform.version().lower()
+    )
+):
+    IS_ARM_MAC = True
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 LOCAL_PATH = "/usr/local/bin/"  # On Mac and Linux systems
 DEFAULT_CHROMEDRIVER_VERSION = "72.0.3626.69"  # (If can't find LATEST_STABLE)
 DEFAULT_GECKODRIVER_VERSION = "v0.32.0"
-DEFAULT_EDGEDRIVER_VERSION = "106.0.1370.42"  # (If can't find LATEST_STABLE)
+DEFAULT_EDGEDRIVER_VERSION = "108.0.1462.54"  # (If can't find LATEST_STABLE)
 DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
 
 
@@ -58,7 +67,7 @@ def invalid_run_command():
     exp += "           OR  seleniumbase get [DRIVER] [OPTIONS]\n"
     exp += "           OR         sbase get [DRIVER] [OPTIONS]\n"
     exp += "                (Drivers: chromedriver, geckodriver, edgedriver,\n"
-    exp += "                          iedriver, operadriver)\n"
+    exp += "                          iedriver, operadriver, uc_driver)\n"
     exp += "  Options:\n"
     exp += "           VERSION        Specify the version.\n"
     exp += "                          Tries to detect the needed version.\n"
@@ -71,8 +80,8 @@ def invalid_run_command():
     exp += "           sbase get chromedriver\n"
     exp += "           sbase get geckodriver\n"
     exp += "           sbase get edgedriver\n"
-    exp += "           sbase get chromedriver 107\n"
-    exp += "           sbase get chromedriver 107.0.5304.62\n"
+    exp += "           sbase get chromedriver 108\n"
+    exp += "           sbase get chromedriver 108.0.5359.71\n"
     exp += "           sbase get chromedriver latest\n"
     exp += "           sbase get chromedriver latest-1\n"
     exp += "           sbase get chromedriver -p\n"
@@ -179,7 +188,9 @@ def main(override=None, intel_for_uc=None):
         c3 = ""
         cr = ""
 
-    if name == "chromedriver":
+    if name == "chromedriver" or name == "uc_driver":
+        if name == "uc_driver" and IS_ARM_MAC:
+            intel_for_uc = True  # uc_driver is generated from chromedriver
         last = "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"
         use_version = DEFAULT_CHROMEDRIVER_VERSION
 
@@ -229,10 +240,7 @@ def main(override=None, intel_for_uc=None):
                 invalid_run_command()
         if "darwin" in sys_plat:
             if (
-                (
-                    "arm" in platform.processor().lower()
-                    or "arm64" in platform.version().lower()
-                )
+                IS_ARM_MAC
                 and not intel_for_uc
                 and int(use_version.split(".")[0]) > 105
             ):
@@ -402,13 +410,7 @@ def main(override=None, intel_for_uc=None):
             file_name = "edgedriver_win32.zip"
             suffix = "WINDOWS"
         elif "darwin" in sys_plat:
-            if (
-                (
-                    "arm" in platform.processor().lower()
-                    or "arm64" in platform.version().lower()
-                )
-                and int(use_version.split(".")[0]) > 104
-            ):
+            if IS_ARM_MAC and int(use_version.split(".")[0]) > 104:
                 file_name = "edgedriver_mac64_m1.zip"
             else:
                 file_name = "edgedriver_mac64.zip"
@@ -645,18 +647,19 @@ def main(override=None, intel_for_uc=None):
             for f_name in contents:
                 # Remove existing version if exists
                 new_file = os.path.join(downloads_folder, str(f_name))
+                if (
+                    intel_for_uc
+                    and "darwin" in sys_plat
+                    and new_file.endswith("drivers/chromedriver")
+                ):
+                    new_file = new_file.replace(
+                        "drivers/chromedriver", "drivers/uc_driver"
+                    )
                 if "Driver" in new_file or "driver" in new_file:
                     if os.path.exists(new_file):
                         os.remove(new_file)  # Technically the old file now
             print("Extracting %s from %s ..." % (contents, file_name))
-            if (
-                intel_for_uc
-                and "darwin" in sys_plat
-                and (
-                    "arm" in platform.processor().lower()
-                    or "arm64" in platform.version().lower()
-                )
-            ):
+            if intel_for_uc and IS_ARM_MAC:
                 f_name = "uc_driver"
                 new_file = os.path.join(downloads_folder, f_name)
                 if os.path.exists(new_file):
@@ -873,6 +876,11 @@ def main(override=None, intel_for_uc=None):
             make_executable(file_path)
             print("%s[%s] is now ready for use!%s" % (c1, file_name, cr))
             print("Location of [%s]:\n%s\n" % (file_name, file_path))
+    if name == "uc_driver" and not IS_ARM_MAC:
+        print(
+            "%s[uc_driver] will be created from [chromedriver] at runtime!%s\n"
+            % (c5, cr)
+        )
 
 
 if __name__ == "__main__":

seleniumbase/fixtures/constants.py

@@ -22,6 +22,7 @@ class Environment:
     BETA = "beta"
     MAIN = "main"
     TEST = "test"
+    UAT = "uat"
 
 
 class ValidEnvs:
@@ -40,6 +41,7 @@ class ValidEnvs:
         "beta",
         "main",
         "test",
+        "uat",
     ]
 
 
@@ -158,7 +160,7 @@ class Warnings:
 
 
 class JQuery:
-    VER = "3.6.0"
+    VER = "3.6.3"
     MIN_JS = "https://cdn.jsdelivr.net/npm/jquery@%s/dist/jquery.min.js" % VER