Merge pull request #387 from seleniumbase/webdriver-upgrades

Webdriver Upgrades

Author: mdmintz

README.md

@@ -1,4 +1,4 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_7.png" title="SeleniumBase" align="center" height="200">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_a.png" title="SeleniumBase" align="center" height="150">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 All-in-one framework for fast & simple browser automation and end-to-end testing.
 
@@ -690,4 +690,4 @@ If you see something, say something! We are very active in resolving issues. [<i
 
 [https://github.com/mdmintz](https://github.com/mdmintz)<br />
 
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_3n.png" title="SeleniumBase" height="45">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md) <br /> [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_5e.png" title="SeleniumBase" height="45">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md) <br /> [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE)

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 version = 2.44)
                         Use "latest" for the latest version.
         -p OR --path    Also copy the driver to /usr/local/bin
 Example:
@@ -51,7 +51,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 version = 2.44)\n"
     exp += '                          Use "latest" for the latest version.\n'
     exp += "          -p OR --path    Also copy the driver to /usr/local/bin\n"
     exp += "  Example:\n"
@@ -79,7 +79,12 @@ def make_executable(file_path):
     os.chmod(file_path, mode)
 
 
-def main():
+def main(override=None):
+    if override == "chromedriver":
+        sys.argv = ["seleniumbase", "install", "chromedriver"]
+    if override == "geckodriver":
+        sys.argv = ["seleniumbase", "install", "geckodriver"]
+
     num_args = len(sys.argv)
     if sys.argv[0].split('/')[-1].lower() == "seleniumbase" or (
             sys.argv[0].split('\\')[-1].lower() == "seleniumbase"):
@@ -123,7 +128,7 @@ def main():
         elif "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
             file_name = "chromedriver_win32.zip"  # Works for win32 / win_x64
         else:
-            raise Exception("Cannot determine which version of Chromedriver "
+            raise Exception("Cannot determine which version of chromedriver "
                             "to download!")
         found_chromedriver = False
         if get_latest:
@@ -138,9 +143,9 @@ def main():
         if not found_chromedriver:
             url_request = requests.get(download_url)
         if found_chromedriver or url_request.ok:
-            print("\nChromedriver version for download = %s" % use_version)
+            print("\n* chromedriver version for download = %s" % use_version)
         else:
-            raise Exception("Could not find Chromedriver to download!\n")
+            raise Exception("Could not find chromedriver to download!\n")
     elif name == "geckodriver" or name == "firefoxdriver":
         use_version = DEFAULT_GECKODRIVER_VERSION
         found_geckodriver = False
@@ -174,7 +179,7 @@ def main():
         elif "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
             file_name = "geckodriver-%s-win64.zip" % use_version
         else:
-            raise Exception("Cannot determine which version of Geckodriver "
+            raise Exception("Cannot determine which version of geckodriver "
                             "(Firefox Driver) to download!")
         download_url = ("https://github.com/mozilla/geckodriver/"
                         "releases/download/"
@@ -183,9 +188,9 @@ def main():
         if not found_geckodriver:
             url_request = requests.get(download_url)
         if found_geckodriver or url_request.ok:
-            print("\nGeckodriver version for download = %s" % use_version)
+            print("\n* geckodriver version for download = %s" % use_version)
         else:
-            raise Exception("\nCould not find the specified Geckodriver "
+            raise Exception("\nCould not find the specified geckodriver "
                             "version to download!\n")
     elif name == "edgedriver" or name == "msedgedriver":
         name = "edgedriver"
@@ -314,18 +319,13 @@ def main():
             for f_name in contents:
                 new_file = downloads_folder + '/' + str(f_name)
                 print("The file [%s] was saved to:\n%s\n" % (f_name, new_file))
-                print("Making [%s] executable ..." % f_name)
+                print("Making [%s %s] executable ..." % (f_name, use_version))
                 make_executable(new_file)
-                print("[%s] is now ready for use!\n" % f_name)
-                print('(If running on a Selenium Grid, copy [%s] to your '
-                      'System PATH.\n'
-                      ' E.g. to the "/usr/local/bin/" folder on Linux '
-                      'systems.)\n' % name)
-                print("Location of [%s %s]:\n%s" % (
-                    f_name, use_version, new_file))
+                print("[%s] is now ready for use!" % f_name)
                 if copy_to_path and os.path.exists(LOCAL_PATH):
                     path_file = LOCAL_PATH + f_name
                     shutil.copyfile(new_file, path_file)
+                    make_executable(path_file)
                     print("Also copied to: %s" % path_file)
             print("")
         elif name == "edgedriver" or name == "msedgedriver":
@@ -367,12 +367,10 @@ def main():
                 os.rmdir(downloads_folder + '/' + "Driver_Notes/")
             print("The file [%s] was saved to:\n%s\n" % (
                 driver_file, driver_path))
-            print("Making [%s] executable ..." % driver_file)
+            print("Making [%s %s] executable ..." % (driver_file, use_version))
             make_executable(driver_path)
-            print("[%s] is now ready for use!\n" % driver_file)
+            print("[%s] is now ready for use!" % driver_file)
             print("Add folder path of Edge to System Environmental Variables!")
-            print("\nLocation of [%s %s]:\n%s" % (
-                driver_file, use_version, driver_path))
             print("")
         elif name == "operadriver":
             if len(contents) != 3:
@@ -403,14 +401,13 @@ def main():
             shutil.copyfile(inner_driver, driver_path)
             print("The file [%s] was saved to:\n%s\n" % (
                 driver_file, driver_path))
-            print("Making [%s] executable ..." % driver_file)
+            print("Making [%s %s] executable ..." % (driver_file, use_version))
             make_executable(driver_path)
-            print("[%s] is now ready for use!\n" % driver_file)
-            print("Location of [%s %s]:\n%s" % (
-                driver_file, use_version, driver_path))
+            print("[%s] is now ready for use!" % driver_file)
             if copy_to_path and os.path.exists(LOCAL_PATH):
                 path_file = LOCAL_PATH + driver_file
                 shutil.copyfile(driver_path, path_file)
+                make_executable(path_file)
                 print("Also copied to: %s" % path_file)
             # Clean up extra files
             if os.path.exists(inner_driver):
@@ -444,18 +441,13 @@ def main():
             for f_name in contents:
                 new_file = downloads_folder + '/' + str(f_name)
                 print("The file [%s] was saved to:\n%s\n" % (f_name, new_file))
-                print("Making [%s] executable ..." % f_name)
+                print("Making [%s %s] executable ..." % (f_name, use_version))
                 make_executable(new_file)
-                print("[%s] is now ready for use!\n" % f_name)
-                print('(If running on a Selenium Grid, copy [%s] to your '
-                      'System PATH.\n'
-                      ' E.g. to the "/usr/local/bin/" folder on Linux '
-                      'systems.)\n' % name)
-                print("Location of [%s %s]:\n%s" % (
-                    f_name, use_version, new_file))
+                print("[%s] is now ready for use!" % f_name)
                 if copy_to_path and os.path.exists(LOCAL_PATH):
                     path_file = LOCAL_PATH + f_name
                     shutil.copyfile(new_file, path_file)
+                    make_executable(path_file)
                     print("Also copied to: %s" % path_file)
             print("")
         elif len(contents) == 0:
@@ -467,7 +459,7 @@ def main():
         if "Driver" in file_name or "driver" in file_name:
             print("Making [%s] executable ..." % file_name)
             make_executable(file_path)
-            print("[%s] is now ready for use!\n" % file_name)
+            print("[%s] is now ready for use!" % file_name)
             print("Location of [%s]:\n%s\n" % (file_name, file_path))
 
 

seleniumbase/core/browser_launcher.py

@@ -20,7 +20,15 @@
 from seleniumbase import extensions  # browser extensions storage folder
 urllib3.disable_warnings()
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
-if DRIVER_DIR not in os.environ["PATH"]:
+# 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):
+    # Remove existing SeleniumBase DRIVER_DIR from System PATH if present
+    os.environ["PATH"] = os.environ["PATH"].replace(DRIVER_DIR, "")
+    # If two path separators are next to each other, replace with just one
+    os.environ["PATH"] = os.environ["PATH"].replace(
+        os.pathsep + os.pathsep, os.pathsep)
+    # Put the SeleniumBase DRIVER_DIR at the beginning of the System PATH
     os.environ["PATH"] = DRIVER_DIR + os.pathsep + os.environ["PATH"]
 EXTENSIONS_DIR = os.path.dirname(os.path.realpath(extensions.__file__))
 DISABLE_CSP_ZIP_PATH = "%s/%s" % (EXTENSIONS_DIR, "disable_csp.zip")
@@ -65,6 +73,22 @@ def make_driver_executable_if_not(driver_path):
         make_executable(driver_path)
 
 
+def is_chromedriver_on_path():
+    paths = os.environ["PATH"].split(os.pathsep)
+    for path in paths:
+        if os.path.exists(path + '/' + "chromedriver"):
+            return True
+    return False
+
+
+def is_geckodriver_on_path():
+    paths = os.environ["PATH"].split(os.pathsep)
+    for path in paths:
+        if os.path.exists(path + '/' + "geckodriver"):
+            return True
+    return False
+
+
 def _add_chrome_proxy_extension(
         chrome_options, proxy_string, proxy_user, proxy_pass):
     """ Implementation of https://stackoverflow.com/a/35293284 for
@@ -466,6 +490,14 @@ def get_local_driver(
                     options.add_argument('-headless')
                 if LOCAL_GECKODRIVER and os.path.exists(LOCAL_GECKODRIVER):
                     make_driver_executable_if_not(LOCAL_GECKODRIVER)
+                elif not is_geckodriver_on_path():
+                    if not "".join(sys.argv) == "-c":  # Skip if multithreaded
+                        from seleniumbase.console_scripts import sb_install
+                        sys_args = sys.argv  # Save a copy of current sys args
+                        print("\nWarning: geckodriver not found."
+                              " Installing now:")
+                        sb_install.main(override="geckodriver")
+                        sys.argv = sys_args  # Put back the original sys args
                 firefox_driver = webdriver.Firefox(
                     firefox_profile=profile,
                     capabilities=firefox_capabilities,
@@ -532,6 +564,13 @@ def get_local_driver(
                 extension_zip, extension_dir)
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 make_driver_executable_if_not(LOCAL_CHROMEDRIVER)
+            elif not is_chromedriver_on_path():
+                if not "".join(sys.argv) == "-c":  # Skip if multithreaded
+                    from seleniumbase.console_scripts import sb_install
+                    sys_args = sys.argv  # Save a copy of current sys args
+                    print("\nWarning: chromedriver not found. Installing now:")
+                    sb_install.main(override="chromedriver")
+                    sys.argv = sys_args  # Put back the original sys args
             return webdriver.Chrome(options=chrome_options)
         except Exception as e:
             if headless:

seleniumbase/utilities/selenium_grid/grid_hub.py

@@ -2,6 +2,18 @@
 import os
 import subprocess
 import sys
+from seleniumbase import drivers  # webdriver storage folder for SeleniumBase
+DRIVER_DIR = os.path.dirname(os.path.realpath(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):
+    # Remove existing SeleniumBase DRIVER_DIR from System PATH if present
+    os.environ["PATH"] = os.environ["PATH"].replace(DRIVER_DIR, "")
+    # If two path separators are next to each other, replace with just one
+    os.environ["PATH"] = os.environ["PATH"].replace(
+        os.pathsep + os.pathsep, os.pathsep)
+    # Put the SeleniumBase DRIVER_DIR at the beginning of the System PATH
+    os.environ["PATH"] = DRIVER_DIR + os.pathsep + os.environ["PATH"]
 
 
 def invalid_run_command():

seleniumbase/utilities/selenium_grid/grid_node.py

@@ -2,6 +2,26 @@
 import os
 import subprocess
 import sys
+from seleniumbase import drivers  # webdriver storage folder for SeleniumBase
+DRIVER_DIR = os.path.dirname(os.path.realpath(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):
+    # Remove existing SeleniumBase DRIVER_DIR from System PATH if present
+    os.environ["PATH"] = os.environ["PATH"].replace(DRIVER_DIR, "")
+    # If two path separators are next to each other, replace with just one
+    os.environ["PATH"] = os.environ["PATH"].replace(
+        os.pathsep + os.pathsep, os.pathsep)
+    # Put the SeleniumBase DRIVER_DIR at the beginning of the System PATH
+    os.environ["PATH"] = DRIVER_DIR + os.pathsep + os.environ["PATH"]
+
+
+def is_chromedriver_on_path():
+    paths = os.environ["PATH"].split(os.pathsep)
+    for path in paths:
+        if os.path.exists(path + '/' + "chromedriver"):
+            return True
+    return False
 
 
 def invalid_run_command():
@@ -23,6 +43,14 @@ def invalid_run_command():
 
 
 def main():
+    # Install chromedriver if not installed
+    if not is_chromedriver_on_path():
+        from seleniumbase.console_scripts import sb_install
+        sys_args = sys.argv  # Save a copy of current sys args
+        print("\nWarning: chromedriver not found. Installing now:")
+        sb_install.main(override="chromedriver")
+        sys.argv = sys_args  # Put back the original sys args
+
     dir_path = os.path.dirname(os.path.realpath(__file__))
     num_args = len(sys.argv)
     if sys.argv[0].split('/')[-1] == "seleniumbase" or (

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.32.9',
+    version='1.32.10',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',