DCA-1354 EOL bitbucket 6.10.x and 7.0.x (atlassian#698)

Author: ometelytsia

README.md

@@ -14,8 +14,7 @@ This repository contains Taurus scripts for performance testing of Atlassian Dat
     * Confluence [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.13.0`, `7.4.11` 
 
 * Supported Bitbucket Server versions:
-    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.9`, `6.10.13`  
-    * Bitbucket Server Platform release: `7.0.5`
+    * Bitbucket Server [Long Term Support release](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html): `7.6.9`  
 
 * Supported Crowd versions:
     * Crowd [Long Term Support release](https://confluence.atlassian.com/crowd/crowd-release-notes-199094.html): `4.3.5`

app/selenium_ui/base_page.py

@@ -31,63 +31,46 @@ def go_to_url(self, url):
         self.driver.get(url)
 
     def get_element(self, selector):
-        selector_name = self.get_selector(selector)
-        by, locator = selector_name[0], selector_name[1]
+        by, locator = selector[0], selector[1]
         return self.driver.find_element(by, locator)
 
     def get_elements(self, selector):
-        selector_name = self.get_selector(selector)
-        by, locator = selector_name[0], selector_name[1]
+        by, locator = selector[0], selector[1]
         return self.driver.find_elements(by, locator)
 
     def element_exists(self, selector):
-        selector_name = self.get_selector(selector)
-        by, locator = selector_name[0], selector_name[1]
+        by, locator = selector[0], selector[1]
         return True if self.driver.find_elements(by, locator) else False
 
-    def wait_until_invisible(self, selector_name, timeout=timeout):
-        selector = self.get_selector(selector_name)
+    def wait_until_invisible(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.invisibility_of_element_located(selector), time_out=timeout)
 
-    def wait_until_visible(self, selector_name, timeout=timeout):
-        selector = self.get_selector(selector_name)
+    def wait_until_visible(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.visibility_of_element_located(selector), time_out=timeout)
 
-    def wait_until_available_to_switch(self, selector_name):
-        selector = self.get_selector(selector_name)
+    def wait_until_available_to_switch(self, selector):
         return self.__wait_until(expected_condition=ec.frame_to_be_available_and_switch_to_it(selector),
                                  time_out=self.timeout)
 
-    def wait_until_present(self, selector_name, timeout=timeout):
-        selector = self.get_selector(selector_name)
+    def wait_until_present(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.presence_of_element_located(selector), time_out=timeout)
 
-    def wait_until_clickable(self, selector_name, timeout=timeout):
-        selector = self.get_selector(selector_name)
+    def wait_until_clickable(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.element_to_be_clickable(selector), time_out=timeout)
 
-    def wait_until_any_element_visible(self, selector_name, timeout=timeout):
-        selector = self.get_selector(selector_name)
+    def wait_until_any_element_visible(self, selector, timeout=timeout):
         return self.__wait_until(expected_condition=ec.visibility_of_any_elements_located(selector),
                                  time_out=timeout)
 
-    def wait_until_any_ec_presented(self, selector_names, timeout=timeout):
-        origin_selectors = []
-        for selector in selector_names:
-            origin_selectors.append(self.get_selector(selector))
+    def wait_until_any_ec_presented(self, selectors, timeout=timeout):
         any_ec = AnyEc()
-        any_ec.ecs = tuple(ec.presence_of_element_located(origin_selector) for origin_selector in origin_selectors)
+        any_ec.ecs = tuple(ec.presence_of_element_located(selector) for selector in selectors)
         return self.__wait_until(expected_condition=any_ec, time_out=timeout)
 
-    def wait_until_any_ec_text_presented_in_el(self, selector_names, timeout=timeout):
-        origin_selectors = []
-        for selector_text in selector_names:
-            selector = self.get_selector(selector_text[0])
-            text = selector_text[1]
-            origin_selectors.append((selector, text))
+    def wait_until_any_ec_text_presented_in_el(self, selector_text_list, timeout=timeout):
         any_ec = AnyEc()
-        any_ec.ecs = tuple(ec.text_to_be_present_in_element(locator=origin_selector[0], text_=origin_selector[1]) for
-                           origin_selector in origin_selectors)
+        any_ec.ecs = tuple(ec.text_to_be_present_in_element(locator=selector_text[0], text_=selector_text[1]) for
+                           selector_text in selector_text_list)
         return self.__wait_until(expected_condition=any_ec, time_out=timeout)
 
     def __wait_until(self, expected_condition, time_out=timeout):
@@ -124,12 +107,6 @@ def dismiss_popup(self, *args):
     def return_to_parent_frame(self):
         return self.driver.switch_to.parent_frame()
 
-    def get_selector(self, selector_name):
-        selector = selector_name.get(self.app_version) if type(selector_name) == dict else selector_name
-        if selector is None:
-            raise Exception(f'Selector {selector_name} for version {self.app_version} is not found')
-        return selector
-
     def execute_js(self, js):
         return self.driver.execute_script(js)
 

app/selenium_ui/bitbucket/modules.py

@@ -27,7 +27,6 @@ def measure():
         @print_timing("selenium_login:open_login_page")
         def sub_measure():
             login_page.go_to()
-            webdriver.app_version = login_page.get_app_major_version()
             if login_page.is_logged_in():
                 login_page.delete_all_cookies()
                 login_page.go_to()

app/selenium_ui/bitbucket/pages/pages.py

@@ -202,7 +202,7 @@ def wait_for_commits_tab(self, ):
         self.wait_until_any_element_visible(PullRequestLocator.commit_message_label)
 
     def click_inline_comment_button_js(self):
-        selector = self.get_selector(PullRequestLocator.inline_comment_button)
+        selector = PullRequestLocator.inline_comment_button
         self.execute_js(f"elems=document.querySelectorAll('{selector[1]}'); "
                         "item=elems[Math.floor(Math.random() * elems.length)];"
                         "item.scrollIntoView();"
@@ -211,22 +211,10 @@ def click_inline_comment_button_js(self):
     def wait_for_comment_text_area(self):
         return self.wait_until_visible(PullRequestLocator.comment_text_area)
 
-    def add_code_comment_v6(self):
-        self.wait_for_comment_text_area()
-        selector = self.get_selector(PullRequestLocator.comment_text_area)
-        self.execute_js(f"document.querySelector('{selector[1]}').value = 'Comment from Selenium script';")
-        self.click_save_comment_button()
-
-    def add_code_comment_v7(self):
+    def add_code_comment(self, ):
         self.wait_until_visible(PullRequestLocator.text_area).send_keys('Comment from Selenium script')
         self.click_save_comment_button()
 
-    def add_code_comment(self, ):
-        if self.app_version == '6':
-            self.add_code_comment_v6()
-        elif self.app_version == '7':
-            self.add_code_comment_v7()
-
     def click_save_comment_button(self):
         return self.wait_until_visible(PullRequestLocator.comment_button).click()
 
@@ -238,9 +226,6 @@ def wait_merge_button_clickable(self):
         self.wait_until_clickable(PullRequestLocator.pull_request_page_merge_button)
 
     def merge_pull_request(self):
-        if self.driver.app_version == '6':
-            if self.get_elements(PullRequestLocator.merge_spinner):
-                self.wait_until_invisible(PullRequestLocator.merge_spinner)
         self.wait_until_present(PullRequestLocator.pull_request_page_merge_button).click()
         PopupManager(self.driver).dismiss_default_popup()
         self.wait_until_visible(PullRequestLocator.diagram_selector)
@@ -275,7 +260,7 @@ def delete_branch(self, branch_name):
         self.wait_until_visible(BranchesLocator.branches_name)
         self.wait_until_visible(BranchesLocator.search_branch_action).click()
         self.execute_js("document.querySelector('li>a.delete-branch').click()")
-        self.wait_until_clickable(BranchesLocator.delete_branch_diaglog_submit).click()
+        self.wait_until_clickable(BranchesLocator.delete_branch_dialog_submit).click()
 
 
 class RepositorySettings(BasePage):

app/selenium_ui/bitbucket/pages/selectors.py

@@ -91,9 +91,9 @@ class LoginPageLocators:
     login_params = UrlManager().login_params
     login_url = UrlManager().login_url()
 
-    submit_button = {'6': (By.ID, "submit"), '7': (By.ID, "submit")}
-    username_textfield = {'6': (By.ID, "j_username"), '7': (By.ID, "j_username")}
-    password_textfield = {'6': (By.ID, "j_password"), '7': (By.ID, "j_password")}
+    submit_button = (By.ID, "submit")
+    username_textfield = (By.ID, "j_username")
+    password_textfield = (By.ID, "j_password")
     application_version = (By.ID, 'product-version')
     node_id = (By.CLASS_NAME, 'footer-body')
 
@@ -106,35 +106,33 @@ class LogoutPageLocators:
 class GetStartedLocators:
     get_started_params = UrlManager().get_started_params
     get_started_url = UrlManager().get_started_url()
-    user_profile_icon = {'6': (By.ID, 'current-user'), '7': (By.ID, 'current-user')}
+    user_profile_icon = (By.ID, 'current-user')
 
 
 class DashboardLocators:
     dashboard_params = UrlManager().dashboard_params
     dashboard_url = UrlManager().dashboard_url()
 
-    dashboard_presence = {'6': (By.TAG_NAME, 'h2'), '7': (By.TAG_NAME, 'h2')}
+    dashboard_presence = (By.TAG_NAME, 'h2')
 
 
 class ProjectsLocators:
     projects_params = UrlManager().projects_params
     project_url = UrlManager().projects_url()
 
-    projects_list = {'6': (By.ID, "projects-container"), '7': (By.ID, "projects-container")}
+    projects_list = (By.ID, "projects-container")
 
 
 class ProjectLocators:
 
-    repositories_container = {'6': (By.ID, "repositories-container"), '7': (By.ID, "repositories-container")}
-    repository_name = {'6': (By.CSS_SELECTOR, "span.repository-name"), '7': (By.CSS_SELECTOR, "span.repository-name")}
+    repositories_container = (By.ID, "repositories-container")
+    repository_name = (By.CSS_SELECTOR, "span.repository-name")
 
 
 class RepoNavigationPanelLocators:
 
-    navigation_panel = {'6': (By.CSS_SELECTOR, '.aui-navgroup-vertical>.aui-navgroup-inner'),
-                        '7': (By.CSS_SELECTOR, '.aui-navgroup-vertical>.aui-navgroup-inner')}
-    clone_repo_button = {'6': (By.CSS_SELECTOR, '.clone-repo>#clone-repo-button'),
-                         '7': (By.CSS_SELECTOR, '.clone-repo>#clone-repo-button')}
+    navigation_panel = (By.CSS_SELECTOR, '.aui-navgroup-vertical>.aui-navgroup-inner')
+    clone_repo_button = (By.CSS_SELECTOR, '.clone-repo>#clone-repo-button')
 
     fork_repo_button = (By.CSS_SELECTOR, 'span.icon-fork')
 
@@ -143,7 +141,7 @@ class RepoNavigationPanelLocators:
 
 class RepoLocators:
 
-    pull_requests_list = {'6': (By.ID, 'pull-requests-content'), '7': (By.ID, 'pull-requests-content')}
+    pull_requests_list = (By.ID, 'pull-requests-content')
     repo_fork_sync = (By.ID, "enable-ref-syncing")
     fork_name_field = (By.ID, 'name')
     fork_repo_submit_button = (By.ID, "fork-repo-submit")
@@ -171,31 +169,24 @@ class RepoLocators:
 
 class PullRequestLocator:
 
-    tab_panel = {'6': (By.CSS_SELECTOR, 'ul.tabs-menu'), '7': (By.CSS_SELECTOR, 'ul.tabs-menu')}
+    tab_panel = (By.CSS_SELECTOR, 'ul.tabs-menu')
 
-    commit_files = {'6': (By.CSS_SELECTOR, '.commit-files>.file-tree-container'),
-                    '7': (By.CSS_SELECTOR, '.changes-sidebar>.changes-scope-content')}
-    diff_code_lines = {'6': (By.CLASS_NAME, 'CodeMirror-code'),
-                       '7': (By.CLASS_NAME, "diff-segment")}
+    commit_files = (By.CSS_SELECTOR, '.changes-sidebar>.changes-scope-content')
+    diff_code_lines = (By.CLASS_NAME, "diff-segment")
 
     commit_message_label = (By.CSS_SELECTOR, 'tr>th.message')
-    inline_comment_button = {'6': (By.CSS_SELECTOR, "button.add-comment-trigger>span.aui-iconfont-add-comment"),
-                             '7': (By.CSS_SELECTOR, ".diff-line-comment-trigger")}
-    comment_text_area = {'6': (By.CSS_SELECTOR, "textarea.text"), '7': (By.CLASS_NAME, "comment-editor-wrapper")}
-    text_area = {'6': (By.CSS_SELECTOR, 'textarea.text'), '7': (By.CLASS_NAME, 'CodeMirror-code')}
-    comment_button = {'6': (By.CSS_SELECTOR, "div.comment-form-footer>div.buttons>button:nth-child(1)"),
-                      '7': (By.CSS_SELECTOR, "div.editor-controls>button:nth-child(1)")}
-    pull_request_activity_content = {'6': (By.CSS_SELECTOR, ".pull-request-activity-content"),
-                                     '7': (By.CSS_SELECTOR, ".pull-request-activities")}
+    inline_comment_button = (By.CSS_SELECTOR, ".diff-line-comment-trigger")
+    comment_text_area = (By.CLASS_NAME, "comment-editor-wrapper")
+    text_area = (By.CLASS_NAME, 'CodeMirror-code')
+    comment_button = (By.CSS_SELECTOR, "div.editor-controls>button:nth-child(1)")
+    pull_request_activity_content = (By.CSS_SELECTOR, ".pull-request-activities")
 
     pull_request_page_merge_button = (By.CLASS_NAME, 'merge-button')
 
     merge_spinner = (By.CSS_SELECTOR, "aui-spinner[size='small']")
-    diagram_selector = {'6': (By.CSS_SELECTOR, 'div.diagram-image'), '7': (By.CLASS_NAME, 'branches-diagram')}
-    pull_request_modal_merge_button = {'6': (By.CSS_SELECTOR, 'button.confirm-button'),
-                                       '7': (By.CSS_SELECTOR, ".merge-dialog button[type='submit']")}
-    del_branch_checkbox_selector = {'6': (By.CSS_SELECTOR, 'span.pull-request-cleanup-checkbox-wrapper'),
-                                    '7': (By.NAME, 'deleteSourceRef')}
+    diagram_selector = (By.CLASS_NAME, 'branches-diagram')
+    pull_request_modal_merge_button = (By.CSS_SELECTOR, ".merge-dialog button[type='submit']")
+    del_branch_checkbox_selector = (By.NAME, 'deleteSourceRef')
     delete_branch_per_merge_checkbox = (By.CSS_SELECTOR, "input[type='checkbox']")
 
 
@@ -209,7 +200,7 @@ class BranchesLocator:
     search_branch_textfield = (By.ID, 'paged-table-input-for-branch-list')
     search_branch_action = (By.CSS_SELECTOR, '.branch-actions-column>button')
     search_action_delete_branch = (By.CSS_SELECTOR, 'li>a.delete-branch')
-    delete_branch_diaglog_submit = (By.ID, 'delete-branch-dialog-submit')
+    delete_branch_dialog_submit = (By.ID, 'delete-branch-dialog-submit')
 
 
 class RepositorySettingsLocator:

app/selenium_ui/confluence/pages/pages.py

@@ -125,14 +125,15 @@ def click_submit(self):
         self.get_element(EditorLocators.publish_button).click()
 
     def wait_for_editor_open(self):
-        self.wait_until_any_ec_text_presented_in_el(selector_names=[(EditorLocators.status_indicator, 'Ready to go'),
-                                                                    (EditorLocators.status_indicator, 'Changes saved')])
+        self.wait_until_any_ec_text_presented_in_el(
+            selector_text_list=[(EditorLocators.status_indicator, 'Ready to go'),
+                                (EditorLocators.status_indicator, 'Changes saved')])
 
     def save_edited_page(self):
         self.get_element(EditorLocators.publish_button).click()
         if self.get_elements(EditorLocators.confirm_publishing_button):
             if self.get_element(EditorLocators.confirm_publishing_button).is_displayed():
                 self.get_element(EditorLocators.confirm_publishing_button).click()
         self.wait_until_invisible(EditorLocators.save_spinner)
-        self.wait_until_any_ec_presented(selector_names=[PageLocators.page_title,
-                                                         EditorLocators.confirm_publishing_button])
+        self.wait_until_any_ec_presented(selectors=[PageLocators.page_title,
+                                                    EditorLocators.confirm_publishing_button])

app/selenium_ui/jira/pages/pages.py

@@ -205,7 +205,7 @@ def __init__(self, driver, projects_list_pages):
 
     def wait_for_page_loaded(self):
         self.wait_until_any_ec_presented(
-            selector_names=[ProjectLocators.projects_list, ProjectLocators.projects_not_found])
+            selectors=[ProjectLocators.projects_list, ProjectLocators.projects_not_found])
 
 
 class BoardsList(BasePage):
@@ -221,9 +221,9 @@ def __init__(self, driver, jql):
         self.page_url = url_manager.jql_search_url()
 
     def wait_for_page_loaded(self):
-        self.wait_until_any_ec_presented(selector_names=[SearchLocators.search_issue_table,
-                                                         SearchLocators.search_issue_content,
-                                                         SearchLocators.search_no_issue_found])
+        self.wait_until_any_ec_presented(selectors=[SearchLocators.search_issue_table,
+                                                    SearchLocators.search_issue_content,
+                                                    SearchLocators.search_no_issue_found])
 
 
 class Board(BasePage):

app/selenium_ui/jsm/pages/agent_pages.py

@@ -178,7 +178,7 @@ def __init__(self, driver, project_key=None, queue_id=None):
 
     def wait_for_page_loaded(self):
         self.wait_until_any_ec_presented(
-            selector_names=[ViewQueueLocators.queues_status, ViewQueueLocators.queue_is_empty], timeout=self.timeout)
+            selectors=[ViewQueueLocators.queues_status, ViewQueueLocators.queue_is_empty], timeout=self.timeout)
 
     def get_random_queue(self):
         if not self.get_elements(ViewQueueLocators.queue_is_empty):

app/util/bitbucket/populate_db.sh

@@ -38,7 +38,7 @@ BITBUCKET_DB_PASS="Password1!"
 BITBUCKET_AUTO_DECLINE_VERSION="7.7.0"
 
 # BITBUCKET version variables
-SUPPORTED_BITBUCKET_VERSIONS=(6.10.13 7.0.5 7.6.9)
+SUPPORTED_BITBUCKET_VERSIONS=(7.6.9)
 BITBUCKET_VERSION=$(sudo su bitbucket -c "cat ${BITBUCKET_VERSION_FILE}")
 if [[ -z "$BITBUCKET_VERSION" ]]; then
   echo The $BITBUCKET_VERSION_FILE file does not exists or emtpy. Please check if BITBUCKET_VERSION_FILE variable \

app/util/bitbucket/upload_attachments.sh

@@ -21,7 +21,7 @@ esac; shift; done
 ###################    Variables section         ###################
 # Bitbucket version variables
 BITBUCKET_VERSION_FILE="/media/atl/bitbucket/shared/bitbucket.version"
-SUPPORTED_BITBUCKET_VERSIONS=(6.10.13 7.0.5 7.6.9)
+SUPPORTED_BITBUCKET_VERSIONS=(7.6.9)
 BITBUCKET_VERSION=$(sudo su bitbucket -c "cat ${BITBUCKET_VERSION_FILE}")
 if [[ -z "$BITBUCKET_VERSION" ]]; then
         echo The $BITBUCKET_VERSION_FILE file does not exists or emtpy. Please check if BITBUCKET_VERSION_FILE variable \