Merge pull request #1342 from seleniumbase/optimizations-for-driver-downloads

Optimizations for driver downloads

Author: mdmintz

examples/parameterized_test.py

@@ -5,7 +5,7 @@
 class GoogleTests(BaseCase):
     @parameterized.expand(
         [
-            ["PyPI", "pypi.org", 'img[alt="PyPI"]'],
+            ["Download Python", "Download Python", "img.python-logo"],
             ["Wikipedia", "www.wikipedia.org", "img.central-featured-logo"],
             ["SeleniumBase GitHub.com", "SeleniumBase", 'img[title*="Sele"]'],
         ]

examples/test_canvas.py

@@ -24,7 +24,7 @@ def test_canvas_actions(self):
         rgb = self.get_pixel_colors()
         self.assert_equal(rgb, [221, 242, 231])  # Looks greenish
         self.click_with_offset("canvas", 500, 350)
-        self.highlight("canvas")
+        self.highlight("canvas", loops=5)
         rgb = self.get_pixel_colors()
         self.assert_equal(rgb, [39, 42, 56])  # Blue by hamburger
 

examples/test_chromedriver.py

@@ -34,7 +34,7 @@ def test_chromedriver_matches_chrome(self):
         print(message)
         if major_chromedriver_version < major_chrome_version:
             install_sb = (
-                "seleniumbase install chromedriver %s" % major_chrome_version
+                "seleniumbase get chromedriver %s" % major_chrome_version
             )
             pr_install_sb = c1 + install_sb + cr
             up_msg = "You may want to upgrade your version of chromedriver:"

examples/upgrade_chromedriver.py

@@ -32,7 +32,7 @@ def test_upgrade(self):
                     major_chromedriver_ver = chromedriver_ver.split(".")[0]
                     if major_chromedriver_ver != major_chrome_ver:
                         subprocess.check_call(
-                            "sbase install chromedriver %s" % major_chrome_ver,
+                            "sbase get chromedriver %s" % major_chrome_ver,
                             shell=True
                         )
             """
@@ -64,15 +64,15 @@ def test_print_versions(self):
                         print(
                             "* The version of chromedriver is too low!\\n"
                             "* Try upgrading to chromedriver %s manually:\\n"
-                            "* >>> sbase install chromedriver %s <<<"
+                            "* >>> sbase get chromedriver %s <<<"
                             % (major_chrome_ver, major_chrome_ver)
                         )
                     else:
                         print("* !!! Version Mismatch !!!")
                         print(
                             "* The version of chromedriver is too high!\\n"
                             "* Try downgrading to chromedriver %s manually:\\n"
-                            "* >>> sbase install chromedriver %s <<<"
+                            "* >>> sbase get chromedriver %s <<<"
                             % (major_chrome_ver, major_chrome_ver)
                         )
             """
@@ -91,7 +91,7 @@ def test_upgrade_chromedriver(self, testdir):
         except Exception:
             # Install the compatibility version of chromedriver
             subprocess.check_call(
-                "seleniumbase install chromedriver 2.44", shell=True
+                "seleniumbase get chromedriver 72.0.3626.69", shell=True
             )
         # Upgrade chromedriver to match the installed version of Chrome
         testdir = self.upgrade_chromedriver(testdir)

help_docs/webdriver_installation.md

@@ -12,7 +12,7 @@ sbase install iedriver
 sbase install operadriver
 ```
 
-* If you have the latest version of Chrome installed, get the latest chromedriver (<i>otherwise it defaults to chromedriver 2.44 for compatibility reasons</i>):
+* If you have the latest version of Chrome installed, get the latest chromedriver (<i>otherwise it defaults to chromedriver 72.0.3626.69 for compatibility reasons</i>):
 
 ```bash
 sbase install chromedriver latest

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "3.2.0"
+__version__ = "3.2.1"

seleniumbase/console_scripts/ReadMe.md

@@ -52,7 +52,7 @@ COMMANDS:
 * Examples:
 
 ```bash
-sbase get chromedriver
+sbase get chromedriver  # (Default version = 72.0.3626.69)
 sbase get geckodriver
 sbase get edgedriver
 sbase get chromedriver 101

seleniumbase/console_scripts/run.py

@@ -129,7 +129,7 @@ def show_install_usage():
     print("                           iedriver, operadriver)")
     print("  Options:")
     print("           VERSION         Specify the version to download.")
-    print("                            (Default Chromedriver version = 2.44.")
+    print("                            (Default chromedriver = 72.0.3626.69.")
     print('                             Use "latest" for the latest version.')
     print("                             For chromedriver, you can also use")
     print("                             the major version integer")

seleniumbase/console_scripts/sb_install.py

@@ -6,7 +6,7 @@
                     iedriver|operadriver} [OPTIONS]
 Options:
          VERSION         Specify the version.
-                         (Default chromedriver version = 2.44)
+                         (Default chromedriver = 72.0.3626.69)
                          Use "latest" for the latest version.
                          Use "latest-1" for one less than that.
          -p OR --path    Also copy the driver to /usr/local/bin
@@ -44,7 +44,7 @@
 urllib3.disable_warnings()
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 LOCAL_PATH = "/usr/local/bin/"  # On Mac and Linux systems
-DEFAULT_CHROMEDRIVER_VERSION = "2.44"  # (Specify "latest" to get the latest)
+DEFAULT_CHROMEDRIVER_VERSION = "72.0.3626.69"  # (Specify "latest" for latest)
 DEFAULT_GECKODRIVER_VERSION = "v0.31.0"
 DEFAULT_EDGEDRIVER_VERSION = "101.0.1210.32"  # (Looks for LATEST_STABLE first)
 DEFAULT_OPERADRIVER_VERSION = "v.96.0.4664.45"
@@ -61,7 +61,7 @@ def invalid_run_command():
     exp += "                          iedriver, operadriver)\n"
     exp += "  Options:\n"
     exp += "           VERSION        Specify the version.\n"
-    exp += "                           (Default chromedriver version = 2.44)\n"
+    exp += "                           (Default chromedriver = 72.0.3626.69.\n"
     exp += '                            Use "latest" for the latest version.\n'
     exp += "                            For chromedriver, you can also use\n"
     exp += "                            the major version integer\n"
@@ -108,14 +108,27 @@ def requests_get(url):
 
 
 def main(override=None):
-    if override == "chromedriver":
-        sys.argv = ["seleniumbase", "get", "chromedriver"]
-    elif override == "edgedriver":
-        sys.argv = ["seleniumbase", "get", "edgedriver"]
-    elif override == "geckodriver":
-        sys.argv = ["seleniumbase", "get", "geckodriver"]
-    elif override == "iedriver":
-        sys.argv = ["seleniumbase", "get", "iedriver"]
+    if override:
+        if override == "chromedriver":
+            sys.argv = ["seleniumbase", "get", "chromedriver"]
+        elif override.startswith("chromedriver "):
+            extra = override.split("chromedriver ")[1]
+            sys.argv = ["seleniumbase", "get", "chromedriver", extra]
+        elif override == "edgedriver":
+            sys.argv = ["seleniumbase", "get", "edgedriver"]
+        elif override.startswith("edgedriver "):
+            extra = override.split("edgedriver ")[1]
+            sys.argv = ["seleniumbase", "get", "edgedriver", extra]
+        elif override == "geckodriver":
+            sys.argv = ["seleniumbase", "get", "geckodriver"]
+        elif override.startswith("geckodriver "):
+            extra = override.split("geckodriver ")[1]
+            sys.argv = ["seleniumbase", "get", "geckodriver", extra]
+        elif override == "iedriver":
+            sys.argv = ["seleniumbase", "get", "iedriver"]
+        elif override.startswith("iedriver "):
+            extra = override.split("iedriver ")[1]
+            sys.argv = ["seleniumbase", "get", "iedriver", extra]
 
     num_args = len(sys.argv)
     if (

seleniumbase/console_scripts/sb_mkdir.py

@@ -437,14 +437,14 @@ def main():
     file.close()
 
     data = []
-    data.append("from seleniumbase import BaseCase")
     data.append("from parameterized import parameterized")
+    data.append("from seleniumbase import BaseCase")
     data.append("")
     data.append("")
     data.append("class GoogleTests(BaseCase):")
     data.append("    @parameterized.expand(")
     data.append("        [")
-    data.append('            ["pypi", "pypi.org"],')
+    data.append('            ["Download Python", "Download Python"],')
     data.append('            ["wikipedia", "wikipedia.org"],')
     data.append('            ["seleniumbase", "SeleniumBase"],')
     data.append("        ]")
@@ -457,7 +457,6 @@ def main():
     data.append(
         '        self.type(\'input[title="Search"]\', search_term + "\\n")'
     )
-    data.append('        self.assert_element("#result-stats")')
     data.append('        self.assert_text(expected_text, "#search")')
     data.append("")
     file_path = "%s/%s" % (dir_name, "parameterized_test.py")