jsm/upd-comment-action-and-dismiss-popup

Author: OlehStefanyshyn

app/selenium_ui/base_page.py

@@ -132,13 +132,20 @@ def __wait_until(self, expected_condition, locator, time_out=timeout):
 
         return WebDriverWait(self.driver, time_out).until(expected_condition, message=message)
 
-    def dismiss_popup(self, *args):
-        for elem in args:
-            if self.driver.find_elements(by=By.CSS_SELECTOR, value=elem):
-                try:
-                    self.driver.execute_script(f"document.querySelector(\'{elem}\').click()")
-                except(WebDriverException, Exception):
-                    pass
+    def dismiss_popup(self, popup_selectors):
+        for selector_type, selector_value in popup_selectors:
+            if selector_type.lower() == "css":
+                if self.driver.find_elements(by=By.CSS_SELECTOR, value=selector_value):
+                    try:
+                        self.driver.execute_script(f"document.querySelector('{selector_value}').click()")
+                    except (WebDriverException, Exception):
+                        pass
+            elif selector_type.lower() == "xpath":
+                if self.driver.find_elements(by=By.XPATH, value=selector_value):
+                    try:
+                        self.driver.find_element(by=By.XPATH, value=selector_value).click()
+                    except (WebDriverException, Exception):
+                        pass
 
     def return_to_parent_frame(self):
         return self.driver.switch_to.parent_frame()

app/selenium_ui/jsm/pages/agent_pages.py

@@ -9,9 +9,7 @@
 class PopupManager(BasePage):
 
     def dismiss_default_popup(self):
-        return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2,
-                                  PopupLocators.popup_3, PopupLocators.popup_4,
-                                  PopupLocators.popup_5, PopupLocators.popup_6, PopupLocators.popup_7)
+        return self.dismiss_popup(PopupLocators.popup_selectors)
 
 
 class Login(BasePage):
@@ -138,10 +136,10 @@ def add_request_comment(self, rte_status):
         textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea)
         self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea)
         textarea.click()
-        if not self.get_elements(ViewCustomerRequestLocators.comment_internally_btn):
-            comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10)
-        else:
+        if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn):
             comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn)
+        else:
+            comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn_jsm10)
         self.driver.execute_script("arguments[0].scrollIntoView(true);", comment_button)
 
         if rte_status:

app/selenium_ui/jsm/pages/agent_selectors.py

@@ -3,14 +3,17 @@
 
 
 class PopupLocators:
-    default_popup = '.aui-message .icon-close'
-    popup_1 = 'form.tip-footer>.helptip-close'
-    popup_2 = '.aui-inline-dialog-contents .cancel'
-    popup_3 = '.aui-close-button'
-    popup_4 = '.aui-button aui-button-link'
-    popup_5 = '.buttons-container > div > a'
-    popup_6 = '.css-19r5em7'
-    popup_7 = '.css-178ag6o'
+    popup_selectors = [
+        ("css", ".aui-message .icon-close"),
+        ("css", "form.tip-footer>.helptip-close"),
+        ("css", ".aui-inline-dialog-contents .cancel"),
+        ("css", ".aui-close-button"),
+        ("css", ".aui-button aui-button-link"),
+        ("css", ".buttons-container > div > a"),
+        ("css", ".css-19r5em7"),
+        ("css", ".css-178ag6o"),
+        ("xpath", "//button[contains(text(),'Got it')]")
+    ]
 
 
 class UrlManager: