wcp-library 1.3.5__tar.gz → 1.3.7__tar.gz

{wcp_library-1.3.5 → wcp_library-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.3.5
+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.5 → wcp_library-1.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.3.5"
+version = "1.3.7"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.3.5 → wcp_library-1.3.7}/wcp_library/credentials/_credential_manager_asynchronous.py

@@ -64,6 +64,8 @@ class AsyncCredentialManager(ABC):
         password_info = {'PasswordID': password['PasswordID'], 'UserName': password['UserName'], 'Password': password['Password']}
         for field in password['GenericFieldInfo']:
             password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
+        if password['OTP']:
+            password_info['OTP'] = password['OTP']
         return password_info
 
     async def _publish_new_password(self, data: dict) -> bool:

{wcp_library-1.3.5 → wcp_library-1.3.7}/wcp_library/credentials/_credential_manager_synchronous.py

@@ -60,6 +60,8 @@ class CredentialManager(ABC):
         password_info = {'PasswordID': password['PasswordID'], 'UserName': password['UserName'], 'Password': password['Password']}
         for field in password['GenericFieldInfo']:
             password_info[field['DisplayName']] = field['Value'].lower() if field['DisplayName'].lower() == 'username' else field['Value']
+        if password['OTP']:
+            password_info['OTP'] = password['OTP']
         logger.debug("Credential retrieved")
         return password_info
 

{wcp_library-1.3.5 → wcp_library-1.3.7}/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)))