wcp-library 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

wcp_library/selenium_helper.py

@@ -65,24 +65,44 @@ class SeleniumHelper:
             if b.text == text:
                 return b
 
-    def wait_until_element_visible(self, css_element: str, timeout: int = 30) -> None:
+    def wait_until_element_visible(self, css_element: Optional[str] = None, link_text: Optional[str] = None,
+                                   timeout: int = 30) -> None:
         """
         Wait until an element is visible
 
+        Must pass one of: css_element or link_text
+
         :param css_element:
+        :param link_text:
         :param timeout:
         :return:
         """
 
-        WebDriverWait(self.driver, timeout).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, css_element)))
+        if not css_element and not link_text:
+            raise ValueError("Must pass one of: css_element or link_text")
+
+        if css_element:
+            WebDriverWait(self.driver, timeout).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, css_element)))
+        elif link_text:
+            WebDriverWait(self.driver, timeout).until(expected_conditions.presence_of_element_located((By.LINK_TEXT, link_text)))
 
-    def wait_until_clickable(self, css_element: str, timeout: int = 30) -> None:
+    def wait_until_clickable(self, css_element: Optional[str] = None, link_text: Optional[str] = None,
+                             timeout: int = 30) -> None:
         """
         Wait until an element is clickable
 
+        Must pass one of: css_element or link_text
+
         :param css_element:
+        :param link_text:
         :param timeout:
         :return:
         """
 
-        WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, css_element)))
+        if not css_element and not link_text:
+            raise ValueError("Must pass one of: css_element or link_text")
+
+        if css_element:
+            WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, css_element)))
+        elif link_text:
+            WebDriverWait(self.driver, timeout).until(expected_conditions.element_to_be_clickable((By.LINK_TEXT, link_text)))

{wcp_library-1.3.6.dist-info → wcp_library-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.3.6
+Version: 1.3.7
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.3.6.dist-info → wcp_library-1.3.7.dist-info}/RECORD

@@ -13,11 +13,11 @@ wcp_library/ftp/ftp.py,sha256=EpyW0J2QIGxP8zVGD4VarA0hi4C2XAPDPF-0j2sRdpI,4350
 wcp_library/ftp/sftp.py,sha256=hykXGLGdxe7DYAxFdTwjPjTEOYuIpSMyK3NOiTQNUK0,4176
 wcp_library/informatica.py,sha256=_g9lzSd-JLsY4e5_g6YcxQtOxP6fkg4sGfvNJaAN7jY,8123
 wcp_library/logging.py,sha256=e6gG7HFgUrMajUZs4Gs0atFfOJJmdmxN0GerfynNWlY,2061
-wcp_library/selenium_helper.py,sha256=2PENUH8bgpyzovbLjP8a4Oyd7c3yOwoyQJt-a8-zq0c,2855
+wcp_library/selenium_helper.py,sha256=w8YUC0pq7TkWiobc2ri4QR5fcHrrZgB5RAEfAdxZiuk,3780
 wcp_library/sql/__init__.py,sha256=s2psmwkq_ZU23iGWvXjJrLu0hD1fB6CDv6RHcK7y828,1917
 wcp_library/sql/oracle.py,sha256=TGiTC5L5UcM5QcHFajgn43NI8HygOGIEAtLmLbVFp2I,15772
 wcp_library/sql/postgres.py,sha256=GElSjLDworrRlzA7DLrbcQlW7BqvhgMbvW89v-yZejk,14533
 wcp_library/time.py,sha256=ktSzhK7SZnGPNXobFexnhFGQAcriLCJQKxnO0fed8fQ,1740
-wcp_library-1.3.6.dist-info/METADATA,sha256=4AtGuuDkPHngl78hTA_sOGk4haucvL2HKzmh3w6TKMc,1552
-wcp_library-1.3.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-wcp_library-1.3.6.dist-info/RECORD,,
+wcp_library-1.3.7.dist-info/METADATA,sha256=sRMU9aoSGlB9-kA3qNgSU6DFtcUey0ogHGmIqEPUCg4,1552
+wcp_library-1.3.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+wcp_library-1.3.7.dist-info/RECORD,,