Merge pull request #488 from seleniumbase/treat-edge-like-chrome

Treat the new Chromium Edge browser like Chrome

Author: mdmintz

requirements.txt

@@ -1,4 +1,4 @@
-pip>=19.3.1
+pip>=20.0.1
 setuptools>=44.0.0;python_version<"3"
 setuptools>=45.1.0;python_version>="3"
 setuptools-scm>=3.4.2
@@ -8,7 +8,7 @@ nose==1.3.7
 ipdb==0.12.3
 idna==2.8
 chardet==3.0.4
-urllib3==1.25.7
+urllib3==1.25.8
 requests==2.22.0
 selenium==3.141.0
 pluggy>=0.13.1
@@ -43,4 +43,4 @@ tqdm>=4.41.1
 flake8==3.7.9
 certifi>=2019.11.28
 pdfminer.six==20191110;python_version<"3.5"
-pdfminer.six==20200104;python_version>="3.5"
+pdfminer.six==20200121;python_version>="3.5"

seleniumbase/core/browser_launcher.py

@@ -355,11 +355,12 @@ def get_driver(browser_name, headless=False, use_grid=False,
                     'The format for using a proxy server with authentication '
                     'is: "username:password@hostname:port". If using a proxy '
                     'server without auth, the format is: "hostname:port".')
-            if browser_name != constants.Browser.GOOGLE_CHROME:
+            if browser_name != constants.Browser.GOOGLE_CHROME and (
+                    browser_name != constants.Browser.EDGE):
                 raise Exception(
-                    "Chrome is required when using a proxy server that has "
-                    "authentication! (If using a proxy server without auth, "
-                    "either Chrome or Firefox may be used.)")
+                    "Chrome or Edge is required when using a proxy server "
+                    "that has authentication! (If using a proxy server "
+                    "without auth, Chrome, Edge, or Firefox may be used.)")
         proxy_string = validate_proxy_string(proxy_string)
         if proxy_string and proxy_user and proxy_pass:
             proxy_auth = True

seleniumbase/fixtures/base_case.py

@@ -1502,7 +1502,7 @@ def get_new_driver(self, browser=None, headless=None,
                     # WebDrivers can get closed during tearDown().
                     pass
             else:
-                if self.browser == 'chrome':
+                if self.browser == 'chrome' or self.browser == 'edge':
                     width = settings.CHROME_START_WIDTH
                     height = settings.CHROME_START_HEIGHT
                     try:
@@ -1522,12 +1522,6 @@ def get_new_driver(self, browser=None, headless=None,
                             self.wait_for_ready_state_complete()
                         except Exception:
                             pass  # Keep existing browser resolution
-                elif self.browser == 'edge':
-                    try:
-                        self.driver.maximize_window()
-                        self.wait_for_ready_state_complete()
-                    except Exception:
-                        pass  # Keep existing browser resolution
             if self.start_page and len(self.start_page) >= 4:
                 if page_utils.is_valid_url(self.start_page):
                     self.open(self.start_page)
@@ -2299,9 +2293,10 @@ def assert_no_js_errors(self):
             current_url = self.get_current_url()
             raise Exception(
                 "JavaScript errors found on %s => %s" % (current_url, errors))
-        if self.demo_mode and self.browser == 'chrome':
-            messenger_post = ("ASSERT NO JS ERRORS")
-            self.__highlight_with_assert_success(messenger_post, "html")
+        if self.demo_mode:
+            if (self.browser == 'chrome' or self.browser == 'edge'):
+                messenger_post = ("ASSERT NO JS ERRORS")
+                self.__highlight_with_assert_success(messenger_post, "html")
 
     def __activate_html_inspector(self):
         self.wait_for_ready_state_complete()

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.34.25',
+    version='1.34.26',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -81,7 +81,7 @@
         "Programming Language :: Python :: 3.8",
     ],
     install_requires=[
-        'pip>=19.3.1',  # >= 19.3.1 required for Python 3.8+
+        'pip>=20.0.1',
         'setuptools',
         'setuptools-scm',
         'wheel',
@@ -90,7 +90,7 @@
         'ipdb',
         'idna==2.8',  # Must stay in sync with "requests"
         'chardet==3.0.4',  # Must stay in sync with "requests"
-        'urllib3==1.25.7',  # Must stay in sync with "requests"
+        'urllib3==1.25.8',  # Must stay in sync with "requests"
         'requests==2.22.0',
         'selenium==3.141.0',
         'pluggy>=0.13.1',
@@ -125,7 +125,7 @@
         'flake8==3.7.9',
         'certifi>=2019.11.28',
         'pdfminer.six==20191110;python_version<"3.5"',
-        'pdfminer.six==20200104;python_version>="3.5"',
+        'pdfminer.six==20200121;python_version>="3.5"',
     ],
     packages=[
         'seleniumbase',