Merge pull request #371 from seleniumbase/many-updates

Many Updates

Author: mdmintz

.gitignore

@@ -54,11 +54,13 @@ test-results.xml
 # Web Drivers
 chromedriver
 geckodriver
+msedgedriver
 operadriver
 MicrosoftWebDriver.exe
 IEDriverServer.exe
 chromedriver.exe
 geckodriver.exe
+msedgedriver.exe
 operadriver.exe
 
 # Logs

.travis.yml

@@ -20,7 +20,7 @@ install:
   - "python setup.py develop"
   - "sudo rm -f /etc/boto.cfg"
 before_script:
-  - "flake8 seleniumbase/*.py && flake8 seleniumbase/*/*.py && flake8 seleniumbase/*/*/*.py && flake8 seleniumbase/*/*/*/*.py"
+  - "flake8 --exclude=temp"
   # - "wget https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip && unzip chromedriver_linux64.zip && sudo cp chromedriver /usr/local/bin/ && sudo chmod +x /usr/local/bin/chromedriver"
   # - "wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz -O /tmp/geckodriver.tar.gz && tar -C /opt -xzf /tmp/geckodriver.tar.gz && sudo chmod 755 /opt/geckodriver && sudo ln -fs /opt/geckodriver /usr/bin/geckodriver && sudo ln -fs /opt/geckodriver /usr/local/bin/geckodriver"
   # - "wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 && tar -xvf ./phantomjs-2.1.1-linux-x86_64.tar.bz2 && export PATH=$PWD/phantomjs-2.1.1-linux-x86_64/bin:$PATH"

seleniumbase/console_scripts/run.py

@@ -59,7 +59,7 @@ def show_install_usage():
     print("                 (Drivers: chromedriver, geckodriver, edgedriver")
     print("                           iedriver, operadriver)")
     print("  Options:")
-    print("           VERSION - Specify the version (For Chromedriver ONLY).")
+    print("           VERSION - Specify version (Chromedriver / EdgeDr ONLY).")
     print("                         (Default Chromedriver version = 2.44)")
     print('                     Use "latest" to get the latest Chromedriver.')
     print("  Example:")

seleniumbase/console_scripts/sb_install.py

@@ -5,7 +5,7 @@
         seleniumbase install {chromedriver|geckodriver|edgedriver|
                               iedriver|operadriver} [OPTIONS]
 Options:
-        VERSION - Specify the version (For Chromedriver ONLY)
+        VERSION - Specify version (Chromedriver / Edgedriver ONLY)
                       (Default Chromedriver version = 2.44)
                   Use "latest" to get the latest Chromedriver.
 Example:
@@ -34,6 +34,7 @@
 urllib3.disable_warnings()
 DRIVER_DIR = os.path.dirname(os.path.realpath(drivers.__file__))
 DEFAULT_CHROMEDRIVER_VERSION = "2.44"
+DEFAULT_EDGEDRIVER_VERSION = "78.0.268.0"
 
 
 def invalid_run_command():
@@ -43,7 +44,7 @@ def invalid_run_command():
     exp += "              (Drivers: chromedriver, geckodriver, edgedriver,\n"
     exp += "                        iedriver, operadriver)\n"
     exp += "  Options:\n"
-    exp += "          VERSION - Specify the version (For Chromedriver ONLY)."
+    exp += "          VERSION - Specify version (Chromedriver / EdgeDr ONLY)."
     exp += "                        (Default Chromedriver version = 2.44)"
     exp += '                    Use "latest" to get the latest Chromedriver.'
     exp += "  Example:\n"
@@ -86,6 +87,9 @@ def main():
     expected_contents = None
     platform_code = None
     inner_folder = None
+    use_version = ""
+    new_file = ""
+    f_name = ""
 
     if name == "chromedriver":
         use_version = DEFAULT_CHROMEDRIVER_VERSION
@@ -140,17 +144,26 @@ def main():
                         "%s/%s" % (use_version, file_name))
     elif name == "edgedriver" or name == "microsoftwebdriver":
         name = "edgedriver"
-        version_code = "F/8/A/F8AF50AB-3C3A-4BC4-8773-DC27B32988DD"
-        if "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
-            file_name = "MicrosoftWebDriver.exe"
+        use_version = DEFAULT_EDGEDRIVER_VERSION
+        if num_args == 4:
+            use_version = sys.argv[3]
+            if use_version.lower() == "latest":
+                use_version = DEFAULT_EDGEDRIVER_VERSION
+        if "win64" in sys_plat or "x64" in sys_plat:
+            file_name = "edgedriver_win64.zip"
+        elif "win32" in sys_plat or "x86" in sys_plat:
+            file_name = "edgedriver_win32.zip"
+        elif "darwin" in sys_plat:
+            file_name = "edgedriver_mac64.zip"
         else:
             raise Exception("Sorry! Microsoft WebDriver / EdgeDriver is "
-                            "only for Windows-based operating systems!")
-        download_url = ("https://download.microsoft.com/download/"
-                        "%s/%s" % (version_code, file_name))
+                            "only for Windows or Mac operating systems!")
+        download_url = ("https://msedgedriver.azureedge.net/"
+                        "%s/%s" % (use_version, file_name))
     elif name == "iedriver":
         major_version = "3.14"
         full_version = "3.14.0"
+        use_version = full_version
         if "win32" in sys_plat:
             file_name = "IEDriverServer_Win32_%s.zip" % full_version
         elif "win64" in sys_plat or "x64" in sys_plat:
@@ -234,10 +247,16 @@ def main():
             print('Unzip Complete!\n')
             for f_name in contents:
                 new_file = downloads_folder + '/' + str(f_name)
-                print("%s saved!\n" % new_file)
-                print("Making %s executable ..." % new_file)
+                print("The file [%s] was saved to:\n%s\n" % (f_name, new_file))
+                print("Making [%s] executable ..." % f_name)
                 make_executable(new_file)
-                print("%s is now ready for use!" % 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("")
         elif name == "operadriver":
             if len(contents) != 3:
@@ -266,10 +285,13 @@ def main():
             inner_driver = downloads_folder + '/' + inner_folder + driver_file
             inner_sha = downloads_folder + '/' + inner_folder + "sha512_sum"
             shutil.copyfile(inner_driver, driver_path)
-            print("%s saved!\n" % driver_path)
-            print("Making %s executable ..." % driver_path)
+            print("The file [%s] was saved to:\n%s\n" % (
+                driver_file, driver_path))
+            print("Making [%s] executable ..." % driver_file)
             make_executable(driver_path)
-            print("%s is now ready for use!" % 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))
             # clean up extra files
             if os.path.exists(inner_driver):
                 os.remove(inner_driver)
@@ -301,10 +323,16 @@ def main():
             print('Unzip Complete!\n')
             for f_name in contents:
                 new_file = downloads_folder + '/' + str(f_name)
-                print("%s saved!\n" % new_file)
-                print("Making %s executable ..." % new_file)
+                print("The file [%s] was saved to:\n%s\n" % (f_name, new_file))
+                print("Making [%s] executable ..." % f_name)
                 make_executable(new_file)
-                print("%s is now ready for use!" % 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("")
         elif len(contents) == 0:
             raise Exception("Tar file %s is empty!" % tar_file_path)
@@ -313,9 +341,10 @@ def main():
     else:
         # Not a .zip file or a .tar.gz file. Just a direct download.
         if "Driver" in file_name or "driver" in file_name:
-            print("Making %s executable ..." % file_path)
+            print("Making [%s] executable ..." % file_name)
             make_executable(file_path)
-            print("%s is now ready for use!\n" % file_path)
+            print("[%s] is now ready for use!\n" % file_name)
+            print("Location of [%s]:\n%s\n" % (file_name, file_path))
 
 
 if __name__ == "__main__":

seleniumbase/core/browser_launcher.py

@@ -34,10 +34,11 @@
 if "darwin" in PLATFORM or "linux" in PLATFORM:
     LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver'
     LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver'
+    LOCAL_EDGEDRIVER = DRIVER_DIR + '/msedgedriver'
     LOCAL_OPERADRIVER = DRIVER_DIR + '/operadriver'
 elif "win32" in PLATFORM or "win64" in PLATFORM or "x64" in PLATFORM:
     IS_WINDOWS = True
-    LOCAL_EDGEDRIVER = DRIVER_DIR + '/MicrosoftWebDriver.exe'
+    LOCAL_EDGEDRIVER = DRIVER_DIR + '/msedgedriver.exe'
     LOCAL_IEDRIVER = DRIVER_DIR + '/IEDriverServer.exe'
     LOCAL_CHROMEDRIVER = DRIVER_DIR + '/chromedriver.exe'
     LOCAL_GECKODRIVER = DRIVER_DIR + '/geckodriver.exe'
@@ -507,17 +508,24 @@ def get_local_driver(
         else:
             return webdriver.Ie(capabilities=ie_capabilities)
     elif browser_name == constants.Browser.EDGE:
-        if not IS_WINDOWS:
-            raise Exception(
-                "Edge Browser is for Windows-based operating systems only!")
-        edge_capabilities = DesiredCapabilities.EDGE.copy()
         if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
             make_driver_executable_if_not(LOCAL_EDGEDRIVER)
-            return webdriver.Edge(
-                capabilities=edge_capabilities,
-                executable_path=LOCAL_EDGEDRIVER)
+            try:
+                # The new Microsoft Edge browser is based on Chrome
+                chrome_options = _set_chrome_options(
+                    downloads_path, headless,
+                    proxy_string, proxy_auth, proxy_user, proxy_pass,
+                    user_agent, disable_csp, enable_sync, user_data_dir,
+                    extension_zip, extension_dir)
+                return webdriver.Chrome(executable_path=LOCAL_EDGEDRIVER,
+                                        options=chrome_options)
+            except Exception:
+                try:
+                    return webdriver.Chrome(executable_path=LOCAL_EDGEDRIVER)
+                except Exception:
+                    return webdriver.Edge(executable_path=LOCAL_EDGEDRIVER)
         else:
-            return webdriver.Edge(capabilities=edge_capabilities)
+            return webdriver.Edge()
     elif browser_name == constants.Browser.SAFARI:
         return webdriver.Safari()
     elif browser_name == constants.Browser.OPERA:
@@ -535,8 +543,8 @@ def get_local_driver(
         try:
             chrome_options = _set_chrome_options(
                 downloads_path, headless,
-                proxy_string, proxy_auth, proxy_user, proxy_pass, user_agent,
-                disable_csp, enable_sync, user_data_dir,
+                proxy_string, proxy_auth, proxy_user, proxy_pass,
+                user_agent, disable_csp, enable_sync, user_data_dir,
                 extension_zip, extension_dir)
             if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
                 make_driver_executable_if_not(LOCAL_CHROMEDRIVER)

seleniumbase/fixtures/base_case.py

@@ -1704,7 +1704,13 @@ def is_downloaded_file_present(self, file):
 
     def assert_downloaded_file(self, file):
         """ Asserts that the file exists in the Downloads Folder. """
-        assert os.path.exists(self.get_path_of_downloaded_file(file))
+        self.assertTrue(os.path.exists(self.get_path_of_downloaded_file(file)),
+                        "File [%s] was not found in the downloads folder [%s]!"
+                        "" % (file, self.get_downloads_folder()))
+        if self.demo_mode:
+            messenger_post = ("ASSERT DOWNLOADED FILE: [%s]" % file)
+            js_utils.post_messenger_success_message(
+                self.driver, messenger_post, self.message_duration)
 
     def assert_true(self, expr, msg=None):
         self.assertTrue(expr, msg=msg)
@@ -1736,7 +1742,11 @@ def assert_not_equal(self, first, second, msg=None):
 
     def assert_title(self, title):
         """ Asserts that the web page title matches the expected title. """
-        assert self.get_title() == title
+        expected = title
+        actual = self.get_title()
+        self.assertEqual(expected, actual, "Expected page title [%s] "
+                         "does not match the actual page title [%s]!"
+                         "" % (expected, actual))
         if self.demo_mode:
             messenger_post = ("ASSERT TITLE: {%s}" % title)
             js_utils.post_messenger_success_message(

seleniumbase/utilities/selenium_ide/objectify.py

@@ -90,16 +90,16 @@ def remove_extra_slashes(selector):
     if selector.count('\\"') > 0:
         if selector.count('\\"') == selector.count('"'):
             selector = selector.replace('\\"', '"')
-        elif (selector.count('\\"') == selector[1:-1].count('"') and
-              "'" not in selector[1:-1]):
+        elif (selector.count('\\"') == selector[1:-1].count('"') and (
+              "'" not in selector[1:-1])):
             selector = "'" + selector[1:-1].replace('\\"', '"') + "'"
         else:
             pass
     if selector.count("\\'") > 0:
         if selector.count("\\'") == selector.count("'"):
             selector = selector.replace("\\'", "'")
-        elif (selector.count("\\'") == selector[1:-1].count("'") and
-              '"' not in selector[1:-1]):
+        elif (selector.count("\\'") == selector[1:-1].count("'") and (
+              '"' not in selector[1:-1])):
             selector = '"' + selector[1:-1].replace("\\'", "'") + '"'
         else:
             pass

seleniumbase/virtual_display/easyprocess.py

@@ -115,14 +115,14 @@ def __init__(self, cmd, ubuntu_package=None, url=None,
     def __repr__(self):
         msg = ('<%s cmd_param=%s cmd=%s oserror=%s return_code=%s'
                ' stdout="%s" stderr="%s" timeout_happened=%s>' % (
-                self.__class__.__name__,
-                self.cmd_param,
-                self.cmd,
-                self.oserror,
-                self.return_code,
-                self.stdout,
-                self.stderr,
-                self.timeout_happened,
+                   self.__class__.__name__,
+                   self.cmd_param,
+                   self.cmd,
+                   self.oserror,
+                   self.return_code,
+                   self.stdout,
+                   self.stderr,
+                   self.timeout_happened,
                ))
         return msg
 

seleniumbase/virtual_display/xvfb.py

@@ -37,8 +37,7 @@ def check_installed(cls):
 
     @property
     def _cmd(self):
-        cmd = [
-               dict(black='-br', white='-wr')[self.bgcolor],
+        cmd = [dict(black='-br', white='-wr')[self.bgcolor],
                '-nolisten',
                'tcp',
                '-screen',

setup.py

@@ -4,20 +4,48 @@
 """
 
 from setuptools import setup, find_packages  # noqa
-from os import path
+import os
+import sys
 
 
-this_directory = path.abspath(path.dirname(__file__))
+this_directory = os.path.abspath(os.path.dirname(__file__))
 long_description = None
 try:
-    with open(path.join(this_directory, 'README.md'), 'rb') as f:
+    with open(os.path.join(this_directory, 'README.md'), 'rb') as f:
         long_description = f.read().decode('utf-8')
 except IOError:
     long_description = 'Reliable Browser Automation & Testing Framework'
 
+if sys.argv[-1] == 'publish':
+    reply = None
+    input_method = input
+    if not sys.version_info[0] >= 3:
+        input_method = raw_input  # noqa
+    reply = str(input_method(
+        '>>> Confirm release PUBLISH to PyPI? (yes/no): ')).lower().strip()
+    if reply == 'yes':
+        print("\n*** Checking code health with flake8:\n")
+        flake8_status = os.system("flake8 --exclude=temp")
+        if flake8_status != 0:
+            print("\nWARNING! Fix flake8 issues before publishing to PyPI!\n")
+            sys.exit()
+        else:
+            print("*** No flake8 issues detected. Continuing...")
+        print("\n*** Rebuilding distribution packages: ***\n")
+        os.system('rm -f dist/*.egg; rm -f dist/*.tar.gz; rm -f dist/*.whl')
+        os.system('python setup.py sdist bdist_wheel')  # Create new tar/wheel
+        print("\n*** Installing twine: *** (Required for PyPI uploads)\n")
+        os.system("python -m pip install 'twine>=1.14.0'")
+        print("\n*** Publishing The Release to PyPI: ***\n")
+        os.system('python -m twine upload dist/*')  # Requires ~/.pypirc Keys
+        print("\n*** The Release was PUBLISHED SUCCESSFULLY to PyPI! :) ***\n")
+    else:
+        print("\n>>> The Release was NOT PUBLISHED to PyPI! <<<\n")
+    sys.exit()
+
 setup(
     name='seleniumbase',
-    version='1.31.5',
+    version='1.31.6',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',