seleniumbase 4.33.0__tar.gz → 4.33.2__tar.gz

{seleniumbase-4.33.0/seleniumbase.egg-info → seleniumbase-4.33.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.33.0
+Version: 4.33.2
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -146,7 +146,7 @@ Requires-Dist: mss==9.0.2; extra == "mss"
 Provides-Extra: pdfminer
 Requires-Dist: pdfminer.six==20240706; extra == "pdfminer"
 Requires-Dist: cryptography==39.0.2; python_version < "3.9" and extra == "pdfminer"
-Requires-Dist: cryptography==43.0.3; python_version >= "3.9" and extra == "pdfminer"
+Requires-Dist: cryptography==44.0.0; python_version >= "3.9" and extra == "pdfminer"
 Requires-Dist: cffi==1.17.1; extra == "pdfminer"
 Requires-Dist: pycparser==2.22; extra == "pdfminer"
 Provides-Extra: pillow

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/examples/presenter/uc_presentation.py

@@ -1,3 +1,4 @@
+# https://www.youtube.com/watch?v=5dMFI3e85ig
 import os
 import subprocess
 from contextlib import suppress

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/examples/presenter/uc_presentation_3.py

@@ -1,3 +1,4 @@
+# https://www.youtube.com/watch?v=-EpZlhGWo9k
 import sys
 from contextlib import suppress
 from seleniumbase import BaseCase

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/mkdocs_build/prepare.py

@@ -76,14 +76,17 @@ def main(*args, **kwargs):
     scanned_dir_list = []
     scanned_dir_list.append("help_docs")
     scanned_dir_list.append("examples")
-    scanned_dir_list.append("examples/behave_bdd")
-    scanned_dir_list.append("examples/example_logs")
+    scanned_dir_list.append("examples/cdp_mode")
+    scanned_dir_list.append("examples/master_qa")
     scanned_dir_list.append("examples/presenter")
+    scanned_dir_list.append("examples/behave_bdd")
     scanned_dir_list.append("examples/chart_maker")
+    scanned_dir_list.append("examples/example_logs")
     scanned_dir_list.append("examples/tour_examples")
     scanned_dir_list.append("examples/visual_testing")
     scanned_dir_list.append("integrations/google_cloud")
     scanned_dir_list.append("seleniumbase/console_scripts")
+    scanned_dir_list.append("examples/migration/raw_selenium")
     for scanned_dir in scanned_dir_list:
         for dir_ in os.listdir(ROOT_DIR / scanned_dir):
             files_to_process.append(os.path.join(scanned_dir, dir_))
@@ -159,6 +162,12 @@ def main(*args, **kwargs):
             )
             if alt_link_badge in line:
                 line = line.replace(alt_link_badge, back_to_gh)
+                changed = True
+            if "/help_docs/uc_mode/" in line and file_.count("/") >= 2:
+                line = line.replace(
+                    "/help_docs/uc_mode/", "/../help_docs/uc_mode/"
+                )
+                changed = True
             if "<!-- GitHub Only -->" in line:
                 changed = True
                 continue

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.33.0"
+__version__ = "4.33.2"

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/seleniumbase/core/browser_launcher.py

@@ -612,6 +612,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.save_cookies = CDPM.save_cookies
     cdp.load_cookies = CDPM.load_cookies
     cdp.clear_cookies = CDPM.clear_cookies
+    cdp.sleep = CDPM.sleep
     cdp.bring_active_window_to_front = CDPM.bring_active_window_to_front
     cdp.bring_to_front = CDPM.bring_active_window_to_front
     cdp.get_active_element = CDPM.get_active_element
@@ -684,6 +685,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.select_if_unselected = CDPM.select_if_unselected
     cdp.unselect_if_selected = CDPM.unselect_if_selected
     cdp.is_checked = CDPM.is_checked
+    cdp.is_selected = CDPM.is_selected
     cdp.is_element_present = CDPM.is_element_present
     cdp.is_element_visible = CDPM.is_element_visible
     cdp.wait_for_element_visible = CDPM.wait_for_element_visible
@@ -699,6 +701,12 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.assert_url_contains = CDPM.assert_url_contains
     cdp.assert_text = CDPM.assert_text
     cdp.assert_exact_text = CDPM.assert_exact_text
+    cdp.assert_true = CDPM.assert_true
+    cdp.assert_false = CDPM.assert_false
+    cdp.assert_equal = CDPM.assert_equal
+    cdp.assert_not_equal = CDPM.assert_not_equal
+    cdp.assert_in = CDPM.assert_in
+    cdp.assert_not_in = CDPM.assert_not_in
     cdp.scroll_into_view = CDPM.scroll_into_view
     cdp.scroll_to_y = CDPM.scroll_to_y
     cdp.scroll_to_top = CDPM.scroll_to_top
@@ -1167,7 +1175,12 @@ def _uc_gui_click_captcha(
                     frame = "%s div" % frame
                 elif (
                     driver.is_element_present('[name*="cf-turnstile-"]')
-                    and driver.is_element_present('[class*=spacer] + div div')
+                    and driver.is_element_present("#challenge-form div > div")
+                ):
+                    frame = "#challenge-form div > div"
+                elif (
+                    driver.is_element_present('[name*="cf-turnstile-"]')
+                    and driver.is_element_present("[class*=spacer] + div div")
                 ):
                     frame = '[class*=spacer] + div div'
                 elif (
@@ -1240,8 +1253,8 @@ def _uc_gui_click_captcha(
                 return
         try:
             if ctype == "g_rc" and not driver.is_connected():
-                x = (i_x + 32) * width_ratio
-                y = (i_y + 34) * width_ratio
+                x = (i_x + 29) * width_ratio
+                y = (i_y + 35) * width_ratio
             elif visible_iframe:
                 selector = "span"
                 if ctype == "g_rc":
@@ -1256,8 +1269,8 @@ def _uc_gui_click_captcha(
                 y = i_y + element.rect["y"] + (element.rect["height"] / 2.0)
                 y += 0.5
             else:
-                x = (i_x + 34) * width_ratio
-                y = (i_y + 34) * width_ratio
+                x = (i_x + 32) * width_ratio
+                y = (i_y + 32) * width_ratio
             if driver.is_connected():
                 driver.switch_to.default_content()
         except Exception:
@@ -1497,6 +1510,7 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
                 tab_count += 1
                 time.sleep(0.027)
                 active_element_css = js_utils.get_active_element_css(driver)
+                print(active_element_css)
                 if (
                     active_element_css.startswith(selector)
                     or active_element_css.endswith(" > div" * 2)
@@ -1514,7 +1528,10 @@ def _uc_gui_handle_captcha_(driver, frame="iframe", ctype=None):
             except Exception:
                 return
         if (
-            driver.is_element_present(".footer .clearfix .ray-id")
+            (
+                driver.is_element_present(".footer .clearfix .ray-id")
+                or driver.is_element_present("script[data-cf-beacon]")
+            )
             and hasattr(sb_config, "_saved_cf_tab_count")
             and sb_config._saved_cf_tab_count
         ):

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/seleniumbase/core/sb_cdp.py

@@ -135,23 +135,10 @@ class CDPMethods():
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
         early_failure = False
-        if (":contains(" in selector):
-            tag_name = selector.split(":contains(")[0].split(" ")[-1]
-            text = selector.split(":contains(")[1].split(")")[0][1:-1]
-            with suppress(Exception):
-                self.loop.run_until_complete(
-                    self.page.select(tag_name, timeout=timeout)
-                )
-                self.loop.run_until_complete(
-                    self.page.find(text, timeout=timeout)
-                )
-            elements = []
-            with suppress(Exception):
-                elements = self.find_elements_by_text(text, tag_name=tag_name)
-            if elements:
-                return self.__add_sync_methods(elements[0])
-            else:
-                early_failure = True
+        if (":contains(") in selector:
+            selector, _ = page_utils.recalculate_selector(
+                selector, by="css selector", xp_ok=True
+            )
         failure = False
         try:
             if early_failure:
@@ -726,12 +713,16 @@ class CDPMethods():
 
     def evaluate(self, expression):
         """Run a JavaScript expression and return the result."""
+        if expression.startswith("return "):
+            expression = expression[len("return "):]
         return self.loop.run_until_complete(
             self.page.evaluate(expression)
         )
 
     def js_dumps(self, obj_name):
         """Similar to evaluate(), but for dictionary results."""
+        if obj_name.startswith("return "):
+            obj_name = obj_name[len("return "):]
         return self.loop.run_until_complete(
             self.page.js_dumps(obj_name)
         )
@@ -1648,11 +1639,11 @@ class CDPMethods():
         text = text.strip()
         element = None
         try:
-            element = self.select(selector, timeout=timeout)
+            element = self.find_element(selector, timeout=timeout)
         except Exception:
             raise Exception("Element {%s} not found!" % selector)
         for i in range(30):
-            if self.is_element_visible(selector) and text in element.text_all:
+            if text in element.text_all:
                 return True
             time.sleep(0.1)
         raise Exception(
@@ -1681,6 +1672,30 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
+    def assert_true(self, expression):
+        if not expression:
+            raise AssertionError("%s is not true" % expression)
+
+    def assert_false(self, expression):
+        if expression:
+            raise AssertionError("%s is not false" % expression)
+
+    def assert_equal(self, first, second):
+        if first != second:
+            raise AssertionError("%s is not equal to %s" % (first, second))
+
+    def assert_not_equal(self, first, second):
+        if first == second:
+            raise AssertionError("%s is equal to %s" % (first, second))
+
+    def assert_in(self, first, second):
+        if first not in second:
+            raise AssertionError("%s is not in %s" % (first, second))
+
+    def assert_not_in(self, first, second):
+        if first in second:
+            raise AssertionError("%s is in %s" % (first, second))
+
     def scroll_into_view(self, selector):
         self.find_element(selector).scroll_into_view()
         self.loop.run_until_complete(self.page.wait())

{seleniumbase-4.33.0 → seleniumbase-4.33.2}/seleniumbase/fixtures/base_case.py

@@ -392,7 +392,7 @@ class BaseCase(unittest.TestCase):
         original_by = by
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            self.cdp.click(selector)
+            self.cdp.click(selector, timeout=timeout)
             return
         if delay and (type(delay) in [int, float]) and delay > 0:
             time.sleep(delay)
@@ -885,7 +885,7 @@ class BaseCase(unittest.TestCase):
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            self.cdp.type(selector, text)
+            self.cdp.type(selector, text, timeout=timeout)
             return
         if self.__is_shadow_selector(selector):
             self.__shadow_type(selector, text, timeout)
@@ -1112,7 +1112,7 @@ class BaseCase(unittest.TestCase):
     def press_keys(self, selector, text, by="css selector", timeout=None):
         """Use send_keys() to press one key at a time."""
         if self.__is_cdp_swap_needed():
-            self.cdp.press_keys(selector, text)
+            self.cdp.press_keys(selector, text, timeout=timeout)
             return
         self.wait_for_ready_state_complete()
         element = self.wait_for_element_present(
@@ -1597,7 +1597,7 @@ class BaseCase(unittest.TestCase):
         """This method clicks link text on a page."""
         self.__check_scope()
         if self.__is_cdp_swap_needed():
-            self.cdp.find_element(link_text).click()
+            self.cdp.find_element(link_text, timeout=timeout).click()
             return
         self.__skip_if_esc()
         if not timeout:
@@ -3380,6 +3380,8 @@ class BaseCase(unittest.TestCase):
 
     def execute_script(self, script, *args, **kwargs):
         self.__check_scope()
+        if self.__is_cdp_swap_needed():
+            return self.cdp.evaluate(script)
         self._check_browser()
         return self.driver.execute_script(script, *args, **kwargs)
 
@@ -6308,7 +6310,7 @@ class BaseCase(unittest.TestCase):
         If "all_matches" is False, only the first match is clicked.
         If "scroll" is False, won't scroll unless running in Demo Mode."""
         if self.__is_cdp_swap_needed():
-            self.cdp.click(selector)
+            self.cdp.click(selector, timeout=timeout)
             return
         self.wait_for_ready_state_complete()
         if not timeout or timeout is True:
@@ -8245,7 +8247,7 @@ class BaseCase(unittest.TestCase):
             timeout = settings.SMALL_TIMEOUT
         if self.__is_cdp_swap_needed():
             mfa_code = self.get_mfa_code(totp_key)
-            self.cdp.type(selector, mfa_code + "\n")
+            self.cdp.type(selector, mfa_code + "\n", timeout=timeout)
             return
         self.wait_for_element_visible(selector, by=by, timeout=timeout)
         if self.recorder_mode and self.__current_url_is_recordable():
@@ -9003,7 +9005,7 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.select(selector)
+            return self.cdp.select(selector, timeout=timeout)
         if self.__is_shadow_selector(selector):
             return self.__get_shadow_element(selector, timeout)
         return page_actions.wait_for_element_visible(
@@ -9026,7 +9028,7 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.select(selector)
+            return self.cdp.select(selector, timeout=timeout)
         elif self.__is_shadow_selector(selector):
             # If a shadow selector, use visible instead of clickable
             return self.__wait_for_shadow_element_visible(selector, timeout)
@@ -9427,7 +9429,7 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.select(selector)
+            return self.cdp.select(selector, timeout=timeout)
         elif self.__is_shadow_selector(selector):
             return self.__wait_for_shadow_element_present(selector, timeout)
         return page_actions.wait_for_element_present(
@@ -9449,7 +9451,7 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.select(selector)
+            return self.cdp.select(selector, timeout=timeout)
         if self.recorder_mode and self.__current_url_is_recordable():
             if self.get_session_storage_item("pause_recorder") == "no":
                 if by == By.XPATH:
@@ -9492,7 +9494,7 @@ class BaseCase(unittest.TestCase):
             timeout = self.__get_new_timeout(timeout)
         css_selector = self.convert_to_css_selector(selector, by=by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.select(css_selector)
+            return self.cdp.select(css_selector, timeout=timeout)
         return js_utils.wait_for_css_query_selector(
             self.driver, css_selector, timeout
         )
@@ -9713,7 +9715,7 @@ class BaseCase(unittest.TestCase):
         text = self.__get_type_checked_text(text)
         selector, by = self.__recalculate_selector(selector, by)
         if self.__is_cdp_swap_needed():
-            return self.cdp.find_element(selector)
+            return self.cdp.find_element(selector, timeout=timeout)
         elif self.__is_shadow_selector(selector):
             return self.__wait_for_shadow_text_visible(text, selector, timeout)
         return page_actions.wait_for_text_visible(
@@ -10093,7 +10095,7 @@ class BaseCase(unittest.TestCase):
         if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         if self.__is_cdp_swap_needed():
-            self.cdp.find_element(link_text)
+            self.cdp.find_element(link_text, timeout=timeout)
             return
         self.wait_for_link_text_visible(link_text, timeout=timeout)
         if self.demo_mode: