Merge pull request #2199 from seleniumbase/refactor-code-and-refresh-dependencies

Refactor code and refresh dependencies

Author: mdmintz

examples/proxy_test.py

@@ -22,6 +22,7 @@ def test_proxy(self):
             # This page takes too long to load otherwise
             self.get_new_driver(page_load_strategy="none")
         self.open("https://ipinfo.io/")
+        self.wait_for_non_empty_text("form input", timeout=20)
         ip_address = self.get_text('#ip-string span[class*="primary"] span')
         print("\n\nMy IP Address = %s\n" % ip_address)
         print("Displaying Host Info:")

examples/test_hack_search.py

@@ -25,7 +25,8 @@ def test_hack_search(self):
         self.highlight_click('[href*="github.com/seleniumbase/SeleniumBase"]')
         self.highlight_click('[href="/seleniumbase/SeleniumBase"]')
         self.highlight_click('a[title="examples"]')
-        self.assert_text("examples", "#file-name-id")
-        self.highlight_click('div[title="test_hack_search.py"] a')
-        self.assert_text("test_hack_search.py", "#file-name-id")
-        self.highlight("#file-name-id")
+        self.assert_text("examples", "#file-name-id-wide")
+        self.highlight('a[aria-describedby="item-type-test_hack_search.py"]')
+        self.click('a[aria-describedby="item-type-test_hack_search.py"]')
+        self.assert_text("test_hack_search.py", "#file-name-id-wide")
+        self.highlight("#file-name-id-wide")

help_docs/features_list.md

@@ -1,7 +1,7 @@
 <!-- SeleniumBase Docs -->
 
-<!-- YouTube View --><a href="https://www.youtube.com/watch?v=Sjzq9kU5kOw"><img src="http://img.youtube.com/vi/Sjzq9kU5kOw/0.jpg" title="SeleniumBase on YouTube" width="285" /></a>
-<!-- GitHub Only --><p>(<b><a href="https://www.youtube.com/watch?v=Sjzq9kU5kOw">Watch the tutorial on YouTube</a></b>)</p>
+<!-- YouTube View --><a href="https://www.youtube.com/watch?v=EablmOazy-k"><img src="http://img.youtube.com/vi/EablmOazy-k/0.jpg" title="SeleniumBase on YouTube" width="285" /></a>
+<!-- GitHub Only --><p>(<b><a href="https://www.youtube.com/watch?v=EablmOazy-k">Watch the new tutorial on YouTube</a></b>)</p>
 
 <a id="feature_list"></a>
 
@@ -53,6 +53,8 @@
 <!-- YouTube View --><a href="https://www.youtube.com/watch?v=yEQeAU_mrg0"><img src="http://img.youtube.com/vi/yEQeAU_mrg0/0.jpg" title="SeleniumBase on YouTube" width="285" /></a>
 <!-- GitHub Only --><p>(<b><a href="https://www.youtube.com/watch?v=yEQeAU_mrg0">Have fun with test automation!</a></b>)</p>
 
+(<b><a href="https://www.youtube.com/watch?v=Sjzq9kU5kOw">Watch the old tutorial on YouTube</a></b>)
+
 <p align="left"><a href="https://github.com/seleniumbase/SeleniumBase/"><img src="https://seleniumbase.github.io/cdn/img/sb_logo_10.png" alt="SeleniumBase" title="SeleniumBase" width="200"></a></p>
 
 [<img src="https://seleniumbase.github.io/cdn/img/super_logo_sb.png" title="SeleniumBase" width="200">](https://seleniumbase.io/)

help_docs/method_summary.md

@@ -635,11 +635,9 @@ self.add_slide(
     content=None, image=None, code=None, iframe=None,
     content2=None, notes=None, transition=None, name=None)
 
-self.save_presentation(
-    name=None, filename=None, show_notes=False, interval=0)
+self.save_presentation(name=None, filename=None, show_notes=False, interval=0)
 
-self.begin_presentation(
-    name=None, filename=None, show_notes=False, interval=0)
+self.begin_presentation(name=None, filename=None, show_notes=False, interval=0)
 
 ############
 
@@ -692,8 +690,7 @@ self.create_introjs_tour(name=None)
 
 self.set_introjs_colors(theme_color=None, hover_color=None)
 
-self.add_tour_step(
-    message, selector=None, name=None, title=None, theme=None, alignment=None)
+self.add_tour_step(message, selector=None, name=None, title=None, theme=None, alignment=None)
 
 self.play_tour(name=None, interval=0)
 # Duplicates:
@@ -727,8 +724,7 @@ self.post_success_message(message, duration=None, pause=True)
 
 self.post_error_message(message, duration=None, pause=True)
 
-self.set_messenger_theme(
-    theme="default", location="default", max_messages="default")
+self.set_messenger_theme(theme="default", location="default", max_messages="default")
 
 ############
 
@@ -874,25 +870,21 @@ self.quit_extra_driver(driver=None)
 
 ############
 
-self.check_window(
-    name="default", level=0, baseline=False, check_domain=True, full_diff=False)
+self.check_window(name="default", level=0, baseline=False, check_domain=True, full_diff=False)
 
 ############
 
-self.deferred_assert_element(
-    selector, by="css selector", timeout=None, fs=False)
+self.deferred_assert_element(selector, by="css selector", timeout=None, fs=False)
 # Duplicates:
 # self.delayed_assert_element(
 #     selector, by="css selector", timeout=None, fs=False)
 
-self.deferred_assert_element_present(
-    selector, by="css selector", timeout=None, fs=False)
+self.deferred_assert_element_present(selector, by="css selector", timeout=None, fs=False)
 # Duplicates:
 # self.delayed_assert_element_present(
 #     selector, by="css selector", timeout=None, fs=False)
 
-self.deferred_assert_text(
-    text, selector="html", by="css selector", timeout=None, fs=False)
+self.deferred_assert_text(text, selector="html", by="css selector", timeout=None, fs=False)
 # Duplicates:
 # self.delayed_assert_text(
 #     text, selector="html", by="css selector", timeout=None, fs=False)
@@ -926,6 +918,96 @@ self.fail(msg=None)  # Inherited from "unittest"
 self._check_browser()  # Fails test cleanly if the active window is closed
 
 self._print(TEXT)  # Calls Python's print() / Allows for translations
+
+############
+
+# "driver"-specific methods added by SeleniumBase
+
+driver.default_get(url)  # Because driver.get(url) works differently in UC Mode
+
+driver.open(url)  # Like driver.get(), but allows partial URLs without protocol
+
+driver.click(selector)
+
+driver.click_link(link_text)
+
+driver.click_if_visible(selector)
+
+driver.click_active_element()
+
+driver.send_keys(selector, text)
+
+driver.press_keys(selector, text)
+
+driver.type(selector, text)
+
+driver.submit(selector)
+
+driver.assert_element(selector)
+
+driver.assert_element_present(selector)
+
+driver.assert_element_not_visible(selector)
+
+driver.assert_text(text, selector)
+
+driver.assert_exact_text(text, selector)
+
+driver.wait_for_element(selector)
+
+driver.wait_for_text(text, selector)
+
+driver.wait_for_exact_text(text, selector)
+
+driver.wait_for_and_accept_alert()
+
+driver.wait_for_and_dismiss_alert()
+
+driver.is_element_present(selector)
+
+driver.is_element_visible(selector)
+
+driver.is_text_visible(text, selector)
+
+driver.is_exact_text_visible(text, selector)
+
+driver.is_attribute_present(selector, attribute)
+
+driver.get_text(selector)
+
+driver.js_click(selector)
+
+driver.get_active_element_css()
+
+driver.get_locale_code()
+
+driver.get_origin()
+
+driver.get_user_agent()
+
+driver.highlight(selector)
+
+driver.highlight_click(selector)
+
+driver.sleep(seconds)
+
+driver.get_page_source()
+
+driver.get_title()
+
+############
+
+# "driver"-specific methods added by SeleniumBase for UC Mode: "--uc" / uc=True
+
+driver.uc_open(url)
+
+driver.uc_open_with_tab(url)
+
+driver.uc_open_with_reconnect(url, reconnect_time=None)
+
+driver.uc_click(selector)
+
+############
 ```
 
 --------

help_docs/recorder_mode.md

@@ -9,7 +9,9 @@
 
 <img src="https://seleniumbase.github.io/cdn/img/sb_recorder_notification.png" title="SeleniumBase" width="380">
 
-⏺️ To make a new recording with Recorder Mode, use ``sbase mkrec``, ``sbase codegen``, or ``sbase record``):
+ℹ️ Recorder Mode can be activated from the command-line interface, or from the Recorder Desktop App.
+
+⏺️ To make a new recording from the command-line interface, use ``sbase mkrec``, ``sbase codegen``, or ``sbase record``):
 
 ```bash
 sbase mkrec TEST_NAME.py --url=URL
@@ -46,20 +48,20 @@ pytest new_test.py --rec -q -s --url=wikipedia.org
 *** RECORDING COPIED to: new_test.py
 ```
 
-🔴 You can also activate Recorder Mode from the Desktop App:
+🔴 You can also activate Recorder Mode from the Recorder Desktop App:
 
 ```bash
 sbase recorder
 * Starting the SeleniumBase Recorder Desktop App...
 ```
 
-<img src="https://seleniumbase.github.io/cdn/img/recorder_desktop.png" title="SeleniumBase" width="340">
+<img src="https://seleniumbase.github.io/cdn/img/recorder_desktop_2.png" title="SeleniumBase" width="340">
 
 ⏺️ While a recording is in progress, you can press the ``[ESC]`` key to pause the Recorder. To resume the recording, you can hit the ``[~`]`` key, which is located directly below the ``[ESC]`` key on most keyboards.
 
 ⏺️ From within Recorder Mode there are two additional modes: "Assert Element Mode" and "Assert Text Mode". To switch into "Assert Element Mode", press the ``[^]-key (SHIFT+6)``: The border will become purple, and you'll be able to click on elements to assert from your test. To switch into "Assert Text Mode", press the ``[&]-key (SHIFT+7)``: The border will become teal, and you'll be able to click on elements for asserting text from your test.
 
-While using either of the two special Assertion Modes, certain actions such as clicking on links won't have any effect. This lets you make assertions on elements without navigating away from the page, etc. To add an assertion for buttons without triggering default "click" behavior, mouse-down on the button and then mouse-up somewhere else. (This prevents a detected click while still recording the assert.) To return back to the original Recorder Mode, press any key other than ``[SHIFT]`` or ``[BACKSPACE]`` (Eg: Press ``[CONTROL]``, etc.). Press ``[ESC]`` once to leave the Assertion Modes, but it'll stop the Recorder if you press it again.
+⏺️ While using either of the two special Assertion Modes, certain actions such as clicking on links won't have any effect. This lets you make assertions on elements without navigating away from the page, etc. To add an assertion for buttons without triggering default "click" behavior, mouse-down on the button and then mouse-up somewhere else. (This prevents a detected click while still recording the assert.) To return back to the original Recorder Mode, press any key other than ``[SHIFT]`` or ``[BACKSPACE]`` (Eg: Press ``[CONTROL]``, etc.). Press ``[ESC]`` once to leave the Assertion Modes, but it'll stop the Recorder if you press it again.
 
 ⏺️ For extra flexibility, the ``sbase mkrec`` command can be split into four separate commands:
 

mkdocs_build/requirements.txt

@@ -23,4 +23,4 @@ mkdocs==1.5.3
 mkdocs-material==9.4.6
 mkdocs-exclude-search==0.6.5
 mkdocs-simple-hooks==0.1.5
-mkdocs-material-extensions==1.2
+mkdocs-material-extensions==1.3

requirements.txt

@@ -1,4 +1,4 @@
-pip>=23.2.1
+pip>=23.3
 packaging>=23.2
 setuptools>=68.0.0;python_version<"3.8"
 setuptools>=68.2.2;python_version>="3.8"
@@ -14,13 +14,13 @@ six==1.16.0
 idna==3.4
 chardet==5.2.0
 charset-normalizer==3.3.0
-urllib3>=1.26.16,<2;python_version<"3.10"
-urllib3>=1.26.16,<2.1.0;python_version>="3.10"
+urllib3>=1.26.18,<2;python_version<"3.10"
+urllib3>=1.26.18,<2.1.0;python_version>="3.10"
 requests==2.31.0
 pynose==1.4.8
 sniffio==1.3.0
 h11==0.14.0
-outcome==1.2.0
+outcome==1.3.0
 trio==0.22.2
 trio-websocket==0.11.1
 wsproto==1.2.0

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.20.3"
+__version__ = "4.20.4"

seleniumbase/config/proxy_list.py

@@ -23,8 +23,9 @@
 """
 
 PROXY_LIST = {
-    "example1": "151.181.91.10:80",  # (Example) - set your own proxy here
-    "example2": "socks4://50.197.210.138:32100",  # (Example)
+    "example1": "138.199.48.1:8443",  # (Example) - set your own proxy here
+    "example2": "socks4://167.71.100.140:55229",  # (Example)
+    "example3": "socks5://167.172.159.43:49633",  # (Example)
     "proxy1": None,
     "proxy2": None,
     "proxy3": None,

seleniumbase/core/browser_launcher.py

@@ -329,9 +329,7 @@ def uc_special_open_if_cf(
     device_height=None,
     device_pixel_ratio=None,
 ):
-    if (
-        url.startswith("http:") or url.startswith("https:")
-    ):
+    if url.startswith("http:") or url.startswith("https:"):
         special = False
         try:
             req_get = requests_get(url, proxy_string)
@@ -427,6 +425,13 @@ def uc_open_with_reconnect(driver, url, reconnect_time=None):
     return None
 
 
+def uc_click(
+    driver, selector, by="css selector", timeout=settings.SMALL_TIMEOUT
+):
+    element = driver.wait_for_element(selector, by=by, timeout=timeout)
+    element.uc_click()
+
+
 def edgedriver_on_path():
     return os.path.exists(LOCAL_EDGEDRIVER)
 
@@ -3485,6 +3490,9 @@ def get_local_driver(
                             driver, *args, **kwargs
                         )
                     )
+                    driver.uc_click = lambda *args, **kwargs: uc_click(
+                        driver, *args, **kwargs
+                    )
                     if mobile_emulator:
                         uc_metrics = {}
                         if (