diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js index e81dfcc7fc..2a532eec8b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Merge_spec.js @@ -35,7 +35,7 @@ describe( cy.get(gitSyncLocators.mergeButton).should("be.disabled"); cy.wait(3000); - cy.get(gitSyncLocators.mergeBranchDropdownDestination).click(); + cy.get(_.gitSync._mergeBranchDropdownDestination).click(); cy.get(commonLocators.dropdownmenu).contains(mainBranch).click(); _.agHelper.AssertElementAbsence(_.gitSync._checkMergeability, 30000); diff --git a/app/client/cypress/locators/gitSyncLocators.js b/app/client/cypress/locators/gitSyncLocators.js index 167160ed31..ecd8e22f30 100644 --- a/app/client/cypress/locators/gitSyncLocators.js +++ b/app/client/cypress/locators/gitSyncLocators.js @@ -20,7 +20,6 @@ export default { bottomBarCommitButton: ".t--bottom-bar-commit", bottomBarMergeButton: ".t--bottom-bar-merge", bottomBarPullButton: ".t--bottom-bar-pull", - mergeBranchDropdownDestination: ".t--merge-branch-dropdown-destination", mergeCTA: "[data-testid=t--git-merge-button]", loaderQuickGitAction: ".t--loader-quick-git-action", connetStatusbar: ".t--connect-statusbar", diff --git a/app/client/cypress/support/gitSync.js b/app/client/cypress/support/gitSync.js index a236e3672f..df75e8c935 100644 --- a/app/client/cypress/support/gitSync.js +++ b/app/client/cypress/support/gitSync.js @@ -111,7 +111,7 @@ Cypress.Commands.add("merge", (destinationBranch) => { ); */ agHelper.AssertElementEnabledDisabled( - gitSyncLocators.mergeBranchDropdownDestination, + gitSync._mergeBranchDropdownDestination, 0, false, ); @@ -121,7 +121,7 @@ Cypress.Commands.add("merge", (destinationBranch) => { interceptions[0]?.response?.statusCode === 200 && interceptions[1]?.response?.statusCode === 200 ) { - cy.get(gitSyncLocators.mergeBranchDropdownDestination).click(); + cy.get(gitSync._mergeBranchDropdownDestination).click(); cy.get(commonLocators.dropdownmenu).contains(destinationBranch).click(); agHelper.AssertElementAbsence(gitSync._checkMergeability, 35000); assertHelper.WaitForNetworkCall("mergeStatus");