Merge pull request #235 from seleniumbase/masterqa-upgrade

MasterQA Upgrade

Author: mdmintz

examples/master_qa/basic_masterqa_test.py

@@ -4,10 +4,9 @@
 class MasterQATests(MasterQA):
 
     def test_masterqa(self):
-        self.open("http://xkcd.com/1700/")
+        self.open("https://xkcd.com/1700/")
         self.verify("Do you see a webcomic?")
-        self.click_link_text('Store')
-        self.click_link_text('all the things')
-        self.verify("Do you see items for sale?")
-        self.update_text("input.search-input", "Robots\n")
-        self.verify("Do you see robots in the search results?")
+        self.highlight_click('link=Blag')
+        self.verify('Do you see a blog archive?')
+        self.highlight_update_text("input#s", "Dragons\n")
+        self.verify('Do you see "dragons" in the search results?')

examples/master_qa/masterqa_test.py

@@ -4,13 +4,13 @@
 class MasterQATests(MasterQA):
 
     def test_xkcd(self):
-        self.open("http://xkcd.com/1512/")
+        self.open("https://xkcd.com/1512/")
         for i in range(4):
             self.click('a[rel="next"]')
         for i in range(3):
             self.click('a[rel="prev"]')
         self.verify()
-        self.open("http://xkcd.com/1520/")
+        self.open("https://xkcd.com/1520/")
         for i in range(2):
             self.click('a[rel="next"]')
         self.verify("Can you find the moon?")
@@ -19,7 +19,7 @@ def test_xkcd(self):
         self.click_link_text('Blag')
         self.update_text("input#s", "Robots!\n")
         self.verify("Does it say 'Hooray robots' on the page?")
-        self.open("http://xkcd.com/213/")
+        self.open("https://xkcd.com/213/")
         for i in range(5):
             self.click('a[rel="prev"]')
         self.verify("Does the page say 'Abnormal Expressions'?")

help_docs/method_summary.md

@@ -114,6 +114,8 @@ self.play_tour(name=None)
 
 self.export_tour(name=None, filename="my_tour.js")
 
+self.activate_jquery_confirm()
+
 self.activate_messenger()
 
 self.post_message(message, style="info", duration=None)

seleniumbase/config/settings.py

@@ -78,7 +78,7 @@
 
 # The time delay (in seconds) before the validation pop-up appears
 # This value can be overwritten on the command line. Ex: --verify_delay=0.5
-MASTERQA_WAIT_TIME_BEFORE_VERIFY = 1.0
+MASTERQA_WAIT_TIME_BEFORE_VERIFY = 0.75
 
 # If True, the automation will start in full-screen mode
 MASTERQA_START_IN_FULL_SCREEN_MODE = False

seleniumbase/core/tour_helper.py

@@ -10,7 +10,6 @@
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import js_utils
 from seleniumbase.fixtures import page_actions
-from seleniumbase.fixtures import page_utils
 
 
 def raise_unable_to_load_jquery_exception(driver):
@@ -691,7 +690,7 @@ def export_tour(tour_steps, name=None, filename="my_tour.js"):
         bootstrap_tour_js = constants.BootstrapTour.MIN_JS
         backdrop_style = style_sheet.bt_backdrop_style
         backdrop_style = backdrop_style.replace('\n', '')
-        backdrop_style = page_utils.escape_quotes_if_needed(backdrop_style)
+        backdrop_style = js_utils.escape_quotes_if_needed(backdrop_style)
         instructions += 'injectJS("%s");' % jquery_js
         instructions += '\n\n////////  Resources - Load 2  ////////\n\n'
         instructions += 'injectCSS("%s");\n' % bootstrap_tour_css
@@ -703,7 +702,7 @@ def export_tour(tour_steps, name=None, filename="my_tour.js"):
         hopscotch_js = constants.Hopscotch.MIN_JS
         backdrop_style = style_sheet.hops_backdrop_style
         backdrop_style = backdrop_style.replace('\n', '')
-        backdrop_style = page_utils.escape_quotes_if_needed(backdrop_style)
+        backdrop_style = js_utils.escape_quotes_if_needed(backdrop_style)
         instructions += 'injectCSS("%s");\n' % hopscotch_css
         instructions += 'injectStyle("%s");\n' % backdrop_style
         instructions += 'injectJS("%s");' % hopscotch_js
@@ -727,7 +726,7 @@ def export_tour(tour_steps, name=None, filename="my_tour.js"):
         spinner_css = constants.Messenger.SPINNER_CSS
         backdrop_style = style_sheet.sh_backdrop_style
         backdrop_style = backdrop_style.replace('\n', '')
-        backdrop_style = page_utils.escape_quotes_if_needed(backdrop_style)
+        backdrop_style = js_utils.escape_quotes_if_needed(backdrop_style)
         instructions += 'injectCSS("%s");\n' % spinner_css
         instructions += 'injectJS("%s");\n' % jquery_js
         instructions += 'injectJS("%s");' % tether_js

seleniumbase/fixtures/base_case.py

@@ -748,10 +748,10 @@ def activate_jquery(self):
         js_utils.activate_jquery(self.driver)
 
     def __are_quotes_escaped(self, string):
-        return page_utils.are_quotes_escaped(string)
+        return js_utils.are_quotes_escaped(string)
 
     def __escape_quotes_if_needed(self, string):
-        return page_utils.escape_quotes_if_needed(string)
+        return js_utils.escape_quotes_if_needed(string)
 
     def create_tour(self, name=None, theme=None):
         """ Creates a tour for a website. By default, the Shepherd Javascript
@@ -1173,6 +1173,9 @@ def export_tour(self, name=None, filename="my_tour.js"):
                    save the tour to. """
         tour_helper.export_tour(self._tour_steps, name=name, filename=filename)
 
+    def activate_jquery_confirm(self):
+        js_utils.activate_jquery_confirm(self.driver)
+
     def activate_messenger(self):
         js_utils.activate_messenger(self.driver)
 
@@ -1453,7 +1456,7 @@ def ad_block(self):
 
     def jq_format(self, code):
         # DEPRECATED - Use re.escape() instead, which does the action you want.
-        return page_utils._jq_format(code)
+        return js_utils._jq_format(code)
 
     def get_domain_url(self, url):
         return page_utils.get_domain_url(url)

seleniumbase/fixtures/constants.py

@@ -85,6 +85,14 @@ class IntroJS:
               "intro.js/%s/intro.min.js" % VER)
 
 
+class JqueryConfirm:
+    VER = "3.3.2"
+    MIN_CSS = ("//cdnjs.cloudflare.com/ajax/libs/"
+               "jquery-confirm/%s/jquery-confirm.min.css" % VER)
+    MIN_JS = ("//cdnjs.cloudflare.com/ajax/libs/"
+              "jquery-confirm/%s/jquery-confirm.min.js" % VER)
+
+
 class Shepherd:
     VER = "1.8.1"
     MIN_JS = ("//cdnjs.cloudflare.com/ajax/libs/"

seleniumbase/fixtures/js_utils.py

@@ -8,7 +8,14 @@
 from selenium.common.exceptions import WebDriverException
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
-from seleniumbase.fixtures import page_utils
+
+
+def is_jquery_activated(driver):
+    try:
+        driver.execute_script("jQuery('html')")  # Fails if jq is not defined
+        return True
+    except Exception:
+        return False
 
 
 def activate_jquery(driver):
@@ -42,6 +49,37 @@ def activate_jquery(driver):
         '''directive. ''' % driver.current_url)
 
 
+def are_quotes_escaped(string):
+    if (string.count("\\'") != string.count("'") or
+            string.count('\\"') != string.count('"')):
+        return True
+    return False
+
+
+def escape_quotes_if_needed(string):
+    """
+    re.escape() works differently in Python 3.7.0 than earlier versions:
+
+    Python 3.6.5:
+    >>> import re
+    >>> re.escape('"')
+    '\\"'
+
+    Python 3.7.0:
+    >>> import re
+    >>> re.escape('"')
+    '"'
+
+    SeleniumBase needs quotes to be properly escaped for Javascript calls.
+    """
+    if are_quotes_escaped(string):
+        if string.count("'") != string.count("\\'"):
+            string = string.replace("'", "\\'")
+        if string.count('"') != string.count('\\"'):
+            string = string.replace('"', '\\"')
+    return string
+
+
 def safe_execute_script(driver, script):
     """ When executing a script that contains a jQuery command,
         it's important that the jQuery library has been loaded first.
@@ -125,7 +163,7 @@ def wait_for_css_query_selector(
     for x in range(int(timeout * 10)):
         try:
             selector = re.escape(selector)
-            selector = page_utils.escape_quotes_if_needed(selector)
+            selector = escape_quotes_if_needed(selector)
             element = driver.execute_script(
                 """return document.querySelector('%s')""" % selector)
             if element:
@@ -230,7 +268,7 @@ def add_css_link(driver, css_link):
               head.appendChild(link);
            }
            injectCSS("%s");""")
-    css_link = page_utils.escape_quotes_if_needed(css_link)
+    css_link = escape_quotes_if_needed(css_link)
     driver.execute_script(script_to_add_css % css_link)
 
 
@@ -247,7 +285,7 @@ def add_js_link(driver, js_link):
               head.appendChild(script);
            }
            injectJS("%s");""")
-    js_link = page_utils.escape_quotes_if_needed(js_link)
+    js_link = escape_quotes_if_needed(js_link)
     driver.execute_script(script_to_add_js % js_link)
 
 
@@ -262,7 +300,7 @@ def add_css_style(driver, css_style):
            }
            injectStyle("%s");""")
     css_style = css_style.replace('\n', '')
-    css_style = page_utils.escape_quotes_if_needed(css_style)
+    css_style = escape_quotes_if_needed(css_style)
     driver.execute_script(add_css_style_script % css_style)
 
 
@@ -278,7 +316,7 @@ def add_js_code_from_link(driver, js_link):
         '''s.appendChild(document.createTextNode("%s"));'''
         '''h.appendChild(s);''')
     js_code = js_code.replace('\n', '')
-    js_code = page_utils.escape_quotes_if_needed(js_code)
+    js_code = escape_quotes_if_needed(js_code)
     driver.execute_script(add_js_code_script % js_code)
 
 
@@ -299,6 +337,35 @@ def add_meta_tag(driver, http_equiv=None, content=None):
     driver.execute_script(script_to_add_meta)
 
 
+def is_jquery_confirm_activated(driver):
+    try:
+        driver.execute_script("jconfirm")  # Fails if jq_confirm is not defined
+        return True
+    except Exception:
+        return False
+
+
+def activate_jquery_confirm(driver):
+    jquery_js = constants.JQuery.MIN_JS
+    jq_confirm_css = constants.JqueryConfirm.MIN_CSS
+    jq_confirm_js = constants.JqueryConfirm.MIN_JS
+
+    if not is_jquery_activated(driver):
+        add_js_link(driver, jquery_js)
+    add_css_link(driver, jq_confirm_css)
+    add_js_link(driver, jq_confirm_js)
+
+    for x in range(int(settings.MINI_TIMEOUT * 10.0)):
+        # jQuery-Confirm needs a small amount of time to load & activate.
+        try:
+            driver.execute_script("jconfirm")
+            wait_for_ready_state_complete(driver)
+            wait_for_angularjs(driver)
+            return
+        except Exception:
+            time.sleep(0.1)
+
+
 def activate_messenger(driver):
     jquery_js = constants.JQuery.MIN_JS
     messenger_css = constants.Messenger.MIN_CSS
@@ -395,7 +462,7 @@ def post_message(driver, message, msg_dur, style="info", duration=None):
         else:
             duration = msg_dur
     message = re.escape(message)
-    message = page_utils.escape_quotes_if_needed(message)
+    message = escape_quotes_if_needed(message)
     messenger_script = ('''Messenger().post({message: "%s", type: "%s", '''
                         '''hideAfter: %s, hideOnNavigate: true});'''
                         % (message, style, duration))
@@ -548,3 +615,18 @@ def slow_scroll_to_element(driver, element, browser):
     if distance > 430 or distance < -300:
         # Add small recovery time for long-distance slow-scrolling
         time.sleep(0.162)
+
+
+def _jq_format(code):
+    """
+    DEPRECATED - Use re.escape() instead, which performs the intended action.
+    Use before throwing raw code such as 'div[tab="advanced"]' into jQuery.
+    Selectors with quotes inside of quotes would otherwise break jQuery.
+    If you just want to escape quotes, there's escape_quotes_if_needed().
+    This is similar to "json.dumps(value)", but with one less layer of quotes.
+    """
+    code = code.replace('\\', '\\\\').replace('\t', '\\t').replace('\n', '\\n')
+    code = code.replace('\"', '\\\"').replace('\'', '\\\'')
+    code = code.replace('\v', '\\v').replace('\a', '\\a').replace('\f', '\\f')
+    code = code.replace('\b', '\\b').replace(r'\u', '\\u').replace('\r', '\\r')
+    return code

seleniumbase/fixtures/page_utils.py

@@ -83,55 +83,9 @@ def _save_data_as(data, destination_folder, file_name):
     out_file.close()
 
 
-def are_quotes_escaped(string):
-    if (string.count("\\'") != string.count("'") or
-            string.count('\\"') != string.count('"')):
-        return True
-    return False
-
-
-def escape_quotes_if_needed(string):
-    """
-    re.escape() works differently in Python 3.7.0 than earlier versions:
-
-    Python 3.6.5:
-    >>> import re
-    >>> re.escape('"')
-    '\\"'
-
-    Python 3.7.0:
-    >>> import re
-    >>> re.escape('"')
-    '"'
-
-    SeleniumBase needs quotes to be properly escaped for Javascript calls.
-    """
-    if are_quotes_escaped(string):
-        if string.count("'") != string.count("\\'"):
-            string = string.replace("'", "\\'")
-        if string.count('"') != string.count('\\"'):
-            string = string.replace('"', '\\"')
-    return string
-
-
 def make_css_match_first_element_only(selector):
     # Only get the first match
     last_syllable = selector.split(' ')[-1]
     if ':' not in last_syllable and ':contains' not in selector:
         selector += ':first'
     return selector
-
-
-def _jq_format(code):
-    """
-    DEPRECATED - Use re.escape() instead, which performs the intended action.
-    Use before throwing raw code such as 'div[tab="advanced"]' into jQuery.
-    Selectors with quotes inside of quotes would otherwise break jQuery.
-    If you just want to escape quotes, there's escape_quotes_if_needed().
-    This is similar to "json.dumps(value)", but with one less layer of quotes.
-    """
-    code = code.replace('\\', '\\\\').replace('\t', '\\t').replace('\n', '\\n')
-    code = code.replace('\"', '\\\"').replace('\'', '\\\'')
-    code = code.replace('\v', '\\v').replace('\a', '\\a').replace('\f', '\\f')
-    code = code.replace('\b', '\\b').replace(r'\u', '\\u').replace('\r', '\\r')
-    return code