Merge pull request #1992 from seleniumbase/dependencies-and-uc-mode-updates

Update UC Mode, JS methods, and dependencies

Author: mdmintz

examples/translations/ReadMe.md

@@ -19,6 +19,7 @@ class 我的测试类(硒测试用例):
         self.输入文本('input[name="search"]', "舞龍")
         self.单击('button:contains("搜索")')
         self.断言文本("舞龍", "#firstHeading")
+        self.断言元素('img[src*="Chinese_draak.jpg"]')
 ```
 
 Here's another example:
@@ -36,6 +37,9 @@ class 私のテストクラス(セレニウムテストケース):
         self.クリックして("#searchform button")
         self.テキストを確認する("アニメ", "#firstHeading")
         self.JS入力('input[name="search"]', "寿司")
+        self.クリックして("#searchform button")
+        self.テキストを確認する("寿司", "#firstHeading")
+        self.要素を確認する('img[alt="握り寿司"]')
 ```
 
 <a id="translation_api"></a>

examples/translations/chinese_test_1.py

@@ -13,10 +13,12 @@ def test_例子1(self):
         self.单击('button:contains("搜索")')
         self.断言文本("舞龍", "#firstHeading")
         self.断言元素('img[src*="Chinese_draak.jpg"]')
+        self.回去()
         self.输入文本('input[name="search"]', "麻婆豆腐")
         self.单击('button:contains("搜索")')
         self.断言文本("麻婆豆腐", "#firstHeading")
         self.断言元素('figure:contains("一家中餐館的麻婆豆腐")')
+        self.回去()
         self.输入文本('input[name="search"]', "精武英雄")
         self.单击('button:contains("搜索")')
         self.断言元素('img[src*="Fist_of_legend.jpg"]')

examples/uc_cdp_events.py

@@ -3,7 +3,7 @@
 
 if __name__ == "__main__":
     from pytest import main
-    main([__file__, "--uc", "--uc-cdp", "--incognito", "-s"])
+    main([__file__, "--uc", "--uc-cdp", "-s"])
 
 
 class CDPTests(BaseCase):
@@ -23,10 +23,8 @@ def fail_me(self):
         self.fail('Selenium was detected! Try using: "pytest --uc"')
 
     def test_display_cdp_events(self):
-        if not (self.undetectable and self.uc_cdp_events and self.incognito):
-            self.get_new_driver(
-                undetectable=True, uc_cdp_events=True, incognito=True
-            )
+        if not (self.undetectable and self.uc_cdp_events):
+            self.get_new_driver(undetectable=True, uc_cdp_events=True)
         self.open("https://nowsecure.nl/#relax")
         try:
             self.verify_success()

help_docs/method_summary.md

@@ -383,17 +383,17 @@ self.scroll_to_bottom()
 
 self.click_xpath(xpath)
 
-self.js_click(selector, by="css selector", all_matches=False, scroll=True)
+self.js_click(selector, by="css selector", all_matches=False, timeout=None, scroll=True)
 
 self.js_click_if_present(selector, by="css selector", timeout=0)
 
 self.js_click_if_visible(selector, by="css selector", timeout=0)
 
-self.js_click_all(selector, by="css selector")
+self.js_click_all(selector, by="css selector", timeout=None)
 
-self.jquery_click(selector, by="css selector")
+self.jquery_click(selector, by="css selector", timeout=None)
 
-self.jquery_click_all(selector, by="css selector")
+self.jquery_click_all(selector, by="css selector", timeout=None)
 
 self.hide_element(selector, by="css selector")
 

help_docs/syntax_formats.md

@@ -415,10 +415,12 @@ class 我的测试类(硒测试用例):
         self.单击('button:contains("搜索")')
         self.断言文本("舞龍", "#firstHeading")
         self.断言元素('img[src*="Chinese_draak.jpg"]')
+        self.回去()
         self.输入文本('input[name="search"]', "麻婆豆腐")
         self.单击('button:contains("搜索")')
         self.断言文本("麻婆豆腐", "#firstHeading")
         self.断言元素('figure:contains("一家中餐館的麻婆豆腐")')
+        self.回去()
         self.输入文本('input[name="search"]', "精武英雄")
         self.单击('button:contains("搜索")')
         self.断言元素('img[src*="Fist_of_legend.jpg"]')

help_docs/translations.md

@@ -21,6 +21,7 @@ class 我的测试类(硒测试用例):
         self.输入文本('input[name="search"]', "舞龍")
         self.单击('button:contains("搜索")')
         self.断言文本("舞龍", "#firstHeading")
+        self.断言元素('img[src*="Chinese_draak.jpg"]')
 ```
 
 Here's another example:
@@ -38,6 +39,9 @@ class 私のテストクラス(セレニウムテストケース):
         self.クリックして("#searchform button")
         self.テキストを確認する("アニメ", "#firstHeading")
         self.JS入力('input[name="search"]', "寿司")
+        self.クリックして("#searchform button")
+        self.テキストを確認する("寿司", "#firstHeading")
+        self.要素を確認する('img[alt="握り寿司"]')
 ```
 
 <a id="translation_api"></a>

mkdocs_build/requirements.txt

@@ -1,7 +1,7 @@
 # mkdocs dependencies for generating the seleniumbase.io website
 # Minimum Python version: 3.8 (for generating docs only)
 
-regex>=2023.6.3
+regex>=2023.8.8
 pkginfo>=1.9.6
 PyYAML>=6.0.1
 readme-renderer>=40.0
@@ -11,6 +11,8 @@ pipdeptree>=2.12.0
 bleach>=6.0.0
 docutils>=0.20.1
 python-dateutil>=2.8.2
+tqdm>=4.65.2
+nltk>=3.8.1
 livereload==2.6.3
 joblib==1.3.1
 Markdown==3.4.4
@@ -19,7 +21,6 @@ Jinja2==3.1.2
 click==8.1.6
 ghp-import==2.1.0
 lunr==0.6.2
-nltk==3.8.1
 tornado==6.3.2
 watchdog==3.0.0
 cairocffi==1.6.1

requirements.txt

@@ -26,7 +26,7 @@ urllib3>=1.26.16,<2;python_version>="3.7" and python_version<"3.10"
 urllib3>=1.26.16,<2.1.0;python_version>="3.10"
 requests==2.27.1;python_version<"3.7"
 requests==2.31.0;python_version>="3.7"
-pynose==1.4.7
+pynose==1.4.8
 sniffio==1.3.0;python_version>="3.7"
 h11==0.14.0;python_version>="3.7"
 outcome==1.2.0;python_version>="3.7"
@@ -67,10 +67,10 @@ soupsieve==2.3.2.post1;python_version<"3.7"
 soupsieve==2.4.1;python_version>="3.7"
 beautifulsoup4==4.12.2
 pygments==2.14.0;python_version<"3.7"
-pygments==2.15.1;python_version>="3.7"
+pygments==2.16.1;python_version>="3.7"
 pyreadline3==3.4.1;platform_system=="Windows"
 tabcompleter==1.2.1
-pdbp==1.4.3
+pdbp==1.4.4
 colorama==0.4.5;python_version<"3.7"
 colorama==0.4.6;python_version>="3.7"
 exceptiongroup==1.1.2;python_version>="3.7"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.17.1"
+__version__ = "4.17.2"

seleniumbase/fixtures/base_case.py

@@ -5687,13 +5687,22 @@ def click_xpath(self, xpath):
         self.click(xpath, by="xpath")
 
     def js_click(
-        self, selector, by="css selector", all_matches=False, scroll=True
+        self,
+        selector,
+        by="css selector",
+        all_matches=False,
+        timeout=None,
+        scroll=True,
     ):
         """Clicks an element using JavaScript.
         Can be used to click hidden / invisible elements.
         If "all_matches" is False, only the first match is clicked.
         If "scroll" is False, won't scroll unless running in Demo Mode."""
         self.wait_for_ready_state_complete()
+        if not timeout or timeout is True:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
         selector, by = self.__recalculate_selector(selector, by, xp_ok=False)
         if by == By.LINK_TEXT:
             message = (
@@ -5706,7 +5715,7 @@ def js_click(
             self.click(selector, by=by)
             return
         element = self.wait_for_element_present(
-            selector, by=by, timeout=settings.SMALL_TIMEOUT
+            selector, by=by, timeout=timeout
         )
         if not page_actions.is_element_clickable(self.driver, selector, by):
             self.wait_for_ready_state_complete()
@@ -5818,9 +5827,7 @@ def js_click_if_present(self, selector, by="css selector", timeout=0):
             self.js_click(selector, by=by)
         elif timeout > 0:
             try:
-                self.wait_for_element_present(
-                    selector, by=by, timeout=timeout
-                )
+                self.wait_for_element_present(selector, by=by, timeout=timeout)
             except Exception:
                 pass
             if self.is_element_present(selector, by=by):
@@ -5836,27 +5843,29 @@ def js_click_if_visible(self, selector, by="css selector", timeout=0):
             self.js_click(selector, by=by)
         elif timeout > 0:
             try:
-                self.wait_for_element_visible(
-                    selector, by=by, timeout=timeout
-                )
+                self.wait_for_element_visible(selector, by=by, timeout=timeout)
             except Exception:
                 pass
             if self.is_element_visible(selector, by=by):
                 self.js_click(selector, by=by)
 
-    def js_click_all(self, selector, by="css selector"):
+    def js_click_all(self, selector, by="css selector", timeout=None):
         """Clicks all matching elements using pure JS. (No jQuery)"""
-        self.js_click(selector, by="css selector", all_matches=True)
+        self.js_click(
+            selector, by="css selector", all_matches=True, timeout=timeout
+        )
 
-    def jquery_click(self, selector, by="css selector"):
+    def jquery_click(self, selector, by="css selector", timeout=None):
         """Clicks an element using jQuery. (Different from using pure JS.)
         Can be used to click hidden / invisible elements."""
         self.__check_scope()
+        if not timeout or timeout is True:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by, xp_ok=False)
-        self.wait_for_element_present(
-            selector, by=by, timeout=settings.SMALL_TIMEOUT
-        )
+        self.wait_for_element_present(selector, by=by, timeout=timeout)
         if self.is_element_visible(selector, by=by):
             self.__demo_mode_highlight_if_active(selector, by)
         selector = self.convert_to_css_selector(selector, by=by)
@@ -5887,14 +5896,16 @@ def jquery_click(self, selector, by="css selector"):
         self.safe_execute_script(click_script)
         self.__demo_mode_pause_if_active()
 
-    def jquery_click_all(self, selector, by="css selector"):
+    def jquery_click_all(self, selector, by="css selector", timeout=None):
         """Clicks all matching elements using jQuery."""
         self.__check_scope()
+        if not timeout or timeout is True:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
         original_selector = selector
         selector, by = self.__recalculate_selector(selector, by, xp_ok=False)
-        self.wait_for_element_present(
-            selector, by=by, timeout=settings.SMALL_TIMEOUT
-        )
+        self.wait_for_element_present(selector, by=by, timeout=timeout)
         if self.is_element_visible(selector, by=by):
             self.__demo_mode_highlight_if_active(selector, by)
         css_selector = self.convert_to_css_selector(selector, by=by)