seleniumbase 4.32.10__tar.gz → 4.32.10a1__tar.gz

{seleniumbase-4.32.10/seleniumbase.egg-info → seleniumbase-4.32.10a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.32.10
+Version: 4.32.10a1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -126,7 +126,7 @@ Requires-Dist: allure-python-commons>=2.13.5; extra == "allure"
 Requires-Dist: allure-behave>=2.13.5; extra == "allure"
 Provides-Extra: coverage
 Requires-Dist: coverage>=7.6.1; python_version < "3.9" and extra == "coverage"
-Requires-Dist: coverage>=7.6.5; python_version >= "3.9" and extra == "coverage"
+Requires-Dist: coverage>=7.6.4; python_version >= "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=5.0.0; python_version < "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=6.0.0; python_version >= "3.9" and extra == "coverage"
 Provides-Extra: flake8

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/requirements.txt

@@ -64,7 +64,7 @@ rich==13.9.4
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage>=7.6.1;python_version<"3.9"
-coverage>=7.6.5;python_version>="3.9"
+coverage>=7.6.4;python_version>="3.9"
 pytest-cov>=5.0.0;python_version<"3.9"
 pytest-cov>=6.0.0;python_version>="3.9"
 flake8==5.0.4;python_version<"3.9"

seleniumbase-4.32.10a1/seleniumbase/__version__.py

@@ -0,0 +1,2 @@
+# seleniumbase package
+__version__ = "4.32.10a1"

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/core/browser_launcher.py

@@ -544,8 +544,6 @@ def uc_open_with_cdp_mode(driver, url=None):
     )
     loop.run_until_complete(driver.cdp_base.wait(0))
 
-    gui_lock = fasteners.InterProcessLock(constants.MultiBrowser.PYAUTOGUILOCK)
-
     if (
         "chrome-extension://" in str(driver.cdp_base.main_tab)
         and len(driver.cdp_base.tabs) >= 2
@@ -555,8 +553,7 @@ def uc_open_with_cdp_mode(driver, url=None):
 
         for tab in driver.cdp_base.tabs[-1::-1]:
             if "chrome-extension://" not in str(tab):
-                with gui_lock:
-                    loop.run_until_complete(tab.activate())
+                loop.run_until_complete(tab.activate())
                 break
 
         page_tab = None
@@ -569,20 +566,13 @@ def uc_open_with_cdp_mode(driver, url=None):
                     break
         if page_tab:
             loop.run_until_complete(page_tab.aopen())
-            with gui_lock:
-                loop.run_until_complete(page_tab.activate())
+            loop.run_until_complete(page_tab.activate())
 
     loop.run_until_complete(driver.cdp_base.update_targets())
     page = loop.run_until_complete(driver.cdp_base.get(url))
-    with gui_lock:
-        loop.run_until_complete(page.activate())
-    loop.run_until_complete(page.wait())
+    loop.run_until_complete(page.activate())
     if not safe_url:
         time.sleep(constants.UC.CDP_MODE_OPEN_WAIT)
-        if IS_WINDOWS:
-            time.sleep(constants.UC.EXTRA_WINDOWS_WAIT)
-    else:
-        time.sleep(0.012)
     cdp = types.SimpleNamespace()
     CDPM = sb_cdp.CDPMethods(loop, page, driver)
     cdp.get = CDPM.get
@@ -618,6 +608,7 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.remove_element = CDPM.remove_element
     cdp.remove_from_dom = CDPM.remove_from_dom
     cdp.remove_elements = CDPM.remove_elements
+    cdp.scroll_into_view = CDPM.scroll_into_view
     cdp.send_keys = CDPM.send_keys
     cdp.press_keys = CDPM.press_keys
     cdp.type = CDPM.type
@@ -688,12 +679,8 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.assert_title = CDPM.assert_title
     cdp.assert_text = CDPM.assert_text
     cdp.assert_exact_text = CDPM.assert_exact_text
-    cdp.scroll_into_view = CDPM.scroll_into_view
-    cdp.scroll_to_y = CDPM.scroll_to_y
-    cdp.scroll_to_top = CDPM.scroll_to_top
-    cdp.scroll_to_bottom = CDPM.scroll_to_bottom
-    cdp.scroll_up = CDPM.scroll_up
     cdp.scroll_down = CDPM.scroll_down
+    cdp.scroll_up = CDPM.scroll_up
     cdp.save_screenshot = CDPM.save_screenshot
     cdp.page = page  # async world
     cdp.driver = driver.cdp_base  # async world
@@ -1257,18 +1244,12 @@ def _uc_gui_click_captcha(
                     return
         if x and y:
             sb_config._saved_cf_x_y = (x, y)
-            if not __is_cdp_swap_needed(driver):
-                if driver.is_element_present(".footer .clearfix .ray-id"):
-                    driver.uc_open_with_disconnect(
-                        driver.get_current_url(), 3.8
-                    )
-                else:
-                    driver.disconnect()
+            if driver.is_element_present(".footer .clearfix .ray-id"):
+                driver.uc_open_with_disconnect(driver.get_current_url(), 3.8)
+            else:
+                driver.disconnect()
             with suppress(Exception):
                 _uc_gui_click_x_y(driver, x, y, timeframe=0.32)
-                if __is_cdp_swap_needed(driver):
-                    time.sleep(float(constants.UC.RECONNECT_TIME) / 2.0)
-                    return
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.6
     if IS_LINUX:
         reconnect_time = constants.UC.RECONNECT_TIME + 0.2

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/core/sb_cdp.py

@@ -89,10 +89,6 @@ class CDPMethods():
             safe_url = False
         if not safe_url:
             time.sleep(constants.UC.CDP_MODE_OPEN_WAIT)
-            if shared_utils.is_windows():
-                time.sleep(constants.UC.EXTRA_WINDOWS_WAIT)
-        else:
-            time.sleep(0.012)
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
@@ -192,10 +188,7 @@ class CDPMethods():
         )
         updated_elements = []
         for element in elements:
-            if (
-                not tag_name
-                or tag_name.lower().strip() in element.tag_name.lower().strip()
-            ):
+            if not tag_name or tag_name.lower() == element.tag_name.lower():
                 element = self.__add_sync_methods(element)
                 updated_elements.append(element)
         self.__slow_mode_pause_if_set()
@@ -442,7 +435,6 @@ class CDPMethods():
 
     def bring_active_window_to_front(self):
         self.loop.run_until_complete(self.page.bring_to_front())
-        self.__add_light_pause()
 
     def get_active_element(self):
         return self.loop.run_until_complete(
@@ -546,6 +538,7 @@ class CDPMethods():
         """Highlight an element with multi-colors."""
         selector = self.__convert_to_css_if_xpath(selector)
         element = self.find_element(selector)
+        element = self.find_element(selector)
         element.flash(0.46, "44CC88")
         time.sleep(0.15)
         element.flash(0.42, "8844CC")
@@ -582,6 +575,9 @@ class CDPMethods():
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
 
+    def scroll_into_view(self, selector):
+        self.find_element(selector).scroll_into_view()
+
     def send_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
@@ -843,10 +839,8 @@ class CDPMethods():
         coordinates["y"] = y if y else 0
         return coordinates
 
-    def get_element_rect(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def get_element_rect(self, selector):
         selector = self.__convert_to_css_if_xpath(selector)
-        self.select(selector, timeout=timeout)
-        self.__add_light_pause()
         coordinates = self.loop.run_until_complete(
             self.page.js_dumps(
                 """document.querySelector"""
@@ -1522,36 +1516,15 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
-    def scroll_into_view(self, selector):
-        self.find_element(selector).scroll_into_view()
-        self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_y(self, y):
-        y = int(y)
-        js_code = "window.scrollTo(0, %s);" % y
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_top(self):
-        js_code = "window.scrollTo(0, 0);"
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
-
-    def scroll_to_bottom(self):
-        js_code = "window.scrollTo(0, 10000);"
-        with suppress(Exception):
-            self.loop.run_until_complete(self.page.evaluate(js_code))
-            self.loop.run_until_complete(self.page.wait())
+    def scroll_down(self, amount=25):
+        self.loop.run_until_complete(
+            self.page.scroll_down(amount)
+        )
 
     def scroll_up(self, amount=25):
-        self.loop.run_until_complete(self.page.scroll_up(amount))
-        self.loop.run_until_complete(self.page.wait())
-
-    def scroll_down(self, amount=25):
-        self.loop.run_until_complete(self.page.scroll_down(amount))
-        self.loop.run_until_complete(self.page.wait())
+        self.loop.run_until_complete(
+            self.page.scroll_up(amount)
+        )
 
     def save_screenshot(self, name, folder=None, selector=None):
         filename = name

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/core/sb_driver.py

@@ -249,11 +249,8 @@ class DriverMethods():
                 selector = kwargs["selector"]
             else:
                 selector = args[0]
-            if ":contains(" not in selector:
-                self.driver.cdp.highlight(selector)
-                return
-            else:
-                self.driver.connect()
+            self.driver.cdp.highlight(selector)
+            return
         if "scroll" in kwargs:
             kwargs.pop("scroll")
         w_args = kwargs.copy()

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/fixtures/base_case.py

@@ -5974,7 +5974,7 @@ class BaseCase(unittest.TestCase):
         scroll - the option to scroll to the element first (Default: True)
         timeout - the time to wait for the element to appear """
         self.__check_scope()
-        if self.__is_cdp_swap_needed() and ":contains(" not in selector:
+        if self.__is_cdp_swap_needed():
             self.cdp.highlight(selector)
             return
         self._check_browser()
@@ -6144,9 +6144,6 @@ class BaseCase(unittest.TestCase):
         original_selector = selector
         original_by = by
         selector, by = self.__recalculate_selector(selector, by)
-        if self.__is_cdp_swap_needed() and ":contains(" not in selector:
-            self.cdp.scroll_into_view(selector)
-            return
         element = self.wait_for_element_visible(
             original_selector, by=original_by, timeout=timeout
         )
@@ -6193,36 +6190,24 @@ class BaseCase(unittest.TestCase):
     def scroll_to_top(self):
         """Scroll to the top of the page."""
         self.__check_scope()
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_top()
-            return
         scroll_script = "window.scrollTo(0, 0);"
-        with suppress(Exception):
+        try:
             self.execute_script(scroll_script)
             time.sleep(0.012)
+            return True
+        except Exception:
+            return False
 
     def scroll_to_bottom(self):
         """Scroll to the bottom of the page."""
         self.__check_scope()
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_bottom()
-            return
         scroll_script = "window.scrollTo(0, 10000);"
-        with suppress(Exception):
-            self.execute_script(scroll_script)
-            time.sleep(0.012)
-
-    def scroll_to_y(self, y):
-        """Scroll to y position on the page."""
-        self.__check_scope()
-        y = int(y)
-        if self.__is_cdp_swap_needed():
-            self.cdp.scroll_to_y(y)
-            return
-        scroll_script = "window.scrollTo(0, %s);" % y
-        with suppress(Exception):
+        try:
             self.execute_script(scroll_script)
             time.sleep(0.012)
+            return True
+        except Exception:
+            return False
 
     def click_xpath(self, xpath):
         """Technically, self.click() automatically detects xpath selectors,

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/fixtures/constants.py

@@ -376,7 +376,6 @@ class Mobile:
 class UC:
     RECONNECT_TIME = 2.4  # Seconds
     CDP_MODE_OPEN_WAIT = 0.9  # Seconds
-    EXTRA_WINDOWS_WAIT = 0.2  # Seconds
 
 
 class ValidBrowsers:

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/fixtures/js_utils.py

@@ -10,7 +10,6 @@ from seleniumbase import config as sb_config
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import css_to_xpath
-from seleniumbase.fixtures import shared_utils
 from seleniumbase.fixtures import xpath_to_css
 
 
@@ -25,6 +24,9 @@ def wait_for_ready_state_complete(driver, timeout=settings.LARGE_TIMEOUT):
     (Previously, tests would fail immediately if exceeding the timeout.)"""
     if hasattr(settings, "SKIP_JS_WAITS") and settings.SKIP_JS_WAITS:
         return
+    if sb_config.time_limit and not sb_config.recorder_mode:
+        from seleniumbase.fixtures import shared_utils
+
     start_ms = time.time() * 1000.0
     stop_ms = start_ms + (timeout * 1000.0)
     for x in range(int(timeout * 10)):
@@ -241,6 +243,8 @@ def escape_quotes_if_needed(string):
 def is_in_frame(driver):
     # Returns True if the driver has switched to a frame.
     # Returns False if the driver was on default content.
+    from seleniumbase.fixtures import shared_utils
+
     if shared_utils.is_cdp_swap_needed(driver):
         return False
     in_basic_frame = driver.execute_script(

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/fixtures/page_actions.py

@@ -1555,6 +1555,8 @@ def _reconnect_if_disconnected(driver):
     if (
         hasattr(driver, "_is_using_uc")
         and driver._is_using_uc
+        and hasattr(driver, "_is_connected")
+        and not driver._is_connected
         and hasattr(driver, "is_connected")
         and not driver.is_connected()
     ):

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase/fixtures/shared_utils.py

@@ -84,17 +84,6 @@ def fix_url_as_needed(url):
     return url
 
 
-def reconnect_if_disconnected(driver):
-    if (
-        hasattr(driver, "_is_using_uc")
-        and driver._is_using_uc
-        and hasattr(driver, "is_connected")
-        and not driver.is_connected()
-    ):
-        with suppress(Exception):
-            driver.connect()
-
-
 def is_cdp_swap_needed(driver):
     """
     When someone is using CDP Mode with a disconnected webdriver,

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.32.10
+Version: 4.32.10a1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -126,7 +126,7 @@ Requires-Dist: allure-python-commons>=2.13.5; extra == "allure"
 Requires-Dist: allure-behave>=2.13.5; extra == "allure"
 Provides-Extra: coverage
 Requires-Dist: coverage>=7.6.1; python_version < "3.9" and extra == "coverage"
-Requires-Dist: coverage>=7.6.5; python_version >= "3.9" and extra == "coverage"
+Requires-Dist: coverage>=7.6.4; python_version >= "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=5.0.0; python_version < "3.9" and extra == "coverage"
 Requires-Dist: pytest-cov>=6.0.0; python_version >= "3.9" and extra == "coverage"
 Provides-Extra: flake8

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/seleniumbase.egg-info/requires.txt

@@ -84,7 +84,7 @@ coverage>=7.6.1
 pytest-cov>=5.0.0
 
 [coverage:python_version >= "3.9"]
-coverage>=7.6.5
+coverage>=7.6.4
 pytest-cov>=6.0.0
 
 [flake8]

{seleniumbase-4.32.10 → seleniumbase-4.32.10a1}/setup.py

@@ -222,7 +222,7 @@ setup(
         # Usage: coverage run -m pytest; coverage html; coverage report
         "coverage": [
             'coverage>=7.6.1;python_version<"3.9"',
-            'coverage>=7.6.5;python_version>="3.9"',
+            'coverage>=7.6.4;python_version>="3.9"',
             'pytest-cov>=5.0.0;python_version<"3.9"',
             'pytest-cov>=6.0.0;python_version>="3.9"',
         ],

seleniumbase-4.32.10/seleniumbase/__version__.py

@@ -1,2 +0,0 @@
-# seleniumbase package
-__version__ = "4.32.10"