seleniumbase 4.33.11__tar.gz → 4.33.12__tar.gz

{seleniumbase-4.33.11/seleniumbase.egg-info → seleniumbase-4.33.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.33.11
+Version: 4.33.12
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -64,7 +64,7 @@ Requires-Dist: packaging>=24.2
 Requires-Dist: setuptools~=70.2; python_version < "3.10"
 Requires-Dist: setuptools>=75.6.0; python_version >= "3.10"
 Requires-Dist: wheel>=0.45.1
-Requires-Dist: attrs>=24.2.0
+Requires-Dist: attrs>=24.3.0
 Requires-Dist: certifi>=2024.12.14
 Requires-Dist: exceptiongroup>=1.2.2
 Requires-Dist: websockets~=13.1; python_version < "3.9"
@@ -75,7 +75,10 @@ Requires-Dist: mycdp>=1.1.0
 Requires-Dist: pynose>=1.5.3
 Requires-Dist: platformdirs>=4.3.6
 Requires-Dist: typing-extensions>=4.12.2
-Requires-Dist: sbvirtualdisplay>=1.3.1
+Requires-Dist: sbvirtualdisplay>=1.4.0
+Requires-Dist: MarkupSafe==2.1.5; python_version < "3.9"
+Requires-Dist: MarkupSafe>=3.0.2; python_version >= "3.9"
+Requires-Dist: Jinja2>=3.1.5
 Requires-Dist: six>=1.17.0
 Requires-Dist: parse>=1.20.2
 Requires-Dist: parse-type>=0.6.4
@@ -87,9 +90,9 @@ Requires-Dist: tabcompleter>=1.4.0
 Requires-Dist: pdbp>=1.6.1
 Requires-Dist: idna==3.10
 Requires-Dist: chardet==5.2.0
-Requires-Dist: charset-normalizer==3.4.0
+Requires-Dist: charset-normalizer==3.4.1
 Requires-Dist: urllib3<2,>=1.26.20; python_version < "3.10"
-Requires-Dist: urllib3<2.3.0,>=1.26.20; python_version >= "3.10"
+Requires-Dist: urllib3<2.4.0,>=1.26.20; python_version >= "3.10"
 Requires-Dist: requests==2.32.3
 Requires-Dist: sniffio==1.3.1
 Requires-Dist: h11==0.14.0
@@ -236,7 +239,7 @@ Requires-Dist: zstandard==0.23.0; extra == "selenium-wire"
 
 📚 Learn from [**over 200 examples** in the **SeleniumBase/examples/** folder](https://github.com/seleniumbase/SeleniumBase/tree/master/examples).
 
-🐙 Note that <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md"><b>UC Mode</b></a> and <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/ReadMe.md"><b>CDP Mode</b></a> (Stealth Mode) have separate docs</a>.
+🐙 Note that <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md"><b>UC Mode</b></a> / <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/ReadMe.md"><b>CDP Mode</b></a> (Stealth Mode) have their own ReadMe files.
 
 ℹ️ Most scripts run with raw <code translate="no"><b>python</b></code>, although some scripts use <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/syntax_formats.md">Syntax Formats</a> that expect <a href="https://docs.pytest.org/en/latest/how-to/usage.html" translate="no"><b>pytest</b></a> (a Python unit-testing framework included with SeleniumBase that can discover, collect, and run tests automatically).
 
@@ -247,21 +250,37 @@ Requires-Dist: zstandard==0.23.0; extra == "selenium-wire"
 ```python
 from seleniumbase import SB
 
-with SB(test=True, ad_block=True, locale_code="en") as sb:
+with SB(test=True) as sb:
     sb.open("https://google.com/ncr")
     sb.type('[title="Search"]', "SeleniumBase GitHub page\n")
-    sb.click('[href*="github.com/seleniumbase/SeleniumBase"]')
-    sb.save_screenshot_to_logs()  # (See ./latest_logs folder)
+    sb.click('[href*="github.com/seleniumbase/"]')
+    sb.save_screenshot_to_logs()  # ./latest_logs/
     print(sb.get_page_title())
 ```
 
 > `python raw_google.py`
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/raw_google.py"><img src="https://seleniumbase.github.io/cdn/gif/google_search.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/raw_google.py"><img src="https://seleniumbase.github.io/cdn/gif/google_search.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="420" /></a>
 
 --------
 
-<p align="left">📗 Here's <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py">test_get_swag.py</a>, which tests a fake shopping site:</p>
+<p align="left">📗 Here's an example of bypassing Cloudflare's challenge page: <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/raw_gitlab.py">SeleniumBase/examples/cdp_mode/raw_gitlab.py</a></p>
+
+```python
+from seleniumbase import SB
+
+with SB(uc=True, test=True, locale_code="en") as sb:
+    url = "https://gitlab.com/users/sign_in"
+    sb.activate_cdp_mode(url)
+    sb.uc_gui_click_captcha()
+    sb.sleep(2)
+```
+
+<img src="https://seleniumbase.github.io/other/cf_sec.jpg" title="SeleniumBase" width="332"> <img src="https://seleniumbase.github.io/other/gitlab_bypass.png" title="SeleniumBase" width="288">
+
+--------
+
+<p align="left">📗 Here's <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py">test_get_swag.py</a>, which tests an e-commerce site:</p>
 
 ```python
 from seleniumbase import BaseCase
@@ -287,7 +306,7 @@ class MyTestClass(BaseCase):
 
 > `pytest test_get_swag.py`
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="520" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
 
 > (The default browser is ``--chrome`` if not set.)
 
@@ -299,7 +318,7 @@ class MyTestClass(BaseCase):
 pytest test_coffee_cart.py --demo
 ```
 
-<p align="left"><a href="https://seleniumbase.io/coffee/" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/coffee_cart.gif" width="520" alt="SeleniumBase Coffee Cart Test" title="SeleniumBase Coffee Cart Test" /></a></p>
+<p align="left"><a href="https://seleniumbase.io/coffee/" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/coffee_cart.gif" width="480" alt="SeleniumBase Coffee Cart Test" title="SeleniumBase Coffee Cart Test" /></a></p>
 
 > <p>(<code translate="no">--demo</code> mode slows down tests and highlights actions)</p>
 
@@ -313,7 +332,7 @@ pytest test_coffee_cart.py --demo
 pytest test_demo_site.py
 ```
 
-<p align="left"><a href="https://seleniumbase.io/demo_page" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/demo_page_5.gif" width="520" alt="SeleniumBase Example" title="SeleniumBase Example" /></a></p>
+<p align="left"><a href="https://seleniumbase.io/demo_page" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/demo_page_5.gif" width="480" alt="SeleniumBase Example" title="SeleniumBase Example" /></a></p>
 
 > Easy to type, click, select, toggle, drag & drop, and more.
 
@@ -569,7 +588,7 @@ cd examples/
 pytest my_first_test.py
 ```
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="520" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
 
 <p align="left"><b>Here's the full code for <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py">my_first_test.py</a>:</b></p>
 
@@ -987,7 +1006,7 @@ You can run it from the ``examples/`` folder like this:
 pytest test_fail.py
 ```
 
-🔵 You'll notice that a logs folder, "latest_logs", was created to hold information about the failing test, and screenshots. During test runs, past results get moved to the archived_logs folder if you have ARCHIVE_EXISTING_LOGS set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), or if your run tests with ``--archive-logs``. If you choose not to archive existing logs, they will be deleted and replaced by the logs of the latest test run.
+🔵 You'll notice that a logs folder, ``./latest_logs/``, was created to hold information (and screenshots) about the failing test. During test runs, past results get moved to the archived_logs folder if you have ARCHIVE_EXISTING_LOGS set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), or if your run tests with ``--archive-logs``. If you choose not to archive existing logs, they will be deleted and replaced by the logs of the latest test run.
 
 --------
 

{seleniumbase-4.33.11 → seleniumbase-4.33.12}/README.md

@@ -60,7 +60,7 @@
 
 📚 Learn from [**over 200 examples** in the **SeleniumBase/examples/** folder](https://github.com/seleniumbase/SeleniumBase/tree/master/examples).
 
-🐙 Note that <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md"><b>UC Mode</b></a> and <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/ReadMe.md"><b>CDP Mode</b></a> (Stealth Mode) have separate docs</a>.
+🐙 Note that <a translate="no" href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/uc_mode.md"><b>UC Mode</b></a> / <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/ReadMe.md"><b>CDP Mode</b></a> (Stealth Mode) have their own ReadMe files.
 
 ℹ️ Most scripts run with raw <code translate="no"><b>python</b></code>, although some scripts use <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/syntax_formats.md">Syntax Formats</a> that expect <a href="https://docs.pytest.org/en/latest/how-to/usage.html" translate="no"><b>pytest</b></a> (a Python unit-testing framework included with SeleniumBase that can discover, collect, and run tests automatically).
 
@@ -71,21 +71,37 @@
 ```python
 from seleniumbase import SB
 
-with SB(test=True, ad_block=True, locale_code="en") as sb:
+with SB(test=True) as sb:
     sb.open("https://google.com/ncr")
     sb.type('[title="Search"]', "SeleniumBase GitHub page\n")
-    sb.click('[href*="github.com/seleniumbase/SeleniumBase"]')
-    sb.save_screenshot_to_logs()  # (See ./latest_logs folder)
+    sb.click('[href*="github.com/seleniumbase/"]')
+    sb.save_screenshot_to_logs()  # ./latest_logs/
     print(sb.get_page_title())
 ```
 
 > `python raw_google.py`
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/raw_google.py"><img src="https://seleniumbase.github.io/cdn/gif/google_search.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/raw_google.py"><img src="https://seleniumbase.github.io/cdn/gif/google_search.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="420" /></a>
 
 --------
 
-<p align="left">📗 Here's <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py">test_get_swag.py</a>, which tests a fake shopping site:</p>
+<p align="left">📗 Here's an example of bypassing Cloudflare's challenge page: <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/cdp_mode/raw_gitlab.py">SeleniumBase/examples/cdp_mode/raw_gitlab.py</a></p>
+
+```python
+from seleniumbase import SB
+
+with SB(uc=True, test=True, locale_code="en") as sb:
+    url = "https://gitlab.com/users/sign_in"
+    sb.activate_cdp_mode(url)
+    sb.uc_gui_click_captcha()
+    sb.sleep(2)
+```
+
+<img src="https://seleniumbase.github.io/other/cf_sec.jpg" title="SeleniumBase" width="332"> <img src="https://seleniumbase.github.io/other/gitlab_bypass.png" title="SeleniumBase" width="288">
+
+--------
+
+<p align="left">📗 Here's <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py">test_get_swag.py</a>, which tests an e-commerce site:</p>
 
 ```python
 from seleniumbase import BaseCase
@@ -111,7 +127,7 @@ class MyTestClass(BaseCase):
 
 > `pytest test_get_swag.py`
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="520" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/test_get_swag.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
 
 > (The default browser is ``--chrome`` if not set.)
 
@@ -123,7 +139,7 @@ class MyTestClass(BaseCase):
 pytest test_coffee_cart.py --demo
 ```
 
-<p align="left"><a href="https://seleniumbase.io/coffee/" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/coffee_cart.gif" width="520" alt="SeleniumBase Coffee Cart Test" title="SeleniumBase Coffee Cart Test" /></a></p>
+<p align="left"><a href="https://seleniumbase.io/coffee/" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/coffee_cart.gif" width="480" alt="SeleniumBase Coffee Cart Test" title="SeleniumBase Coffee Cart Test" /></a></p>
 
 > <p>(<code translate="no">--demo</code> mode slows down tests and highlights actions)</p>
 
@@ -137,7 +153,7 @@ pytest test_coffee_cart.py --demo
 pytest test_demo_site.py
 ```
 
-<p align="left"><a href="https://seleniumbase.io/demo_page" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/demo_page_5.gif" width="520" alt="SeleniumBase Example" title="SeleniumBase Example" /></a></p>
+<p align="left"><a href="https://seleniumbase.io/demo_page" target="_blank"><img src="https://seleniumbase.github.io/cdn/gif/demo_page_5.gif" width="480" alt="SeleniumBase Example" title="SeleniumBase Example" /></a></p>
 
 > Easy to type, click, select, toggle, drag & drop, and more.
 
@@ -393,7 +409,7 @@ cd examples/
 pytest my_first_test.py
 ```
 
-<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="520" /></a>
+<a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py"><img src="https://seleniumbase.github.io/cdn/gif/fast_swag_2.gif" alt="SeleniumBase Test" title="SeleniumBase Test" width="480" /></a>
 
 <p align="left"><b>Here's the full code for <a href="https://github.com/seleniumbase/SeleniumBase/blob/master/examples/my_first_test.py">my_first_test.py</a>:</b></p>
 
@@ -811,7 +827,7 @@ You can run it from the ``examples/`` folder like this:
 pytest test_fail.py
 ```
 
-🔵 You'll notice that a logs folder, "latest_logs", was created to hold information about the failing test, and screenshots. During test runs, past results get moved to the archived_logs folder if you have ARCHIVE_EXISTING_LOGS set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), or if your run tests with ``--archive-logs``. If you choose not to archive existing logs, they will be deleted and replaced by the logs of the latest test run.
+🔵 You'll notice that a logs folder, ``./latest_logs/``, was created to hold information (and screenshots) about the failing test. During test runs, past results get moved to the archived_logs folder if you have ARCHIVE_EXISTING_LOGS set to True in [settings.py](https://github.com/seleniumbase/SeleniumBase/blob/master/seleniumbase/config/settings.py), or if your run tests with ``--archive-logs``. If you choose not to archive existing logs, they will be deleted and replaced by the logs of the latest test run.
 
 --------
 

{seleniumbase-4.33.11 → seleniumbase-4.33.12}/requirements.txt

@@ -3,7 +3,7 @@ packaging>=24.2
 setuptools~=70.2;python_version<"3.10"
 setuptools>=75.6.0;python_version>="3.10"
 wheel>=0.45.1
-attrs>=24.2.0
+attrs>=24.3.0
 certifi>=2024.12.14
 exceptiongroup>=1.2.2
 websockets~=13.1;python_version<"3.9"
@@ -14,7 +14,10 @@ mycdp>=1.1.0
 pynose>=1.5.3
 platformdirs>=4.3.6
 typing-extensions>=4.12.2
-sbvirtualdisplay>=1.3.1
+sbvirtualdisplay>=1.4.0
+MarkupSafe==2.1.5;python_version<"3.9"
+MarkupSafe>=3.0.2;python_version>="3.9"
+Jinja2>=3.1.5
 six>=1.17.0
 parse>=1.20.2
 parse-type>=0.6.4
@@ -26,9 +29,9 @@ tabcompleter>=1.4.0
 pdbp>=1.6.1
 idna==3.10
 chardet==5.2.0
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
 urllib3>=1.26.20,<2;python_version<"3.10"
-urllib3>=1.26.20,<2.3.0;python_version>="3.10"
+urllib3>=1.26.20,<2.4.0;python_version>="3.10"
 requests==2.32.3
 sniffio==1.3.1
 h11==0.14.0

seleniumbase-4.33.12/seleniumbase/__version__.py

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

{seleniumbase-4.33.11 → seleniumbase-4.33.12}/seleniumbase/core/log_helper.py

@@ -15,6 +15,11 @@ if sys.version_info >= (3, 11):
 py311_patch2 = constants.PatchPy311.PATCH
 
 
+def __is_cdp_swap_needed(driver):
+    """If the driver is disconnected, use a CDP method when available."""
+    return shared_utils.is_cdp_swap_needed(driver)
+
+
 def log_screenshot(test_logpath, driver, screenshot=None, get=False):
     screenshot_name = settings.SCREENSHOT_NAME
     screenshot_path = os.path.join(test_logpath, screenshot_name)
@@ -356,7 +361,11 @@ def log_page_source(test_logpath, driver, source=None):
         page_source = source
     else:
         try:
-            page_source = driver.page_source
+            page_source = None
+            if __is_cdp_swap_needed(driver):
+                page_source = driver.cdp.get_page_source()
+            else:
+                page_source = driver.page_source
             page_source = get_html_source_with_base_href(driver, page_source)
         except Exception:
             source = constants.Warnings.PAGE_SOURCE_UNDEFINED
@@ -448,7 +457,11 @@ def get_test_name(test):
 
 def get_last_page(driver):
     try:
-        last_page = driver.current_url
+        last_page = None
+        if __is_cdp_swap_needed(driver):
+            last_page = driver.cdp.get_current_url()
+        else:
+            last_page = driver.current_url
     except Exception:
         last_page = "[WARNING! Browser Not Open!]"
     if len(last_page) < 5:

{seleniumbase-4.33.11 → seleniumbase-4.33.12}/seleniumbase/core/sb_cdp.py

@@ -127,14 +127,14 @@ class CDPMethods():
     def add_handler(self, event, handler):
         self.page.add_handler(event, handler)
 
-    def find_element(
-        self, selector, best_match=False, timeout=settings.SMALL_TIMEOUT
-    ):
+    def find_element(self, selector, best_match=False, timeout=None):
         """Similar to select(), but also finds elements by text content.
         When using text-based searches, if best_match=False, then will
         find the first element with the text. If best_match=True, then
         if multiple elements have that text, then will use the element
         with the closest text-length to the text being searched for."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
         early_failure = False
@@ -167,12 +167,12 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         return element
 
-    def find_element_by_text(
-        self, text, tag_name=None, timeout=settings.SMALL_TIMEOUT
-    ):
+    def find_element_by_text(self, text, tag_name=None, timeout=None):
         """Returns an element by matching text.
         Optionally, provide a tag_name to narrow down the search to an
         element with the given tag. (Eg: a, button, div, script, span)"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__add_light_pause()
         time_now = time.time()
         self.assert_text(text, timeout=timeout)
@@ -218,7 +218,9 @@ class CDPMethods():
             % (text, tag_name, timeout, plural)
         )
 
-    def find_all(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def find_all(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
         elements = self.loop.run_until_complete(
@@ -272,8 +274,10 @@ class CDPMethods():
                     updated_elements.append(element)
         return updated_elements
 
-    def select(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def select(self, selector, timeout=None):
         """Similar to find_element(), but without text-based search."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
         if (":contains(" in selector):
@@ -307,7 +311,9 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         return element
 
-    def select_all(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def select_all(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__add_light_pause()
         selector = self.__convert_to_css_if_xpath(selector)
         elements = self.loop.run_until_complete(
@@ -319,10 +325,14 @@ class CDPMethods():
             updated_elements.append(element)
         return updated_elements
 
-    def find_elements(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def find_elements(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         return self.select_all(selector, timeout=timeout)
 
-    def find_visible_elements(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def find_visible_elements(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         visible_elements = []
         elements = self.select_all(selector, timeout=timeout)
         for element in elements:
@@ -587,12 +597,12 @@ class CDPMethods():
             driver.cookies.load(*args, **kwargs)
         )
 
-    def clear_cookies(self, *args, **kwargs):
+    def clear_cookies(self):
         driver = self.driver
         if hasattr(driver, "cdp_base"):
             driver = driver.cdp_base
         return self.loop.run_until_complete(
-            driver.cookies.clear(*args, **kwargs)
+            driver.cookies.clear()
         )
 
     def sleep(self, seconds):
@@ -616,7 +626,9 @@ class CDPMethods():
             self.page.evaluate(js_code)
         )
 
-    def click(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def click(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
         element.scroll_into_view()
@@ -672,8 +684,10 @@ class CDPMethods():
             except Exception:
                 break
 
-    def mouse_click(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def mouse_click(self, selector, timeout=None):
         """(Attempt simulating a mouse click)"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
         element.scroll_into_view()
@@ -771,7 +785,9 @@ class CDPMethods():
         with suppress(Exception):
             self.loop.run_until_complete(self.page.evaluate(js_code))
 
-    def send_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
+    def send_keys(self, selector, text, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
         element.scroll_into_view()
@@ -781,8 +797,10 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
-    def press_keys(self, selector, text, timeout=settings.SMALL_TIMEOUT):
+    def press_keys(self, selector, text, timeout=None):
         """Similar to send_keys(), but presses keys at human speed."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
         element.scroll_into_view()
@@ -799,8 +817,10 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
-    def type(self, selector, text, timeout=settings.SMALL_TIMEOUT):
+    def type(self, selector, text, timeout=None):
         """Similar to send_keys(), but clears the text field first."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.select(selector, timeout=timeout)
         element.scroll_into_view()
@@ -812,8 +832,10 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait())
 
-    def set_value(self, selector, text, timeout=settings.SMALL_TIMEOUT):
+    def set_value(self, selector, text, timeout=None):
         """Similar to send_keys(), but clears the text field first."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         selector = self.__convert_to_css_if_xpath(selector)
         element = self.select(selector, timeout=timeout)
@@ -1036,7 +1058,9 @@ 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, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         selector = self.__convert_to_css_if_xpath(selector)
         self.select(selector, timeout=timeout)
         self.__add_light_pause()
@@ -1049,23 +1073,29 @@ class CDPMethods():
         )
         return coordinates
 
-    def get_element_size(self, selector):
-        element_rect = self.get_element_rect(selector)
+    def get_element_size(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        element_rect = self.get_element_rect(selector, timeout=timeout)
         coordinates = {}
         coordinates["width"] = element_rect["width"]
         coordinates["height"] = element_rect["height"]
         return coordinates
 
-    def get_element_position(self, selector):
-        element_rect = self.get_element_rect(selector)
+    def get_element_position(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        element_rect = self.get_element_rect(selector, timeout=timeout)
         coordinates = {}
         coordinates["x"] = element_rect["x"]
         coordinates["y"] = element_rect["y"]
         return coordinates
 
-    def get_gui_element_rect(self, selector):
+    def get_gui_element_rect(self, selector, timeout=None):
         """(Coordinates are relative to the screen. Not the window.)"""
-        element_rect = self.get_element_rect(selector)
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        element_rect = self.get_element_rect(selector, timeout=timeout)
         e_width = element_rect["width"]
         e_height = element_rect["height"]
         window_rect = self.get_window_rect()
@@ -1079,9 +1109,11 @@ class CDPMethods():
         y = y + window_rect["scrollY"]
         return ({"height": e_height, "width": e_width, "x": x, "y": y})
 
-    def get_gui_element_center(self, selector):
+    def get_gui_element_center(self, selector, timeout=None):
         """(Coordinates are relative to the screen. Not the window.)"""
-        element_rect = self.get_gui_element_rect(selector)
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        element_rect = self.get_gui_element_rect(selector, timeout=timeout)
         e_width = element_rect["width"]
         e_height = element_rect["height"]
         e_x = element_rect["x"]
@@ -1629,9 +1661,9 @@ class CDPMethods():
                 return True
             return False
 
-    def wait_for_element_visible(
-        self, selector, timeout=settings.SMALL_TIMEOUT
-    ):
+    def wait_for_element_visible(self, selector, timeout=None):
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         try:
             self.select(selector, timeout=timeout)
         except Exception:
@@ -1642,8 +1674,10 @@ class CDPMethods():
             time.sleep(0.1)
         raise Exception("Element {%s} was not visible!" % selector)
 
-    def assert_element(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def assert_element(self, selector, timeout=None):
         """Same as assert_element_visible()"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         try:
             self.select(selector, timeout=timeout)
         except Exception:
@@ -1654,8 +1688,10 @@ class CDPMethods():
             time.sleep(0.1)
         raise Exception("Element {%s} was not visible!" % selector)
 
-    def assert_element_visible(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def assert_element_visible(self, selector, timeout=None):
         """Same as assert_element()"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         try:
             self.select(selector, timeout=timeout)
         except Exception:
@@ -1666,16 +1702,20 @@ class CDPMethods():
             time.sleep(0.1)
         raise Exception("Element {%s} was not visible!" % selector)
 
-    def assert_element_present(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def assert_element_present(self, selector, timeout=None):
         """Assert element is present in the DOM. (Visibility NOT required)"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         try:
             self.select(selector, timeout=timeout)
         except Exception:
             raise Exception("Element {%s} was not found!" % selector)
         return True
 
-    def assert_element_absent(self, selector, timeout=settings.SMALL_TIMEOUT):
+    def assert_element_absent(self, selector, timeout=None):
         """Assert element is not present in the DOM."""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         start_ms = time.time() * 1000.0
         stop_ms = start_ms + (timeout * 1000.0)
         for i in range(int(timeout * 10)):
@@ -1693,10 +1733,10 @@ class CDPMethods():
             % (selector, timeout, plural)
         )
 
-    def assert_element_not_visible(
-        self, selector, timeout=settings.SMALL_TIMEOUT
-    ):
+    def assert_element_not_visible(self, selector, timeout=None):
         """Assert element is not visible on page. (May still be in DOM)"""
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
         start_ms = time.time() * 1000.0
         stop_ms = start_ms + (timeout * 1000.0)
         for i in range(int(timeout * 10)):
@@ -1791,9 +1831,9 @@ class CDPMethods():
             if expected not in actual:
                 raise Exception(error % (expected, actual))
 
-    def assert_text(
-        self, text, selector="body", timeout=settings.SMALL_TIMEOUT
-    ):
+    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()
@@ -1816,9 +1856,9 @@ class CDPMethods():
             % (text, selector, element.text_all)
         )
 
-    def assert_exact_text(
-        self, text, selector="body", timeout=settings.SMALL_TIMEOUT
-    ):
+    def assert_exact_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()