Add option to wait for AngularJS to load

Author: mdmintz

seleniumbase/behave/behave_sb.py

@@ -42,6 +42,7 @@
 -D binary-location=PATH  (Set path of the Chromium browser binary to use.)
 -D driver-version=VER  (Set the chromedriver or uc_driver version to use.)
 -D sjw  (Skip JS Waits for readyState to be "complete" or Angular to load.)
+-D wfa  (Wait for AngularJS to be done loading after specific web actions.)
 -D pls=PLS  (Set pageLoadStrategy on Chrome: "normal", "eager", or "none".)
 -D headless  (Run tests in headless mode. The default arg on Linux OS.)
 -D headless2  (Use the new headless mode, which supports extensions.)
@@ -588,6 +589,10 @@ def get_configured_sb(context):
         if low_key in ["sjw", "skip-js-waits", "skip_js_waits"]:
             settings.SKIP_JS_WAITS = True
             continue
+        # Handle: -D wfa / wait-for-angularjs / wait_for_angularjs
+        if low_key in ["wfa", "wait-for-angularjs", "wait_for_angularjs"]:
+            settings.WAIT_FOR_ANGULARJS = True
+            continue
         # Handle: -D visual-baseline / visual_baseline
         if low_key in ["visual-baseline", "visual_baseline"]:
             sb.visual_baseline = True

seleniumbase/plugins/pytest_plugin.py

@@ -59,6 +59,7 @@ def pytest_addoption(parser):
     --binary-location=PATH  (Set path of the Chromium browser binary to use.)
     --driver-version=VER  (Set the chromedriver or uc_driver version to use.)
     --sjw  (Skip JS Waits for readyState to be "complete" or Angular to load.)
+    --wfa  (Wait for AngularJS to be done loading after specific web actions.)
     --pls=PLS  (Set pageLoadStrategy on Chrome: "normal", "eager", or "none".)
     --headless  (Run tests in headless mode. The default arg on Linux OS.)
     --headless2  (Use the new headless mode, which supports extensions.)
@@ -358,6 +359,17 @@ def pytest_addoption(parser):
                 and wait_for_angularjs(), which are part of many
                 SeleniumBase methods for improving reliability.""",
     )
+    parser.addoption(
+        "--wfa",
+        "--wait_for_angularjs",
+        "--wait-for-angularjs",
+        action="store_true",
+        dest="wait_for_angularjs",
+        default=False,
+        help="""Add waiting for AngularJS. (The default setting
+                was changed to no longer wait for AngularJS to
+                finish loading as an extra JavaScript call.)""",
+    )
     parser.addoption(
         "--with-db_reporting",
         "--with-db-reporting",
@@ -1546,6 +1558,8 @@ def pytest_configure(config):
         settings.ARCHIVE_EXISTING_DOWNLOADS = True
     if config.getoption("skip_js_waits"):
         settings.SKIP_JS_WAITS = True
+    if config.getoption("wait_for_angularjs"):
+        settings.WAIT_FOR_ANGULARJS = True
     sb_config.all_scripts = config.getoption("all_scripts")
     sb_config._time_limit = config.getoption("time_limit")
     sb_config.time_limit = config.getoption("time_limit")

seleniumbase/plugins/sb_manager.py

@@ -76,6 +76,7 @@ def SB(
     binary_location=None,  # Set path of the Chromium browser binary to use.
     driver_version=None,  # Set the chromedriver or uc_driver version to use.
     skip_js_waits=None,  # Skip JS Waits (readyState=="complete" and Angular).
+    wait_for_angularjs=None,  # Wait for AngularJS to load after some actions.
     use_wire=None,  # Use selenium-wire's webdriver over selenium webdriver.
     external_pdf=None,  # Set Chrome "plugins.always_open_pdf_externally":True.
     is_mobile=None,  # Use the mobile device emulator while running tests.
@@ -109,6 +110,7 @@ def SB(
     wire=None,  # Shortcut / Duplicate of "use_wire".
     pls=None,  # Shortcut / Duplicate of "page_load_strategy".
     sjw=None,  # Shortcut / Duplicate of "skip_js_waits".
+    wfa=None,  # Shortcut / Duplicate of "wait_for_angularjs".
     save_screenshot=None,  # Save a screenshot at the end of each test.
     no_screenshot=None,  # No screenshots saved unless tests directly ask it.
     page_load_strategy=None,  # Set Chrome PLS to "normal", "eager", or "none".
@@ -607,6 +609,17 @@ def SB(
             settings.SKIP_JS_WAITS = True
     elif skip_js_waits:
         settings.SKIP_JS_WAITS = skip_js_waits
+    if wfa is not None and wait_for_angularjs is None:
+        wait_for_angularjs = wfa
+    if wait_for_angularjs is None:
+        if (
+            "--wfa" in sys_argv
+            or "--wait_for_angularjs" in sys_argv
+            or "--wait-for-angularjs" in sys_argv
+        ):
+            settings.WAIT_FOR_ANGULARJS = True
+    elif wait_for_angularjs:
+        settings.WAIT_FOR_ANGULARJS = wait_for_angularjs
     if save_screenshot is None:
         if (
             "--screenshot" in sys_argv

seleniumbase/plugins/selenium_plugin.py

@@ -40,6 +40,7 @@ class SeleniumBrowser(Plugin):
     --binary-location=PATH  (Set path of the Chromium browser binary to use.)
     --driver-version=VER  (Set the chromedriver or uc_driver version to use.)
     --sjw  (Skip JS Waits for readyState to be "complete" or Angular to load.)
+    --wfa  (Wait for AngularJS to be done loading after specific web actions.)
     --pls=PLS  (Set pageLoadStrategy on Chrome: "normal", "eager", or "none".)
     --headless  (Run tests in headless mode. The default arg on Linux OS.)
     --headless2  (Use the new headless mode, which supports extensions.)
@@ -178,6 +179,17 @@ def options(self, parser, env):
                     and wait_for_angularjs(), which are part of many
                     SeleniumBase methods for improving reliability.""",
         )
+        parser.addoption(
+            "--wfa",
+            "--wait_for_angularjs",
+            "--wait-for-angularjs",
+            action="store_true",
+            dest="wait_for_angularjs",
+            default=False,
+            help="""Add waiting for AngularJS. (The default setting
+                    was changed to no longer wait for AngularJS to
+                    finish loading as an extra JavaScript call.)""",
+        )
         parser.addoption(
             "--protocol",
             action="store",
@@ -1105,6 +1117,8 @@ def beforeTest(self, test):
         test.test.start_page = self.options.start_page
         if self.options.skip_js_waits:
             settings.SKIP_JS_WAITS = True
+        if self.options.wait_for_angularjs:
+            settings.WAIT_FOR_ANGULARJS = True
         test.test.protocol = self.options.protocol
         test.test.servername = self.options.servername
         test.test.port = self.options.port