seleniumbase 4.16.2__py3-none-any.whl → 4.16.3__py3-none-any.whl

sbase/steps.py

@@ -168,6 +168,19 @@ def assert_exact_text(context, text, selector):
     sb.assert_exact_text(text, selector)
 
 
+@step("Assert non-empty text in '{selector}'")
+@step('Assert non-empty text in "{selector}"')
+@step("Assert text in '{selector}' is not empty")
+@step('Assert text in "{selector}" is not empty')
+@step("Text in '{selector}' should be non-empty")
+@step('Text in "{selector}" should be non-empty')
+@step("Text in '{selector}' should not be empty")
+@step('Text in "{selector}" should not be empty')
+def assert_non_empty_text(context, selector):
+    sb = context.sb
+    sb.assert_non_empty_text(selector)
+
+
 @step("Highlight '{selector}'")
 @step('Highlight "{selector}"')
 @step("Highlight element '{selector}'")
@@ -492,6 +505,49 @@ def wait_for_text_in_element(context, text, selector):
     sb.wait_for_text(text, selector)
 
 
+@step("Wait for exact text '{text}' in '{selector}'")
+@step('Wait for exact text "{text}" in "{selector}"')
+@step("Wait for exact text '{text}' in \"{selector}\"")
+@step('Wait for exact text "{text}" in \'{selector}\'')
+@step("Wait for '{selector}' to have exact text '{text}'")
+@step('Wait for "{selector}" to have exact text "{text}"')
+@step('Wait for "{selector}" to have exact text \'{text}\'')
+@step("Wait for '{selector}' to have exact text \"{text}\"")
+@step("User waits for exact text '{text}' in '{selector}'")
+@step('User waits for exact text "{text}" in "{selector}"')
+@step("User waits for exact text '{text}' in \"{selector}\"")
+@step('User waits for exact text "{text}" in \'{selector}\'')
+@step("User waits for '{selector}' to have exact text '{text}'")
+@step('User waits for "{selector}" to have exact text "{text}"')
+@step('User waits for "{selector}" to have exact text \'{text}\'')
+@step("User waits for '{selector}' to have exact text \"{text}\"")
+def wait_for_exact_text_in_element(context, text, selector):
+    sb = context.sb
+    text = normalize_text(text)
+    sb.wait_for_exact_text(text, selector)
+
+
+@step("Wait for non-empty text in '{selector}'")
+@step('Wait for non-empty text in "{selector}"')
+@step("Wait for '{selector}' to have non-empty text")
+@step('Wait for "{selector}" to have non-empty text')
+@step("User waits for non-empty text in '{selector}'")
+@step('User waits for non-empty text in "{selector}"')
+@step("User waits for '{selector}' to have non-empty text")
+@step('User waits for "{selector}" to have non-empty text')
+@step("Wait for '{selector}' to not have text")
+@step('Wait for "{selector}" to not have text')
+@step("Wait for text in '{selector}' to not be empty")
+@step('Wait for text in "{selector}" to not be empty')
+@step("User waits for '{selector}' to not have text")
+@step('User waits for "{selector}" to not have text')
+@step("User waits for text in '{selector}' to not be empty")
+@step('User waits for text in "{selector}" to not be empty')
+def wait_for_non_empty_text_in_element(context, selector):
+    sb = context.sb
+    sb.wait_for_non_empty_text(selector)
+
+
 @step("Wait for text '{text}'")
 @step('Wait for text "{text}"')
 @step("User waits for text '{text}'")
@@ -839,12 +895,21 @@ def deferred_assert_text(context, text):
 
 @step("Deferred assert exact text '{text}' in '{selector}'")
 @step('Deferred assert exact text "{text}" in "{selector}"')
+@step("Deferred assert exact text '{text}' in \"{selector}\"")
+@step('Deferred assert exact text "{text}" in \'{selector}\'')
 def deferred_assert_exact_text(context, text, selector):
     sb = context.sb
     text = normalize_text(text)
     sb.deferred_assert_exact_text(text, selector)
 
 
+@step("Deferred assert non-empty text in '{selector}'")
+@step('Deferred assert non-empty text in "{selector}"')
+def deferred_assert_non_empty_text(context, selector):
+    sb = context.sb
+    sb.deferred_assert_non_empty_text(selector)
+
+
 @step("Process deferred asserts")
 def process_deferred_asserts(context):
     sb = context.sb

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.16.2"
+__version__ = "4.16.3"

seleniumbase/behave/behave_helper.py

@@ -435,18 +435,46 @@ def generate_gherkin(srt_actions):
                     sb_actions.append('%s "%s"' % (method, action[1][0]))
                 else:
                     sb_actions.append("%s '%s'" % (method, action[1][0]))
+        elif action[0] == "asnet":
+            method = "Assert non-empty text in"
+            if '"' not in action[1]:
+                sb_actions.append('%s "%s"' % (method, action[1]))
+            elif "'" not in action[1]:
+                sb_actions.append("%s '%s'" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    "%s '%s'" % (method, action[1].replace("'", "\\'"))
+                )
         elif action[0] == "da_el":
             method = "Deferred assert element"
             if '"' not in action[1]:
                 sb_actions.append('%s "%s"' % (method, action[1]))
-            else:
+            elif "'" not in action[1]:
                 sb_actions.append("%s '%s'" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    "%s '%s'" % (method, action[1].replace("'", "\\'"))
+                )
         elif action[0] == "da_ep":
             method = "Deferred assert element present"
             if '"' not in action[1]:
                 sb_actions.append('%s "%s"' % (method, action[1]))
+            elif "'" not in action[1]:
+                sb_actions.append("%s '%s'" % (method, action[1]))
             else:
+                sb_actions.append(
+                    "%s '%s'" % (method, action[1].replace("'", "\\'"))
+                )
+        elif action[0] == "danet":
+            method = "Deferred assert non-empty text in"
+            if '"' not in action[1]:
+                sb_actions.append('%s "%s"' % (method, action[1]))
+            elif "'" not in action[1]:
                 sb_actions.append("%s '%s'" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    "%s '%s'" % (method, action[1].replace("'", "\\'"))
+                )
         elif action[0] == "s_scr":
             method = "Save screenshot as"
             if '"' not in action[1]:

seleniumbase/common/exceptions.py

@@ -1,4 +1,5 @@
 """ SeleniumBase Exceptions
+    LinkTextNotFoundException => Called when expected link text is not visible.
     NoSuchFileException => Called when self.assert_downloaded_file(...) fails.
     NoSuchOptionException => Called when select_option_by_*() lacks the option.
     NotConnectedException => Called when Internet is not reachable when needed.
@@ -6,13 +7,17 @@
     NotUsingChromiumException => Used by Chromium-only methods if not Chromium.
     OutOfScopeException => Used by BaseCase methods when setUp() is skipped.
     ProxyConnectionException => Called when the proxy connection failed.
-    TextNotVisibleException => Called when expected text fails to appear.
+    TextNotVisibleException => Called when the expected text is not visible.
     TimeLimitExceededException => Called when exceeding "--time-limit=SECONDS".
     TimeoutException => Called when some timeout limit has been exceeded.
     VisualException => Called when there's a Visual Diff Assertion Failure.
 """
 
 
+class LinkTextNotFoundException(Exception):
+    pass
+
+
 class NoSuchFileException(Exception):
     pass
 

seleniumbase/console_scripts/sb_install.py

@@ -150,15 +150,23 @@ def requests_get_with_retry(url):
         try:
             response = requests.get(url, proxies=proxies)
         except Exception:
-            time.sleep(0.75)
-            response = requests.get(url, proxies=proxies)
+            time.sleep(1.1)
+            try:
+                response = requests.get(url, proxies=proxies)
+            except Exception:
+                time.sleep(1.2)
+                response = requests.get(url, proxies=proxies)
         return response
     else:
         try:
             response = requests.get(url)
         except Exception:
-            time.sleep(0.75)
-            response = requests.get(url)
+            time.sleep(1.1)
+            try:
+                response = requests.get(url)
+            except Exception:
+                time.sleep(1.2)
+                response = requests.get(url)
         return response
 
 
@@ -500,6 +508,12 @@ def main(override=None, intel_for_uc=None):
             url_request = requests_get_with_retry(use_version)
             if url_request.ok:
                 use_version = url_request.text.split("\r")[0].split("\n")[0]
+                if (
+                    int(use_version.split(".")[0]) == 115
+                    and use_version.startswith("115.0")
+                    and use_version != "115.0.1901.183"
+                ):
+                    use_version = "115.0.1901.183"
         download_url = "https://msedgedriver.azureedge.net/%s/%s" % (
             use_version,
             file_name,

seleniumbase/core/browser_launcher.py

@@ -153,7 +153,7 @@ def get_uc_driver_version():
     return uc_driver_version
 
 
-def find_driver_version_to_use(use_version):
+def find_chromedriver_version_to_use(use_version):
     # Because https://chromedriver.chromium.org/downloads stops at 114
     final_chromedriver = "114"
     if (
@@ -177,11 +177,46 @@ def has_cf(text):
     return False
 
 
-def uc_open(driver, url):
+def uc_special_open_if_cf(driver, url):
     if (
         (url.startswith("http:") or url.startswith("https:"))
         and has_cf(requests_get(url).text)
     ):
+        with driver:
+            time.sleep(0.25)
+            driver.execute_script('window.open("%s","_blank");' % url)
+            driver.close()
+            driver.switch_to.window(driver.window_handles[-1])
+    else:
+        driver.open(url)  # The original one
+    return None
+
+
+def uc_open(driver, url):
+    if (url.startswith("http:") or url.startswith("https:")):
+        with driver:
+            time.sleep(0.25)
+            driver.open(url)
+    else:
+        driver.open(url)  # The original one
+    return None
+
+
+def uc_open_with_tab(driver, url):
+    if (url.startswith("http:") or url.startswith("https:")):
+        with driver:
+            time.sleep(0.25)
+            driver.execute_script('window.open("%s","_blank");' % url)
+            driver.close()
+            driver.switch_to.window(driver.window_handles[-1])
+    else:
+        driver.open(url)  # The original one
+    return None
+
+
+def uc_open_with_reconnect(driver, url):
+    """Open a url, then reconnect with UC before switching to the window."""
+    if (url.startswith("http:") or url.startswith("https:")):
         driver.execute_script('window.open("%s","_blank");' % url)
         driver.reconnect(2.65)
         driver.close()
@@ -804,6 +839,10 @@ def _set_chrome_options(
     chrome_options.add_argument("--disable-prompt-on-repost")
     chrome_options.add_argument("--dns-prefetch-disable")
     chrome_options.add_argument("--disable-translate")
+    chrome_options.add_argument(
+        '--disable-features=OptimizationHints,OptimizationHintsFetching,'
+        'OptimizationGuideModelDownloading,OptimizationTargetPrediction'
+    )
     if binary_location:
         chrome_options.binary_location = binary_location
     if not enable_3d_apis and not is_using_uc(undetectable, browser_name):
@@ -2177,6 +2216,7 @@ def get_local_driver(
         if major_edge_version:
             use_version = major_edge_version
         driver_version = None
+        edgedriver_upgrade_needed = False
         if os.path.exists(LOCAL_EDGEDRIVER):
             try:
                 output = subprocess.check_output(
@@ -2191,6 +2231,11 @@ def get_local_driver(
                     output = output.split(" ")[1].split(".")[0]
                 elif output.split(" ")[0] == "Microsoft":
                     # Microsoft Edge WebDriver VERSION
+                    if (
+                        "WebDriver 115.0" in output
+                        and "115.0.1901.183" not in output
+                    ):
+                        edgedriver_upgrade_needed = True
                     output = output.split(" ")[3].split(".")[0]
                 else:
                     output = 0
@@ -2198,7 +2243,6 @@ def get_local_driver(
                     driver_version = output
             except Exception:
                 pass
-        edgedriver_upgrade_needed = False
         local_edgedriver_exists = False
         if LOCAL_EDGEDRIVER and os.path.exists(LOCAL_EDGEDRIVER):
             local_edgedriver_exists = True
@@ -2477,7 +2521,9 @@ def get_local_driver(
         if selenium4_or_newer:
             try:
                 service = EdgeService(
-                    executable_path=LOCAL_EDGEDRIVER, log_path=os.devnull
+                    executable_path=LOCAL_EDGEDRIVER,
+                    log_path=os.devnull,
+                    service_args=["--disable-build-check"],
                 )
                 driver = Edge(service=service, options=edge_options)
             except Exception as e:
@@ -2503,6 +2549,7 @@ def get_local_driver(
                     service = EdgeService(
                         executable_path=LOCAL_EDGEDRIVER,
                         log_path=os.devnull,
+                        service_args=["--disable-build-check"],
                     )
                     # https://stackoverflow.com/a/56638103/7058266
                     sys_argv = sys.argv
@@ -2576,6 +2623,7 @@ def get_local_driver(
                     service = EdgeService(
                         executable_path=LOCAL_EDGEDRIVER,
                         log_path=os.devnull,
+                        service_args=["--disable-build-check"],
                     )
                     # https://stackoverflow.com/a/56638103/7058266
                     sys_argv = sys.argv
@@ -2852,7 +2900,7 @@ def get_local_driver(
                     from seleniumbase import config as sb_config
 
                     sb_config.multi_proxy = True
-            use_version = find_driver_version_to_use(use_version)
+            use_version = find_chromedriver_version_to_use(use_version)
             if (
                 LOCAL_CHROMEDRIVER
                 and os.path.exists(LOCAL_CHROMEDRIVER)
@@ -3007,7 +3055,7 @@ def get_local_driver(
                 )
                 with uc_lock:  # Avoid multithreaded issues
                     uc_driver_version = get_uc_driver_version()
-                    use_version = find_driver_version_to_use(use_version)
+                    use_version = find_chromedriver_version_to_use(use_version)
                     if (
                         (
                             uc_driver_version != use_version
@@ -3182,7 +3230,7 @@ def get_local_driver(
                             and int(major_chrome_version) >= 86
                         ):
                             mcv = major_chrome_version
-                            mcv = find_driver_version_to_use(mcv)
+                            mcv = find_chromedriver_version_to_use(mcv)
                     headless = True
                     headless_options = _set_chrome_options(
                         browser_name,
@@ -3281,7 +3329,14 @@ def get_local_driver(
                             )
                 driver.open = driver.get  # Save copy of original
                 if uc_activated:
-                    driver.get = lambda url: uc_open(driver, url)
+                    driver.get = lambda url: uc_special_open_if_cf(driver, url)
+                    driver.uc_open = lambda url: uc_open(driver, url)
+                    driver.uc_open_with_tab = (
+                        lambda url: uc_open_with_tab(driver, url)
+                    )
+                    driver.uc_open_with_reconnect = (
+                        lambda url: uc_open_with_reconnect(driver, url)
+                    )
                 return driver
             else:  # Running headless on Linux (and not using --uc)
                 try:

seleniumbase/core/recorder_helper.py

@@ -463,18 +463,46 @@ def generate_sbase_code(srt_actions):
                     sb_actions.append(
                         "self.%s('%s')" % (method, action[1][0])
                     )
+        elif action[0] == "asnet":
+            method = "assert_non_empty_text"
+            if '"' not in action[1]:
+                sb_actions.append('self.%s("%s")' % (method, action[1]))
+            elif "'" not in action[1]:
+                sb_actions.append("self.%s('%s')" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    'self.%s("""%s""")' % (method, action[1])
+                )
         elif action[0] == "da_el":
             method = "deferred_assert_element"
             if '"' not in action[1]:
                 sb_actions.append('self.%s("%s")' % (method, action[1]))
-            else:
+            elif "'" not in action[1]:
                 sb_actions.append("self.%s('%s')" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    'self.%s("""%s""")' % (method, action[1])
+                )
         elif action[0] == "da_ep":
             method = "deferred_assert_element_present"
             if '"' not in action[1]:
                 sb_actions.append('self.%s("%s")' % (method, action[1]))
+            elif "'" not in action[1]:
+                sb_actions.append("self.%s('%s')" % (method, action[1]))
             else:
+                sb_actions.append(
+                    'self.%s("""%s""")' % (method, action[1])
+                )
+        elif action[0] == "danet":
+            method = "deferred_assert_non_empty_text"
+            if '"' not in action[1]:
+                sb_actions.append('self.%s("%s")' % (method, action[1]))
+            elif "'" not in action[1]:
                 sb_actions.append("self.%s('%s')" % (method, action[1]))
+            else:
+                sb_actions.append(
+                    'self.%s("""%s""")' % (method, action[1])
+                )
         elif action[0] == "s_scr":
             method = "save_screenshot"
             if '"' not in action[1]: