Change default settings for AngularJS waits

Author: mdmintz

examples/custom_settings.py

@@ -48,7 +48,7 @@
 # Called after self.click(selector), NOT element.click()
 WAIT_FOR_RSC_ON_CLICKS = False
 # Wait for AngularJS calls to complete after various browser actions.
-WAIT_FOR_ANGULARJS = True
+WAIT_FOR_ANGULARJS = False
 # Skip ALL calls to wait_for_ready_state_complete() and wait_for_angularjs().
 SKIP_JS_WAITS = False
 

seleniumbase/config/settings.py

@@ -75,7 +75,7 @@
 # Called after self.click(selector), NOT element.click()
 WAIT_FOR_RSC_ON_CLICKS = False
 # Wait for AngularJS calls to complete after various browser actions.
-WAIT_FOR_ANGULARJS = True
+WAIT_FOR_ANGULARJS = False
 # Skip all calls to wait_for_ready_state_complete() and wait_for_angularjs().
 SKIP_JS_WAITS = False
 

seleniumbase/fixtures/js_utils.py

@@ -48,19 +48,28 @@ def wait_for_ready_state_complete(driver, timeout=settings.LARGE_TIMEOUT):
     return False  # readyState stayed "interactive" (Not "complete")
 
 
-def execute_async_script(driver, script, timeout=settings.EXTREME_TIMEOUT):
+def execute_async_script(driver, script, timeout=settings.LARGE_TIMEOUT):
     driver.set_script_timeout(timeout)
     return driver.execute_async_script(script)
 
 
 def wait_for_angularjs(driver, timeout=settings.LARGE_TIMEOUT, **kwargs):
     if hasattr(settings, "SKIP_JS_WAITS") and settings.SKIP_JS_WAITS:
         return
+    try:
+        # This closes pop-up alerts
+        driver.execute_script("")
+    except Exception:
+        pass
+    if hasattr(driver, "_is_using_uc") and driver._is_using_uc:
+        # Calling AngularJS waits may make UC Mode detectable.
+        # Instead, pause for a brief moment, and then return.
+        time.sleep(0.007)
+        return
     if not settings.WAIT_FOR_ANGULARJS:
         return
     if timeout == settings.MINI_TIMEOUT:
-        timeout = settings.MINI_TIMEOUT / 2.0
-
+        timeout = settings.MINI_TIMEOUT / 4.0
     NG_WRAPPER = (
         "%(prefix)s"
         "var $elm=document.querySelector("
@@ -84,15 +93,10 @@ def wait_for_angularjs(driver, timeout=settings.LARGE_TIMEOUT, **kwargs):
         "handler": handler,
         "suffix": suffix,
     }
-    try:
-        # This closes any pop-up alerts (otherwise the next part fails)
-        driver.execute_script("")
-    except Exception:
-        pass
     try:
         execute_async_script(driver, script, timeout=timeout)
     except Exception:
-        time.sleep(0.05)
+        time.sleep(0.0456)
 
 
 def convert_to_css_selector(selector, by=By.CSS_SELECTOR):