seleniumbase 4.34.14__tar.gz → 4.34.16__tar.gz

{seleniumbase-4.34.14/seleniumbase.egg-info → seleniumbase-4.34.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: seleniumbase
-Version: 4.34.14
+Version: 4.34.16
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -68,7 +68,7 @@ Requires-Dist: attrs>=25.1.0
 Requires-Dist: certifi>=2025.1.31
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: websockets~=13.1; python_version < "3.9"
-Requires-Dist: websockets>=14.2; python_version >= "3.9"
+Requires-Dist: websockets>=15.0; python_version >= "3.9"
 Requires-Dist: filelock~=3.16.1; python_version < "3.9"
 Requires-Dist: filelock>=3.17.0; python_version >= "3.9"
 Requires-Dist: fasteners>=0.19
@@ -99,8 +99,8 @@ Requires-Dist: sniffio==1.3.1
 Requires-Dist: h11==0.14.0
 Requires-Dist: outcome==1.3.0.post0
 Requires-Dist: trio==0.27.0; python_version < "3.9"
-Requires-Dist: trio==0.28.0; python_version >= "3.9"
-Requires-Dist: trio-websocket==0.11.1
+Requires-Dist: trio==0.29.0; python_version >= "3.9"
+Requires-Dist: trio-websocket==0.12.1
 Requires-Dist: wsproto==1.2.0
 Requires-Dist: websocket-client==1.8.0
 Requires-Dist: selenium==4.27.1; python_version < "3.9"
@@ -137,7 +137,7 @@ 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
 Requires-Dist: flake8==5.0.4; python_version < "3.9" and extra == "flake8"
-Requires-Dist: flake8==7.1.1; python_version >= "3.9" and extra == "flake8"
+Requires-Dist: flake8==7.1.2; python_version >= "3.9" and extra == "flake8"
 Requires-Dist: mccabe==0.7.0; extra == "flake8"
 Requires-Dist: pyflakes==2.5.0; python_version < "3.9" and extra == "flake8"
 Requires-Dist: pyflakes==3.2.0; python_version >= "3.9" and extra == "flake8"

{seleniumbase-4.34.14 → seleniumbase-4.34.16}/requirements.txt

@@ -7,7 +7,7 @@ attrs>=25.1.0
 certifi>=2025.1.31
 exceptiongroup>=1.2.2
 websockets~=13.1;python_version<"3.9"
-websockets>=14.2;python_version>="3.9"
+websockets>=15.0;python_version>="3.9"
 filelock~=3.16.1;python_version<"3.9"
 filelock>=3.17.0;python_version>="3.9"
 fasteners>=0.19
@@ -38,8 +38,8 @@ sniffio==1.3.1
 h11==0.14.0
 outcome==1.3.0.post0
 trio==0.27.0;python_version<"3.9"
-trio==0.28.0;python_version>="3.9"
-trio-websocket==0.11.1
+trio==0.29.0;python_version>="3.9"
+trio-websocket==0.12.1
 wsproto==1.2.0
 websocket-client==1.8.0
 selenium==4.27.1;python_version<"3.9"
@@ -74,7 +74,7 @@ coverage>=7.6.12;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"
-flake8==7.1.1;python_version>="3.9"
+flake8==7.1.2;python_version>="3.9"
 mccabe==0.7.0
 pyflakes==2.5.0;python_version<"3.9"
 pyflakes==3.2.0;python_version>="3.9"

seleniumbase-4.34.16/seleniumbase/__version__.py

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

{seleniumbase-4.34.14 → seleniumbase-4.34.16}/seleniumbase/core/browser_launcher.py

@@ -107,7 +107,7 @@ def make_driver_executable_if_not(driver_path):
         shared_utils.make_executable(driver_path)
 
 
-def extend_driver(driver):
+def extend_driver(driver, proxy_auth=False, use_uc=True):
     # Extend the driver with new methods
     driver.default_find_element = driver.find_element
     driver.default_find_elements = driver.find_elements
@@ -235,6 +235,8 @@ def extend_driver(driver):
     driver.reset_window_size = DM.reset_window_size
     if hasattr(driver, "proxy"):
         driver.set_wire_proxy = DM.set_wire_proxy
+    if proxy_auth and not use_uc:
+        time.sleep(0.11)  # Proxy needs moment to load in Manifest V3
     return driver
 
 
@@ -716,6 +718,10 @@ def uc_open_with_cdp_mode(driver, url=None):
     cdp.is_selected = CDPM.is_selected
     cdp.is_element_present = CDPM.is_element_present
     cdp.is_element_visible = CDPM.is_element_visible
+    cdp.is_text_visible = CDPM.is_text_visible
+    cdp.is_exact_text_visible = CDPM.is_exact_text_visible
+    cdp.wait_for_text = CDPM.wait_for_text
+    cdp.wait_for_text_not_visible = CDPM.wait_for_text_not_visible
     cdp.wait_for_element_visible = CDPM.wait_for_element_visible
     cdp.assert_element = CDPM.assert_element
     cdp.assert_element_visible = CDPM.assert_element_visible
@@ -729,6 +735,7 @@ 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_text_not_visible = CDPM.assert_text_not_visible
     cdp.assert_true = CDPM.assert_true
     cdp.assert_false = CDPM.assert_false
     cdp.assert_equal = CDPM.assert_equal
@@ -2278,6 +2285,7 @@ def _set_chrome_options(
         or proxy_string
     ):
         chrome_options.add_argument("--ignore-certificate-errors")
+        chrome_options.add_argument("--ignore-ssl-errors=yes")
     if not enable_ws:
         chrome_options.add_argument("--disable-web-security")
     if (
@@ -3591,6 +3599,7 @@ def get_local_driver(
     Can also be used to spin up additional browsers for the same test."""
     downloads_path = DOWNLOADS_FOLDER
     b_path = binary_location
+    use_uc = is_using_uc(undetectable, browser_name)
     if use_wire:
         pip_find_lock = fasteners.InterProcessLock(
             constants.PipInstall.FINDLOCK
@@ -4064,7 +4073,7 @@ def get_local_driver(
                     edge_options.add_argument("--headless=old")
                 else:
                     edge_options.add_argument("--headless")
-        if mobile_emulator and not is_using_uc(undetectable, browser_name):
+        if mobile_emulator and not use_uc:
             emulator_settings = {}
             device_metrics = {}
             if (
@@ -4128,7 +4137,7 @@ def get_local_driver(
                         settings.CHROME_START_HEIGHT,
                     )
                 )
-        if user_data_dir and not is_using_uc(undetectable, browser_name):
+        if user_data_dir and not use_uc:
             abs_path = os.path.abspath(user_data_dir)
             edge_options.add_argument("--user-data-dir=%s" % abs_path)
         if extension_zip:
@@ -4163,7 +4172,7 @@ def get_local_driver(
         edge_options.add_argument("--disable-prompt-on-repost")
         if not enable_3d_apis:
             edge_options.add_argument("--disable-3d-apis")
-        if headless or headless2 or is_using_uc(undetectable, browser_name):
+        if headless or headless2 or use_uc:
             edge_options.add_argument("--disable-renderer-backgrounding")
         edge_options.add_argument("--disable-backgrounding-occluded-windows")
         edge_options.add_argument("--disable-client-side-phishing-detection")
@@ -4228,6 +4237,7 @@ def get_local_driver(
         edge_options.add_argument("--log-level=3")
         edge_options.add_argument("--no-first-run")
         edge_options.add_argument("--ignore-certificate-errors")
+        edge_options.add_argument("--ignore-ssl-errors=yes")
         if devtools and not headless:
             edge_options.add_argument("--auto-open-devtools-for-tabs")
         edge_options.add_argument("--allow-file-access-from-files")
@@ -4235,10 +4245,7 @@ def get_local_driver(
         edge_options.add_argument("--allow-running-insecure-content")
         if user_agent:
             edge_options.add_argument("--user-agent=%s" % user_agent)
-        if (
-            IS_LINUX
-            or (IS_MAC and not is_using_uc(undetectable, browser_name))
-        ):
+        if IS_LINUX or (IS_MAC and not use_uc):
             edge_options.add_argument("--no-sandbox")
         if remote_debug:
             # To access the Debugger, go to: edge://inspect/#devices
@@ -4252,10 +4259,7 @@ def get_local_driver(
         if swiftshader:
             edge_options.add_argument("--use-gl=angle")
             edge_options.add_argument("--use-angle=swiftshader-webgl")
-        elif (
-            not is_using_uc(undetectable, browser_name)
-            and not enable_3d_apis
-        ):
+        elif not use_uc and not enable_3d_apis:
             edge_options.add_argument("--disable-gpu")
         if IS_LINUX:
             edge_options.add_argument("--disable-dev-shm-usage")
@@ -4502,14 +4506,14 @@ def get_local_driver(
                         and len(saved_mcv.split(".")) == 4
                     ):
                         driver_version = saved_mcv
-                        if is_using_uc(undetectable, browser_name):
+                        if use_uc:
                             use_br_version_for_uc = True
                     if (
                         (headless or headless2)
                         and IS_WINDOWS
                         and major_chrome_version
                         and int(major_chrome_version) >= 117
-                        and not is_using_uc(undetectable, browser_name)
+                        and not use_uc
                         and not (remote_debug or devtools or use_wire)
                         and not (proxy_string or multi_proxy or proxy_pac_url)
                         and (not chromium_arg or "debug" not in chromium_arg)
@@ -4565,7 +4569,7 @@ def get_local_driver(
                             use_version = ch_driver_version
             disable_build_check = True
             uc_driver_version = None
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 if use_br_version_for_uc or driver_version == "mlatest":
                     uc_driver_version = get_uc_driver_version(full=True)
                     full_ch_driver_version = uc_driver_version
@@ -4626,7 +4630,6 @@ def get_local_driver(
                         "\nWarning: Could not make chromedriver"
                         " executable: %s" % e
                     )
-            use_uc = is_using_uc(undetectable, browser_name)
             make_uc_driver_from_chromedriver = False
             local_ch_exists = (
                 LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER)
@@ -4843,7 +4846,7 @@ def get_local_driver(
             service_args = []
             if disable_build_check:
                 service_args = ["--disable-build-check"]
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 uc_lock = fasteners.InterProcessLock(
                     constants.MultiBrowser.DRIVER_FIXING_LOCK
                 )
@@ -4872,20 +4875,14 @@ def get_local_driver(
                                 "\nWarning: Could not make uc_driver"
                                 " executable: %s" % e
                             )
-            if (
-                not headless
-                or not IS_LINUX
-                or is_using_uc(undetectable, browser_name)
-            ):
+            if not headless or not IS_LINUX or use_uc:
                 uc_activated = False
                 try:
-                    if (
-                        os.path.exists(LOCAL_CHROMEDRIVER)
-                        or is_using_uc(undetectable, browser_name)
-                    ):
+                    if os.path.exists(LOCAL_CHROMEDRIVER) or use_uc:
                         if headless and not IS_LINUX:
                             undetectable = False  # No support for headless
-                        if is_using_uc(undetectable, browser_name):
+                            use_uc = is_using_uc(undetectable, browser_name)
+                        if use_uc:
                             from seleniumbase import undetected
                             from urllib.error import URLError
                             if IS_LINUX:
@@ -5185,7 +5182,7 @@ def get_local_driver(
                             driver = webdriver.Chrome(
                                 service=service, options=chrome_options
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     if not auto_upgrade_chromedriver:
                         raise  # Not an obvious fix.
                     else:
@@ -5436,11 +5433,11 @@ def get_local_driver(
                                 'Emulation.setDeviceMetricsOverride',
                                 set_device_metrics_override
                             )
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             else:  # Running headless on Linux (and not using --uc)
                 try:
                     driver = webdriver.Chrome(options=chrome_options)
-                    return extend_driver(driver)
+                    return extend_driver(driver, proxy_auth, use_uc)
                 except Exception as e:
                     if not hasattr(e, "msg"):
                         raise
@@ -5462,7 +5459,7 @@ def get_local_driver(
                             driver = webdriver.Chrome(
                                 service=service, options=chrome_options
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     mcv = None  # Major Chrome Version
                     if "Current browser version is " in e.msg:
                         line = e.msg.split("Current browser version is ")[1]
@@ -5505,7 +5502,7 @@ def get_local_driver(
                                 service=service,
                                 options=chrome_options,
                             )
-                            return extend_driver(driver)
+                            return extend_driver(driver, proxy_auth, use_uc)
                     # Use the virtual display on Linux during headless errors
                     logging.debug(
                         "\nWarning: Chrome failed to launch in"
@@ -5523,9 +5520,9 @@ def get_local_driver(
                     driver = webdriver.Chrome(
                         service=service, options=chrome_options
                     )
-                    return extend_driver(driver)
+                    return extend_driver(driver, proxy_auth, use_uc)
         except Exception as original_exception:
-            if is_using_uc(undetectable, browser_name):
+            if use_uc:
                 raise
             # Try again if Chrome didn't launch
             with suppress(Exception):
@@ -5533,7 +5530,7 @@ def get_local_driver(
                 driver = webdriver.Chrome(
                     service=service, options=chrome_options
                 )
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             if user_data_dir:
                 print("\nUnable to set user_data_dir while starting Chrome!\n")
                 raise
@@ -5560,7 +5557,7 @@ def get_local_driver(
             )
             try:
                 driver = webdriver.Chrome(service=service)
-                return extend_driver(driver)
+                return extend_driver(driver, proxy_auth, use_uc)
             except Exception:
                 raise original_exception
     else:

{seleniumbase-4.34.14 → seleniumbase-4.34.16}/seleniumbase/core/proxy_helper.py

@@ -94,21 +94,23 @@ def create_proxy_ext(
     manifest_json = (
         """{\n"""
         """"version": "1.0.0",\n"""
-        """"manifest_version": 2,\n"""
+        """"manifest_version": 3,\n"""
         """"name": "Chrome Proxy",\n"""
         """"permissions": [\n"""
         """    "proxy",\n"""
         """    "tabs",\n"""
         """    "unlimitedStorage",\n"""
         """    "storage",\n"""
-        """    "<all_urls>",\n"""
         """    "webRequest",\n"""
-        """    "webRequestBlocking"\n"""
+        """    "webRequestAuthProvider"\n"""
+        """],\n"""
+        """"host_permissions": [\n"""
+        """    "<all_urls>"\n"""
         """],\n"""
         """"background": {\n"""
-        """    "scripts": ["background.js"]\n"""
+        """    "service_worker": "background.js"\n"""
         """},\n"""
-        """"minimum_chrome_version":"22.0.0"\n"""
+        """"minimum_chrome_version":"88.0.0"\n"""
         """}"""
     )
     abs_path = os.path.abspath(".")

{seleniumbase-4.34.14 → seleniumbase-4.34.16}/seleniumbase/core/sb_cdp.py

@@ -62,6 +62,7 @@ class CDPMethods():
             lambda destination: self.__mouse_drag(element, destination)
         )
         element.mouse_move = lambda: self.__mouse_move(element)
+        element.press_keys = lambda text: self.__press_keys(element, text)
         element.query_selector = (
             lambda selector: self.__query_selector(element, selector)
         )
@@ -211,7 +212,8 @@ class CDPMethods():
                 element = self.__add_sync_methods(element.parent)
                 return self.__add_sync_methods(element)
             elif (
-                element.parent.parent
+                element.parent
+                and element.parent.parent
                 and tag_name in element.parent.parent.tag_name.lower()
                 and text.strip() in element.parent.parent.text
             ):
@@ -272,7 +274,8 @@ class CDPMethods():
                 if element not in updated_elements:
                     updated_elements.append(element)
             elif (
-                element.parent.parent
+                element.parent
+                and element.parent.parent
                 and tag_name in element.parent.parent.tag_name.lower()
                 and text.strip() in element.parent.parent.text
             ):
@@ -445,6 +448,23 @@ class CDPMethods():
             self.loop.run_until_complete(element.mouse_move_async())
         )
 
+    def __press_keys(self, element, text):
+        element.scroll_into_view()
+        submit = False
+        if text.endswith("\n") or text.endswith("\r"):
+            submit = True
+            text = text[:-1]
+        for key in text:
+            element.send_keys(key)
+            time.sleep(0.044)
+        if submit:
+            element.send_keys("\r\n")
+            time.sleep(0.044)
+        self.__slow_mode_pause_if_set()
+        return (
+            self.loop.run_until_complete(self.page.wait())
+        )
+
     def __query_selector(self, element, selector):
         selector = self.__convert_to_css_if_xpath(selector)
         element2 = self.loop.run_until_complete(
@@ -1681,21 +1701,79 @@ class CDPMethods():
                 return True
             return False
 
-    def wait_for_element_visible(self, selector, timeout=None):
+    def is_text_visible(self, text, selector="body"):
+        selector = self.__convert_to_css_if_xpath(selector)
+        text = text.strip()
+        element = None
+        try:
+            element = self.find_element(selector, timeout=0.1)
+        except Exception:
+            return False
+        with suppress(Exception):
+            if text in element.text_all:
+                return True
+        return False
+
+    def is_exact_text_visible(self, text, selector="body"):
+        selector = self.__convert_to_css_if_xpath(selector)
+        text = text.strip()
+        element = None
+        try:
+            element = self.find_element(selector, timeout=0.1)
+        except Exception:
+            return False
+        with suppress(Exception):
+            if text == element.text_all.strip():
+                return True
+        return False
+
+    def wait_for_text(self, text, selector="body", timeout=None):
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
+        text = text.strip()
+        element = None
         try:
-            self.select(selector, timeout=timeout)
+            element = self.find_element(selector, timeout=timeout)
         except Exception:
-            raise Exception("Element {%s} was not found!" % selector)
-        for i in range(30):
-            if self.is_element_visible(selector):
-                return self.select(selector)
+            raise Exception("Element {%s} not found!" % selector)
+        for i in range(int(timeout * 10)):
+            with suppress(Exception):
+                element = self.find_element(selector, timeout=0.1)
+            if text in element.text_all:
+                return True
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
             time.sleep(0.1)
-        raise Exception("Element {%s} was not visible!" % selector)
+        raise Exception(
+            "Text {%s} not found in {%s}! Actual text: {%s}"
+            % (text, selector, element.text_all)
+        )
 
-    def assert_element(self, selector, timeout=None):
-        """Same as assert_element_visible()"""
+    def wait_for_text_not_visible(self, text, selector="body", timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        text = text.strip()
+        start_ms = time.time() * 1000.0
+        stop_ms = start_ms + (timeout * 1000.0)
+        for i in range(int(timeout * 10)):
+            if not self.is_text_visible(text, selector):
+                return True
+            now_ms = time.time() * 1000.0
+            if now_ms >= stop_ms:
+                break
+            time.sleep(0.1)
+        plural = "s"
+        if timeout == 1:
+            plural = ""
+        raise Exception(
+            "Text {%s} in {%s} was still visible after %s second%s!"
+            % (text, selector, timeout, plural)
+        )
+
+    def wait_for_element_visible(self, selector, timeout=None):
         if not timeout:
             timeout = settings.SMALL_TIMEOUT
         try:
@@ -1704,10 +1782,15 @@ class CDPMethods():
             raise Exception("Element {%s} was not found!" % selector)
         for i in range(30):
             if self.is_element_visible(selector):
-                return True
+                return self.select(selector)
             time.sleep(0.1)
         raise Exception("Element {%s} was not visible!" % selector)
 
+    def assert_element(self, selector, timeout=None):
+        """Same as assert_element_visible()"""
+        self.assert_element_visible(selector, timeout=timeout)
+        return True
+
     def assert_element_visible(self, selector, timeout=None):
         """Same as assert_element()"""
         if not timeout:
@@ -1852,29 +1935,9 @@ class CDPMethods():
                 raise Exception(error % (expected, actual))
 
     def assert_text(self, text, selector="body", timeout=None):
-        if not timeout:
-            timeout = settings.SMALL_TIMEOUT
-        start_ms = time.time() * 1000.0
-        stop_ms = start_ms + (timeout * 1000.0)
-        text = text.strip()
-        element = None
-        try:
-            element = self.find_element(selector, timeout=timeout)
-        except Exception:
-            raise Exception("Element {%s} not found!" % selector)
-        for i in range(int(timeout * 10)):
-            with suppress(Exception):
-                element = self.find_element(selector, timeout=0.1)
-            if text in element.text_all:
-                return True
-            now_ms = time.time() * 1000.0
-            if now_ms >= stop_ms:
-                break
-            time.sleep(0.1)
-        raise Exception(
-            "Text {%s} not found in {%s}! Actual text: {%s}"
-            % (text, selector, element.text_all)
-        )
+        """Same as wait_for_text()"""
+        self.wait_for_text(text, selector=selector, timeout=timeout)
+        return True
 
     def assert_exact_text(self, text, selector="body", timeout=None):
         if not timeout:
@@ -1904,6 +1967,13 @@ class CDPMethods():
             % (text, element.text_all, selector)
         )
 
+    def assert_text_not_visible(self, text, selector="body", timeout=None):
+        """Raises an exception if the text is still visible after timeout."""
+        self.wait_for_text_not_visible(
+            text, selector=selector, timeout=timeout
+        )
+        return True
+
     def assert_true(self, expression):
         if not expression:
             raise AssertionError("%s is not true" % expression)

{seleniumbase-4.34.14 → seleniumbase-4.34.16}/seleniumbase/fixtures/base_case.py

@@ -1454,6 +1454,8 @@ class BaseCase(unittest.TestCase):
 
     def is_text_visible(self, text, selector="body", by="css selector"):
         """Returns whether the text substring is visible in the element."""
+        if self.__is_cdp_swap_needed():
+            return self.cdp.is_text_visible(text, selector)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         selector, by = self.__recalculate_selector(selector, by)
@@ -1464,6 +1466,8 @@ class BaseCase(unittest.TestCase):
     def is_exact_text_visible(self, text, selector="body", by="css selector"):
         """Returns whether the text is exactly equal to the element text.
         (Leading and trailing whitespace is ignored in the verification.)"""
+        if self.__is_cdp_swap_needed():
+            return self.cdp.is_exact_text_visible(text, selector)
         self.wait_for_ready_state_complete()
         time.sleep(0.01)
         selector, by = self.__recalculate_selector(selector, by)
@@ -9281,7 +9285,8 @@ class BaseCase(unittest.TestCase):
                     "bottom_left", "bottom_center", "bottom_right"]
         max_messages: The limit of concurrent messages to display."""
         self.__check_scope()
-        self._check_browser()
+        if not self.__is_cdp_swap_needed():
+            self._check_browser()
         if not theme:
             theme = "default"  # "flat"
         if not location:
@@ -9308,7 +9313,8 @@ class BaseCase(unittest.TestCase):
         You can also post messages by using =>
             self.execute_script('Messenger().post("My Message")') """
         self.__check_scope()
-        self._check_browser()
+        if not self.__is_cdp_swap_needed():
+            self._check_browser()
         if style not in ["info", "success", "error"]:
             style = "info"
         if not duration:
@@ -10326,6 +10332,10 @@ class BaseCase(unittest.TestCase):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by)
+        if self.__is_cdp_swap_needed():
+            return self.cdp.wait_for_text(
+                text, selector=selector, timeout=timeout
+            )
         return page_actions.wait_for_text_not_visible(
             self.driver, text, selector, by, timeout
         )
@@ -13909,7 +13919,8 @@ class BaseCase(unittest.TestCase):
         js_utils.highlight_element_with_js(self.driver, element, loops, o_bs)
 
     def __highlight_with_jquery(self, selector, loops, o_bs):
-        self.wait_for_ready_state_complete()
+        if not self.__is_cdp_swap_needed():
+            self.wait_for_ready_state_complete()
         js_utils.highlight_with_jquery(self.driver, selector, loops, o_bs)
 
     def __highlight_with_js_2(self, message, selector, o_bs):