Merge pull request #686 from seleniumbase/update-methods-that-click-visible-elements

Update methods that click visible elements

Author: mdmintz

help_docs/method_summary.md

@@ -96,9 +96,9 @@ self.find_elements(selector, by=By.CSS_SELECTOR, limit=0)
 
 self.find_visible_elements(selector, by=By.CSS_SELECTOR, limit=0)
 
-self.click_visible_elements(selector, by=By.CSS_SELECTOR, limit=0)
+self.click_visible_elements(selector, by=By.CSS_SELECTOR, limit=0, timeout=None)
 
-self.click_nth_visible_element(selector, number, by=By.CSS_SELECTOR)
+self.click_nth_visible_element(selector, number, by=By.CSS_SELECTOR, timeout=None)
 
 self.click_if_visible(selector, by=By.CSS_SELECTOR)
 

requirements.txt

@@ -1,4 +1,4 @@
-pip>=20.2.2
+pip>=20.2.3
 packaging>=20.4
 setuptools>=44.1.1;python_version<"3.5"
 setuptools>=50.3.0;python_version>="3.5"

seleniumbase/fixtures/base_case.py

@@ -1029,17 +1029,21 @@ def find_visible_elements(self, selector, by=By.CSS_SELECTOR, limit=0):
             v_elems = v_elems[:limit]
         return v_elems
 
-    def click_visible_elements(self, selector, by=By.CSS_SELECTOR, limit=0):
+    def click_visible_elements(
+            self, selector, by=By.CSS_SELECTOR, limit=0, timeout=None):
         """ Finds all matching page elements and clicks visible ones in order.
             If a click reloads or opens a new page, the clicking will stop.
             If no matching elements appear, an Exception will be raised.
             If "limit" is set and > 0, will only click that many elements.
             Also clicks elements that become visible from previous clicks.
             Works best for actions such as clicking all checkboxes on a page.
             Example:  self.click_visible_elements('input[type="checkbox"]') """
+        if not timeout:
+            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)
-        self.wait_for_element_present(
-            selector, by=by, timeout=settings.SMALL_TIMEOUT)
+        self.wait_for_element_present(selector, by=by, timeout=timeout)
         elements = self.find_elements(selector, by=by)
         if self.browser == "safari":
             if not limit:
@@ -1088,10 +1092,17 @@ def click_visible_elements(self, selector, by=By.CSS_SELECTOR, limit=0):
                 except (StaleElementReferenceException, ENI_Exception):
                     return  # Probably on new page / Elements are all stale
 
-    def click_nth_visible_element(self, selector, number, by=By.CSS_SELECTOR):
+    def click_nth_visible_element(
+            self, selector, number, by=By.CSS_SELECTOR, timeout=None):
         """ Finds all matching page elements and clicks the nth visible one.
             Example:  self.click_nth_visible_element('[type="checkbox"]', 5)
                         (Clicks the 5th visible checkbox on the page.) """
+        if not timeout:
+            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)
+        self.wait_for_element_present(selector, by=by, timeout=timeout)
         elements = self.find_visible_elements(selector, by=by)
         if len(elements) < number:
             raise Exception("Not enough matching {%s} elements of type {%s} to"

setup.py

@@ -54,7 +54,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.49.4',
+    version='1.49.5',
     description='Web Automation and Test Framework - https://seleniumbase.io',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -90,7 +90,7 @@
         "Topic :: Utilities",
     ],
     install_requires=[
-        'pip>=20.2.2',
+        'pip>=20.2.3',
         'packaging>=20.4',
         'setuptools>=44.1.1;python_version<"3.5"',
         'setuptools>=50.3.0;python_version>="3.5"',