Merge pull request #236 from seleniumbase/masterqa-updates

mdmintz · web-flow · commit a02f54de54af · 2018-11-03T17:57:07.000-04:00
MasterQA Updates
diff --git a/seleniumbase/config/settings.py b/seleniumbase/config/settings.py
@@ -76,9 +76,9 @@
 # The default message that appears when you don't specify a custom message
 MASTERQA_DEFAULT_VALIDATION_MESSAGE = "Does the page look good?"
 
-# 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 = 0.75
+# The time delay (in seconds) before the MasterQA validation pop-up appears.
+# This value can be overwritten on the command line. Ex: --verify_delay=1.0
+MASTERQA_WAIT_TIME_BEFORE_VERIFY = 0.5
 
 # If True, the automation will start in full-screen mode
 MASTERQA_START_IN_FULL_SCREEN_MODE = False
diff --git a/seleniumbase/fixtures/js_utils.py b/seleniumbase/fixtures/js_utils.py
@@ -10,6 +10,69 @@
 from seleniumbase.fixtures import constants
 
 
+def wait_for_ready_state_complete(driver, timeout=settings.EXTREME_TIMEOUT):
+    """
+    The DOM (Document Object Model) has a property called "readyState".
+    When the value of this becomes "complete", page resources are considered
+    fully loaded (although AJAX and other loads might still be happening).
+    This method will wait until document.readyState == "complete".
+    """
+
+    start_ms = time.time() * 1000.0
+    stop_ms = start_ms + (timeout * 1000.0)
+    for x in range(int(timeout * 10)):
+        try:
+            ready_state = driver.execute_script("return document.readyState")
+        except WebDriverException:
+            # Bug fix for: [Permission denied to access property "document"]
+            time.sleep(0.03)
+            return True
+        if ready_state == u'complete':
+            time.sleep(0.01)  # Better be sure everything is done loading
+            return True
+        else:
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
+            time.sleep(0.1)
+    raise Exception(
+        "Page elements never fully loaded after %s seconds!" % timeout)
+
+
+def execute_async_script(driver, script, timeout=settings.EXTREME_TIMEOUT):
+    driver.set_script_timeout(timeout)
+    return driver.execute_async_script(script)
+
+
+def wait_for_angularjs(driver, timeout=settings.LARGE_TIMEOUT, **kwargs):
+    if not settings.WAIT_FOR_ANGULARJS:
+        return
+
+    NG_WRAPPER = '%(prefix)s' \
+                 'var $elm=document.querySelector(' \
+                 '\'[data-ng-app],[ng-app],.ng-scope\')||document;' \
+                 'if(window.angular && angular.getTestability){' \
+                 'angular.getTestability($elm).whenStable(%(handler)s)' \
+                 '}else{' \
+                 'var $inj;try{$inj=angular.element($elm).injector()||' \
+                 'angular.injector([\'ng\'])}catch(ex){' \
+                 '$inj=angular.injector([\'ng\'])};$inj.get=$inj.get||' \
+                 '$inj;$inj.get(\'$browser\').' \
+                 'notifyWhenNoOutstandingRequests(%(handler)s)}' \
+                 '%(suffix)s'
+    def_pre = 'var cb=arguments[arguments.length-1];if(window.angular){'
+    prefix = kwargs.pop('prefix', def_pre)
+    handler = kwargs.pop('handler', 'function(){cb(true)}')
+    suffix = kwargs.pop('suffix', '}else{cb(false)}')
+    script = NG_WRAPPER % {'prefix': prefix,
+                           'handler': handler,
+                           'suffix': suffix}
+    try:
+        execute_async_script(driver, script, timeout=timeout)
+    except Exception:
+        time.sleep(0.05)
+
+
 def is_jquery_activated(driver):
     try:
         driver.execute_script("jQuery('html')")  # Fails if jq is not defined
@@ -18,6 +81,22 @@ def is_jquery_activated(driver):
         return False
 
 
+def wait_for_jquery_active(driver, timeout=None):
+    if not timeout:
+        timeout = int(settings.MINI_TIMEOUT * 10.0)
+    else:
+        timeout = int(timeout * 10.0)
+    for x in range(timeout):
+        # jQuery needs a small amount of time to activate.
+        try:
+            driver.execute_script("jQuery('html')")
+            wait_for_ready_state_complete(driver)
+            wait_for_angularjs(driver)
+            return
+        except Exception:
+            time.sleep(0.1)
+
+
 def activate_jquery(driver):
     """ If "jQuery is not defined", use this method to activate it for use.
         This happens because jQuery is not always defined on web sites. """
@@ -92,69 +171,6 @@ def safe_execute_script(driver, script):
         driver.execute_script(script)
 
 
-def wait_for_ready_state_complete(driver, timeout=settings.EXTREME_TIMEOUT):
-    """
-    The DOM (Document Object Model) has a property called "readyState".
-    When the value of this becomes "complete", page resources are considered
-    fully loaded (although AJAX and other loads might still be happening).
-    This method will wait until document.readyState == "complete".
-    """
-
-    start_ms = time.time() * 1000.0
-    stop_ms = start_ms + (timeout * 1000.0)
-    for x in range(int(timeout * 10)):
-        try:
-            ready_state = driver.execute_script("return document.readyState")
-        except WebDriverException:
-            # Bug fix for: [Permission denied to access property "document"]
-            time.sleep(0.03)
-            return True
-        if ready_state == u'complete':
-            time.sleep(0.01)  # Better be sure everything is done loading
-            return True
-        else:
-            now_ms = time.time() * 1000.0
-            if now_ms >= stop_ms:
-                break
-            time.sleep(0.1)
-    raise Exception(
-        "Page elements never fully loaded after %s seconds!" % timeout)
-
-
-def execute_async_script(driver, script, timeout=settings.EXTREME_TIMEOUT):
-    driver.set_script_timeout(timeout)
-    return driver.execute_async_script(script)
-
-
-def wait_for_angularjs(driver, timeout=settings.LARGE_TIMEOUT, **kwargs):
-    if not settings.WAIT_FOR_ANGULARJS:
-        return
-
-    NG_WRAPPER = '%(prefix)s' \
-                 'var $elm=document.querySelector(' \
-                 '\'[data-ng-app],[ng-app],.ng-scope\')||document;' \
-                 'if(window.angular && angular.getTestability){' \
-                 'angular.getTestability($elm).whenStable(%(handler)s)' \
-                 '}else{' \
-                 'var $inj;try{$inj=angular.element($elm).injector()||' \
-                 'angular.injector([\'ng\'])}catch(ex){' \
-                 '$inj=angular.injector([\'ng\'])};$inj.get=$inj.get||' \
-                 '$inj;$inj.get(\'$browser\').' \
-                 'notifyWhenNoOutstandingRequests(%(handler)s)}' \
-                 '%(suffix)s'
-    def_pre = 'var cb=arguments[arguments.length-1];if(window.angular){'
-    prefix = kwargs.pop('prefix', def_pre)
-    handler = kwargs.pop('handler', 'function(){cb(true)}')
-    suffix = kwargs.pop('suffix', '}else{cb(false)}')
-    script = NG_WRAPPER % {'prefix': prefix,
-                           'handler': handler,
-                           'suffix': suffix}
-    try:
-        execute_async_script(driver, script, timeout=timeout)
-    except Exception:
-        time.sleep(0.05)
-
-
 def wait_for_css_query_selector(
         driver, selector, timeout=settings.SMALL_TIMEOUT):
     element = None
@@ -352,10 +368,11 @@ def activate_jquery_confirm(driver):
 
     if not is_jquery_activated(driver):
         add_js_link(driver, jquery_js)
+        wait_for_jquery_active(driver, timeout=0.6)
     add_css_link(driver, jq_confirm_css)
     add_js_link(driver, jq_confirm_js)
 
-    for x in range(int(settings.MINI_TIMEOUT * 10.0)):
+    for x in range(7):
         # jQuery-Confirm needs a small amount of time to load & activate.
         try:
             driver.execute_script("jconfirm")
diff --git a/seleniumbase/masterqa/ReadMe.md b/seleniumbase/masterqa/ReadMe.md
@@ -2,7 +2,7 @@
 
 ### MasterQA bridges the gap between manual QA and automated QA by combining manual verification steps with SeleniumBase automation scripts.
 
-![](https://cdn2.hubspot.net/hubfs/100006/images/masterqa3.gif "MasterQA")
+![](https://cdn2.hubspot.net/hubfs/100006/images/masterqa6.gif "MasterQA")
 
 Here's some example code from [basic_masterqa_test.py](https://github.com/seleniumbase/SeleniumBase/blob/master/examples/basic_masterqa_test.py):
 
diff --git a/seleniumbase/masterqa/master_qa.py b/seleniumbase/masterqa/master_qa.py
@@ -60,18 +60,24 @@ def clear_out_old_logs(self, archive_past_runs=True, get_log_folder=False):
 
     def jq_confirm_dialog(self, question):
         count = self.manual_check_count + 1
-        question = js_utils.escape_quotes_if_needed(question)
+        title_content = ('<center><font color="#7700bb">Manual Check #%s:'
+                         '</font></center><hr><font color="#0066ff">%s</font>'
+                         '' % (count, question))
+        title_content = js_utils.escape_quotes_if_needed(title_content)
         jqcd = ("""jconfirm({
-                    boxWidth: '30%%',
+                    boxWidth: '32.5%%',
                     useBootstrap: false,
                     containerFluid: false,
-                    theme: 'light',
+                    animationBounce: 1,
+                    type: 'default',
+                    theme: 'bootstrap',
+                    typeAnimated: true,
                     animation: 'scale',
                     draggable: true,
-                    dragWindowGap: 0,
+                    dragWindowGap: 1,
                     container: 'body',
-                    title: 'Manual Check #%s:',
-                    content: '<h3><b>%s</b></h3>',
+                    title: '%s',
+                    content: '',
                     buttons: {
                         fail_button: {
                             btnClass: 'btn-red',
@@ -88,7 +94,7 @@ def jq_confirm_dialog(self, question):
                             }
                         }
                     }
-                });""" % (count, question))
+                });""" % title_content)
         self.execute_script(jqcd)
 
     def manual_page_check(self, *args):
@@ -106,11 +112,10 @@ def manual_page_check(self, *args):
             question = instructions
 
         use_jqc = False
+        self.wait_for_ready_state_complete()
         if js_utils.is_jquery_confirm_activated(self.driver):
             use_jqc = True
         else:
-            if self.browser == "firefox":
-                js_utils.activate_jquery(self.driver)
             js_utils.activate_jquery_confirm(self.driver)
             get_jqc = None
             try:
@@ -374,10 +379,7 @@ def process_manual_check_results(self, auto_close_results_page=False):
         self.open("file://%s" % archived_results_file)
         if auto_close_results_page:
             # Long enough to notice the results before closing the page
-            wait_time_before_verify = WAIT_TIME_BEFORE_VERIFY
-            if self.verify_delay:
-                wait_time_before_verify = float(self.verify_delay)
-            time.sleep(wait_time_before_verify)
+            time.sleep(1.0)
         else:
             # The user can decide when to close the results page
             print("\n*** Close the html report window to continue ***")
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.17.0',
+    version='1.17.1',
     description='All-in-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',
