Merge pull request #383 from seleniumbase/driver-path

Selenium 4 compatibility

Author: mdmintz

README.md

@@ -1,4 +1,4 @@
-[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_3j.png" title="SeleniumBase" align="center" height="45">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
+[<img src="https://cdn2.hubspot.net/hubfs/100006/images/super_logo_3k.png" title="SeleniumBase" align="center" height="45">](https://github.com/seleniumbase/SeleniumBase/blob/master/README.md)
 
 [<img src="https://img.shields.io/github/release/seleniumbase/SeleniumBase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/releases) [<img src="https://dev.azure.com/seleniumbase/seleniumbase/_apis/build/status/seleniumbase.SeleniumBase?branchName=master" alt=" " />](https://dev.azure.com/seleniumbase/seleniumbase/_build/latest?definitionId=1&branchName=master) [<img src="https://travis-ci.org/seleniumbase/SeleniumBase.svg?branch=master" alt=" " />](https://travis-ci.org/seleniumbase/SeleniumBase) [<img src="https://badges.gitter.im/seleniumbase/SeleniumBase.svg" alt=" " />](https://gitter.im/seleniumbase/SeleniumBase) [<img src="https://img.shields.io/badge/license-MIT-22BBCC.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/blob/master/LICENSE) [<img src="https://img.shields.io/github/stars/seleniumbase/seleniumbase.svg" alt=" " />](https://github.com/seleniumbase/SeleniumBase/stargazers)<br />
 
@@ -27,19 +27,13 @@ To isolate **``python``** dependencies between projects, you can create a Virtua
 ```bash
 pip install seleniumbase
 ```
-* Add ``--upgrade`` to upgrade an existing installation.
+* Add ``--upgrade`` OR ``-U`` to upgrade an installation.
 * Add ``--force-reinstall`` for a clean install.
 
 You can also install seleniumbase from a ``git clone``:
 ```bash
 git clone https://github.com/seleniumbase/SeleniumBase.git
 cd SeleniumBase
-pip install .
-```
-
-To install dependancies separately from seleniumbase:
-(From the ``SeleniumBase`` folder:)
-```bash
 pip install -r requirements.txt
 python setup.py install
 ```

seleniumbase/core/browser_launcher.py

@@ -20,6 +20,8 @@
 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"]:
+    os.environ["PATH"] += os.pathsep + DRIVER_DIR
 EXTENSIONS_DIR = os.path.dirname(os.path.realpath(extensions.__file__))
 DISABLE_CSP_ZIP_PATH = "%s/%s" % (EXTENSIONS_DIR, "disable_csp.zip")
 PROXY_ZIP_PATH = proxy_helper.PROXY_ZIP_PATH
@@ -464,16 +466,10 @@ def get_local_driver(
                     options.add_argument('-headless')
                 if LOCAL_GECKODRIVER and os.path.exists(LOCAL_GECKODRIVER):
                     make_driver_executable_if_not(LOCAL_GECKODRIVER)
-                    firefox_driver = webdriver.Firefox(
-                        firefox_profile=profile,
-                        capabilities=firefox_capabilities,
-                        options=options,
-                        executable_path=LOCAL_GECKODRIVER)
-                else:
-                    firefox_driver = webdriver.Firefox(
-                        firefox_profile=profile,
-                        capabilities=firefox_capabilities,
-                        options=options)
+                firefox_driver = webdriver.Firefox(
+                    firefox_profile=profile,
+                    capabilities=firefox_capabilities,
+                    options=options)
             except WebDriverException:
                 # Don't use Geckodriver: Only works for old versions of Firefox
                 profile = _create_firefox_profile(
@@ -502,11 +498,7 @@ def get_local_driver(
         ie_capabilities = ie_options.to_capabilities()
         if LOCAL_IEDRIVER and os.path.exists(LOCAL_IEDRIVER):
             make_driver_executable_if_not(LOCAL_IEDRIVER)
-            return webdriver.Ie(
-                capabilities=ie_capabilities,
-                executable_path=LOCAL_IEDRIVER)
-        else:
-            return webdriver.Ie(capabilities=ie_capabilities)
+        return webdriver.Ie(capabilities=ie_capabilities)
     elif browser_name == constants.Browser.EDGE:
         if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
             make_driver_executable_if_not(LOCAL_EDGEDRIVER)
@@ -525,9 +517,7 @@ def get_local_driver(
     elif browser_name == constants.Browser.OPERA:
         if LOCAL_OPERADRIVER and os.path.exists(LOCAL_OPERADRIVER):
             make_driver_executable_if_not(LOCAL_OPERADRIVER)
-            return webdriver.Opera(executable_path=LOCAL_OPERADRIVER)
-        else:
-            return webdriver.Opera()
+        return webdriver.Opera()
     elif browser_name == constants.Browser.PHANTOM_JS:
         with warnings.catch_warnings():
             # Ignore "PhantomJS has been deprecated" UserWarning
@@ -542,18 +532,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)
-                return webdriver.Chrome(
-                    executable_path=LOCAL_CHROMEDRIVER, options=chrome_options)
-            else:
-                return webdriver.Chrome(options=chrome_options)
+            return webdriver.Chrome(options=chrome_options)
         except Exception as e:
             if headless:
                 raise Exception(e)
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 make_driver_executable_if_not(LOCAL_CHROMEDRIVER)
-                return webdriver.Chrome(executable_path=LOCAL_CHROMEDRIVER)
-            else:
-                return webdriver.Chrome()
+            return webdriver.Chrome()
     else:
         raise Exception(
             "%s is not a valid browser option for this system!" % browser_name)

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.32.6',
+    version='1.32.7',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -78,6 +78,7 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
     install_requires=[
         'pip',