Merge pull request #654 from seleniumbase/better-error-handling-and-pkg-updates

Improve error-handling and update Python dependencies

Author: mdmintz

examples/github_test.py

@@ -10,8 +10,9 @@ def test_github(self):
         # To avoid this automation blocker, two steps are being taken:
         # 1. self.slow_click() is being used to slow down Selenium actions.
         # 2. The browser's User Agent is modified to avoid Selenium-detection
-        #    when running in headless mode on Chrome.
-        if self.browser == "chrome" and self.headless:
+        #    when running in headless mode on Chrome or Edge (Chromium).
+        if self.headless and (
+                self.browser == "chrome" or self.browser == "edge"):
             self.driver.quit()
             self.get_new_driver(
                 agent="""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) """

examples/test_apple_site.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from seleniumbase import BaseCase
 
 
@@ -8,6 +7,13 @@ def test_apple_developer_site_webdriver_instructions(self):
         self.demo_mode = True
         self.demo_sleep = 0.5
         self.message_duration = 2.0
+        if self.headless and (
+                self.browser == "chrome" or self.browser == "edge"):
+            self.driver.quit()
+            self.get_new_driver(
+                agent="""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) """
+                      """AppleWebKit/537.36 (KHTML, like Gecko) """
+                      """Chrome/75.0.3770.100 Safari/537.36""")
         self.open("https://developer.apple.com/search/")
         title = "Testing with WebDriver in Safari"
         self.type('[placeholder*="developer.apple.com"]', title + "\n")

examples/test_tinymce.py

@@ -0,0 +1,35 @@
+import re
+from seleniumbase import BaseCase
+
+
+class MyTestClass(BaseCase):
+
+    def click_menu_item(self, text):
+        self.sleep(0.2)
+        soup = self.get_beautiful_soup(self.get_page_source())
+        pattern = re.compile('%s' % text)
+        the_id = soup.find(text=pattern).parent.parent.attrs["id"]
+        self.click("#%s" % the_id)
+
+    def test_base(self):
+        self.open("https://seleniumbase.io/other/tinymce")
+        self.wait_for_element("div.mce-container-body")
+        self.click_menu_item("File")
+        self.click_menu_item("New document")
+        self.click_menu_item("Paragraph")
+        self.click_menu_item("Heading 2")
+        self.switch_to_frame("iframe#mce_1_ifr")
+        self.send_keys("#tinymce", "Automate anything with SeleniumBase!\n")
+        self.switch_to_default_content()
+        self.click('button i.mce-i-image')
+        self.type('input[aria-label="Width"].mce-textbox', "300")
+        image_url = "https://seleniumbase.io/img/sb_logo_10.png"
+        self.type("input.mce-textbox", image_url + "\n")
+        self.switch_to_frame("iframe#mce_1_ifr")
+        self.click("h2")
+        self.switch_to_default_content()
+        self.post_message("Automate anything with SeleniumBase!")
+        self.click_menu_item("File")
+        self.click_menu_item("Preview")
+        self.switch_to_frame('iframe[sandbox="allow-scripts"]')
+        self.post_message("Learn SeleniumBase Today!")

requirements.txt

@@ -3,7 +3,7 @@ packaging>=20.4
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=49.6.0;python_version>="3.5"
 setuptools-scm>=4.1.2
-wheel>=0.35.0
+wheel>=0.35.1
 six==1.15.0
 nose==1.3.7
 ipdb==0.13.3
@@ -21,7 +21,7 @@ py==1.8.1;python_version<"3.5"
 py==1.9.0;python_version>="3.5"
 pytest==4.6.11;python_version<"3.5"
 pytest==6.0.1;python_version>="3.5"
-pytest-cov==2.10.0
+pytest-cov==2.10.1
 pytest-forked==1.3.0
 pytest-html==1.22.1;python_version<"3.6"
 pytest-html==2.0.1;python_version>="3.6"
@@ -30,7 +30,8 @@ pytest-metadata==1.10.0;python_version>="3.6"
 pytest-ordering==0.6
 pytest-rerunfailures==8.0;python_version<"3.6"
 pytest-rerunfailures==9.0;python_version>="3.6"
-pytest-xdist==1.34.0
+pytest-xdist==1.34.0;python_version<"3.5"
+pytest-xdist==2.0.0;python_version>="3.5"
 parameterized==0.7.4
 soupsieve==1.9.6;python_version<"3.5"
 soupsieve==2.0.1;python_version>="3.5"
@@ -57,6 +58,6 @@ flake8==3.8.3;python_version>="3.5"
 pyflakes==2.1.1;python_version<"3.5"
 pyflakes==2.2.0;python_version>="3.5"
 certifi>=2020.6.20
-allure-pytest==2.8.17
+allure-pytest==2.8.18
 pdfminer.six==20191110;python_version<"3.5"
 pdfminer.six==20200726;python_version>="3.5"

seleniumbase/fixtures/base_case.py

@@ -97,6 +97,14 @@ def __init__(self, *args, **kwargs):
 
     def open(self, url):
         """ Navigates the current browser window to the specified page. """
+        if type(url) is str:
+            url = url.strip()  # Remove leading and trailing whitespace
+        if (type(url) is not str) or not self.__looks_like_a_page_url(url):
+            # url should start with one of the following:
+            # "http:", "https:", "://", "data:", "file:",
+            # "about:", "chrome:", "opera:", or "edge:".
+            msg = 'Did you forget to prefix your URL with "http:" or "https:"?'
+            raise Exception('Invalid URL: "%s"\n%s' % (url, msg))
         self.__last_page_load_url = None
         js_utils.clear_out_console_logs(self.driver)
         if url.startswith("://"):
@@ -5797,9 +5805,10 @@ def __looks_like_a_page_url(self, url):
             navigate to the page if a URL is detected, but will instead call
             self.get_element(URL_AS_A_SELECTOR) if the input in not a URL. """
         if (url.startswith("http:") or url.startswith("https:") or (
-                url.startswith("://") or url.startswith("data:") or (
-                url.startswith("about:") or url.startswith("chrome:") or (
-                url.startswith("file:"))))):
+                url.startswith("://") or url.startswith("chrome:") or (
+                url.startswith("about:") or url.startswith("data:") or (
+                url.startswith("file:") or url.startswith("edge:") or (
+                url.startswith("opera:")))))):
             return True
         else:
             return False
@@ -6367,6 +6376,34 @@ def tearDown(self):
         You'll need to add the following line to the subclass's tearDown():
         super(SubClassOfBaseCase, self).tearDown()
         """
+        try:
+            with_selenium = self.with_selenium
+        except Exception:
+            sub_class_name = str(
+                self.__class__.__bases__[0]).split('.')[-1].split("'")[0]
+            sub_file_name = str(self.__class__.__bases__[0]).split('.')[-2]
+            sub_file_name = sub_file_name + ".py"
+            class_name = str(self.__class__).split('.')[-1].split("'")[0]
+            file_name = str(self.__class__).split('.')[-2] + ".py"
+            class_name_used = sub_class_name
+            file_name_used = sub_file_name
+            if sub_class_name == "BaseCase":
+                class_name_used = class_name
+                file_name_used = file_name
+            fix_setup = "super(%s, self).setUp()" % class_name_used
+            fix_teardown = "super(%s, self).tearDown()" % class_name_used
+            message = ("You're overriding SeleniumBase's BaseCase setUp() "
+                       "method with your own setUp() method, which breaks "
+                       "SeleniumBase. You can fix this by going to your "
+                       "%s class located in your %s file and adding the "
+                       "following line of code AT THE BEGINNING of your "
+                       "setUp() method:\n%s\n\nAlso make sure "
+                       "you have added the following line of code AT THE "
+                       "END of your tearDown() method:\n%s\n"
+                       % (class_name_used, file_name_used,
+                          fix_setup, fix_teardown))
+            raise Exception(message)
+        # *** Start tearDown() officially ***
         self.__slow_mode_pause_if_active()
         has_exception = self.__has_exception()
         if self.__deferred_assert_failures:
@@ -6381,33 +6418,6 @@ def tearDown(self):
         if self.is_pytest:
             # pytest-specific code
             test_id = self.__get_test_id()
-            try:
-                with_selenium = self.with_selenium
-            except Exception:
-                sub_class_name = str(
-                    self.__class__.__bases__[0]).split('.')[-1].split("'")[0]
-                sub_file_name = str(self.__class__.__bases__[0]).split('.')[-2]
-                sub_file_name = sub_file_name + ".py"
-                class_name = str(self.__class__).split('.')[-1].split("'")[0]
-                file_name = str(self.__class__).split('.')[-2] + ".py"
-                class_name_used = sub_class_name
-                file_name_used = sub_file_name
-                if sub_class_name == "BaseCase":
-                    class_name_used = class_name
-                    file_name_used = file_name
-                fix_setup = "super(%s, self).setUp()" % class_name_used
-                fix_teardown = "super(%s, self).tearDown()" % class_name_used
-                message = ("You're overriding SeleniumBase's BaseCase setUp() "
-                           "method with your own setUp() method, which breaks "
-                           "SeleniumBase. You can fix this by going to your "
-                           "%s class located in your %s file and adding the "
-                           "following line of code AT THE BEGINNING of your "
-                           "setUp() method:\n%s\n\nAlso make sure "
-                           "you have added the following line of code AT THE "
-                           "END of your tearDown() method:\n%s\n"
-                           % (class_name_used, file_name_used,
-                              fix_setup, fix_teardown))
-                raise Exception(message)
             if with_selenium:
                 # Save a screenshot if logging is on when an exception occurs
                 if has_exception:

seleniumbase/fixtures/page_utils.py

@@ -106,9 +106,10 @@ def is_valid_url(url):
         r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'  # ...or ip
         r'(?::\d+)?'  # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
-    if regex.match(url) or ((url.startswith('about:') or (
-            url.startswith('data:') or url.startswith('chrome:')))
-            and " " not in url):
+    if regex.match(url) or ((url.startswith("about:") or (
+            url.startswith("data:") or url.startswith("chrome:") or (
+            url.startswith("edge:") or url.startswith("opera:") or (
+            url.startswith("file:")))))):
         return True
     else:
         return False

setup.py

@@ -54,7 +54,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.46.4',
+    version='1.46.5',
     description='Web Automation and Test Framework - https://seleniumbase.io',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -95,7 +95,7 @@
         'setuptools>=44.1.1;python_version<"3.5"',
         'setuptools>=49.6.0;python_version>="3.5"',
         'setuptools-scm',
-        'wheel>=0.35.0',
+        'wheel>=0.35.1',
         'six',
         'nose',
         'ipdb',
@@ -113,7 +113,7 @@
         'py==1.9.0;python_version>="3.5"',
         'pytest==4.6.11;python_version<"3.5"',
         'pytest==6.0.1;python_version>="3.5"',
-        'pytest-cov==2.10.0',
+        'pytest-cov==2.10.1',
         'pytest-forked==1.3.0',
         'pytest-html==1.22.1;python_version<"3.6"',
         'pytest-html==2.0.1;python_version>="3.6"',
@@ -122,7 +122,8 @@
         'pytest-ordering==0.6',
         'pytest-rerunfailures==8.0;python_version<"3.6"',
         'pytest-rerunfailures==9.0;python_version>="3.6"',
-        'pytest-xdist==1.34.0',
+        'pytest-xdist==1.34.0;python_version<"3.5"',
+        'pytest-xdist==2.0.0;python_version>="3.5"',
         'parameterized==0.7.4',
         'soupsieve==1.9.6;python_version<"3.5"',
         'soupsieve==2.0.1;python_version>="3.5"',
@@ -149,7 +150,7 @@
         'pyflakes==2.1.1;python_version<"3.5"',
         'pyflakes==2.2.0;python_version>="3.5"',
         'certifi>=2020.6.20',
-        'allure-pytest==2.8.17',
+        'allure-pytest==2.8.18',
         'pdfminer.six==20191110;python_version<"3.5"',
         'pdfminer.six==20200726;python_version>="3.5"',
     ],