Merge pull request #704 from atlassian/DCA_1365_Bitbucket_LTS_fix_of_the_issue_with_Selenium_action

DCA1365: Bitbucket LTS - fix the issue with Selenium action "create_pull_request"

Author: opopovss

app/selenium_ui/bitbucket/pages/pages.py

@@ -229,9 +229,12 @@ def merge_pull_request(self):
         self.wait_until_present(PullRequestLocator.pull_request_page_merge_button).click()
         PopupManager(self.driver).dismiss_default_popup()
         self.wait_until_visible(PullRequestLocator.diagram_selector)
-        self.execute_js(f'document.querySelector("{PullRequestLocator.delete_branch_per_merge_checkbox[1]}").click()')
-        self.wait_until_clickable(PullRequestLocator.pull_request_modal_merge_button).click()
-        self.wait_until_invisible(PullRequestLocator.del_branch_checkbox_selector)
+        self.wait_until_visible(PullRequestLocator.merge_diagram_selector)
+        if self.get_element(PullRequestLocator.delete_branch_per_merge_checkbox).is_selected():
+            self.execute_js(f'document.querySelector("{PullRequestLocator.delete_branch_per_merge_checkbox[1]}").click()')
+        else:
+            self.wait_until_clickable(PullRequestLocator.pull_request_modal_merge_button).click()
+            self.wait_until_invisible(PullRequestLocator.del_branch_checkbox_selector)
 
 
 class RepositoryBranches(BasePage):

app/selenium_ui/bitbucket/pages/selectors.py

@@ -186,6 +186,7 @@ class PullRequestLocator:
 
     merge_spinner = (By.CSS_SELECTOR, "aui-spinner[size='small']")
     diagram_selector = (By.CLASS_NAME, 'branches-diagram')
+    merge_diagram_selector = (By.CLASS_NAME, "merge-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']")