Merge pull request #708 from atlassian/dca_1351_Tech_debt_improve_get_node_info_to_work_both_on_server_and_DC

Tech debt: improve get node info to work both on server and DC

Author: opopovss

app/selenium_ui/jira/modules.py

@@ -55,8 +55,6 @@ def measure():
         @print_timing("selenium_login:open_login_page")
         def sub_measure():
             login_page.go_to()
-            webdriver.node_id = login_page.get_node_id()
-            print(f"node_id:{webdriver.node_id}")
         sub_measure()
 
         @print_timing("selenium_login:login_and_view_dashboard")
@@ -67,6 +65,8 @@ def sub_measure():
             if login_page.is_first_login_second_page():
                 login_page.first_login_second_page_setup()
             login_page.wait_for_page_loaded()
+            webdriver.node_id = login_page.get_node_id()
+            print(f"node_id:{webdriver.node_id}")
         sub_measure()
     measure()
     PopupManager(webdriver).dismiss_default_popup()

app/selenium_ui/jira/pages/pages.py

@@ -49,8 +49,14 @@ def get_app_version(self):
         return text.split('#')[0].replace('(v', '')
 
     def get_node_id(self):
-        text = self.__get_footer_text()
-        return text.split(':')[-1].replace(')', '')
+        text = self.get_element(LoginPageLocators.footer).text
+        text_split = text.split(':')
+        if len(text_split) == 2:
+            return "SERVER"
+        elif len(text_split) == 3:
+            return text_split[2].replace(')', '')
+        else:
+            return f"Warning: failed to get the node information from '{text}'."
 
 
 class Logout(BasePage):
@@ -144,6 +150,7 @@ def set_resolution(self):
     def set_issue_type(self):
         def __filer_epic(element):
             return "epic" not in element.get_attribute("class").lower()
+
         issue_types = {}
         data_suggestions = json.loads(self.get_element(IssueLocators.issue_types_options)
                                       .get_attribute('data-suggestions'))
@@ -168,6 +175,7 @@ def choose_non_epic_issue_type():
                         rnd_issue_type_el = random.choice(filtered_issue_elements)
                         self.action_chains().move_to_element(rnd_issue_type_el).click(rnd_issue_type_el).perform()
                     self.wait_until_invisible(IssueLocators.issue_ready_to_save_spinner)
+
                 choose_non_epic_issue_type()
 
     def submit_issue(self):

app/selenium_ui/jsm/modules_agents.py

@@ -74,8 +74,7 @@ def measure():
         @print_timing("selenium_agent_login:open_login_page")
         def sub_measure():
             login_page.go_to()
-            webdriver.node_id = login_page.get_node_id()
-            print(f"node_id:{webdriver.node_id}")
+
         sub_measure()
 
         @print_timing("selenium_agent_login:login_and_view_dashboard")
@@ -86,6 +85,8 @@ def sub_measure():
             if login_page.is_first_login_second_page():
                 login_page.first_login_second_page_setup()
             login_page.wait_for_page_loaded()
+            webdriver.node_id = login_page.get_node_id()
+            print(f"node_id:{webdriver.node_id}")
 
         sub_measure()
 

app/selenium_ui/jsm/pages/agent_pages.py

@@ -47,8 +47,14 @@ def get_app_version(self):
         return text.split('#')[0].replace('(v', '')
 
     def get_node_id(self):
-        text = self.__get_footer_text()
-        return text.split(':')[-1].replace(')', '')
+        text = self.get_element(LoginPageLocators.footer).text
+        text_split = text.split(':')
+        if len(text_split) == 2:
+            return "SERVER"
+        elif len(text_split) == 3:
+            return text_split[2].replace(')', '')
+        else:
+            return f"Warning: failed to get the node information from '{text}'."
 
 
 class Logout(BasePage):