Merge pull request #1958 from atlassian/issue/dev/ECO-1109_fix-jsm-11-3-0-tests

Fix JSM 11.3.0 tests

Author: vkavalenka80

app/selenium_ui/base_page.py

@@ -4,7 +4,7 @@
 import time
 
 from packaging import version
-from selenium.common.exceptions import WebDriverException, TimeoutException
+from selenium.common.exceptions import WebDriverException, TimeoutException, StaleElementReferenceException
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as ec
@@ -138,7 +138,11 @@ def __wait_until(self, expected_condition, locator, time_out=timeout):
             message += (f"Timed out after {time_out} sec waiting for {str(expected_condition)}. \n"
                         f"Locator: {locator}{str(expected_condition)}")
 
-        return WebDriverWait(self.driver, time_out).until(expected_condition, message=message)
+        try:
+            return WebDriverWait(self.driver, time_out).until(expected_condition, message=message)
+        except StaleElementReferenceException:
+            print(f"Stale element reference detected for {locator}, retrying wait...")
+            return WebDriverWait(self.driver, time_out).until(expected_condition, message=message)
 
     def dismiss_popup(self, popup_selectors):
         for selector_type, selector_value in popup_selectors:

app/selenium_ui/jsm/pages/agent_pages.py

@@ -7,7 +7,6 @@
 
 
 class PopupManager(BasePage):
-
     def dismiss_default_popup(self):
         return self.dismiss_popup(PopupLocators.popup_selectors)
 
@@ -126,37 +125,38 @@ def check_comment_text_is_displayed(self, text, rte_status=None):
                     self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(text)
                     self.return_to_parent_frame()
                     if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn):
-                        self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click()
+                        self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click()
                     else:
-                        self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click()
+                        self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click()
             elif self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).text != text:
                 self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(text)
                 if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn):
-                    self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn).click()
+                    self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn).click()
                 else:
-                    self.wait_until_present(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click()
+                    self.wait_until_clickable(ViewCustomerRequestLocators.comment_internally_btn_jsm10).click()
 
     def add_request_comment(self, rte_status):
         comment_text = f"Add comment from selenium - {self.generate_random_string(30)}"
         self.wait_until_visible(ViewCustomerRequestLocators.comment_area)
-        textarea = self.get_element(ViewCustomerRequestLocators.comment_collapsed_textarea)
-        self.driver.execute_script("arguments[0].scrollIntoView(true);", textarea)
-        textarea.click()
+        self.driver.execute_script("arguments[0].scrollIntoView(true);",
+                                   self.wait_until_present(ViewCustomerRequestLocators.comment_collapsed_textarea))
+        self.wait_until_clickable(ViewCustomerRequestLocators.comment_collapsed_textarea).click()
         if self.get_elements(ViewCustomerRequestLocators.comment_internally_btn):
-            comment_button = self.get_element(ViewCustomerRequestLocators.comment_internally_btn)
+            comment_button_selector = 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)
+            comment_button_selector = ViewCustomerRequestLocators.comment_internally_btn_jsm10
+        self.driver.execute_script("arguments[0].scrollIntoView(true);",
+                                   self.wait_until_present(comment_button_selector))
 
         if rte_status:
             self.wait_until_available_to_switch(ViewCustomerRequestLocators.comment_text_field_RTE)
             self.wait_until_present(ViewCustomerRequestLocators.comment_tinymce_field).send_keys(comment_text)
             self.return_to_parent_frame()
-            comment_button.click()
+            self.wait_until_clickable(comment_button_selector).click()
             self.check_comment_text_is_displayed(comment_text, True)
         else:
             self.wait_until_present(ViewCustomerRequestLocators.comment_text_field).send_keys(comment_text)
-            comment_button.click()
+            self.wait_until_clickable(comment_button_selector).click()
             self.check_comment_text_is_displayed(comment_text)
 
 

app/selenium_ui/jsm/pages/agent_selectors.py

@@ -186,7 +186,7 @@ class InsightViewQueueLocators:
 
 class InsightSearchObjectIql:
     search_object_text_field = (By.CSS_SELECTOR, "textarea[name='iql']")
-    search_iql_button = (By.CLASS_NAME, "rIcon-search")
+    search_iql_button = (By.CSS_SELECTOR, ".rIcon-search, .rlIqlEditor ~ button")
     search_iql_success = (By.XPATH, "//thead/tr[1]")