diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js index a8c658419161..80f564b873ed 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/GitImport_spec.js @@ -54,8 +54,7 @@ describe("Git import flow ", { tags: ["@tag.Git"] }, function () { cy.wait(1000); dataSources.FillMongoDSForm(); cy.testDatasource(true); - agHelper.GetNClick(dataSources._saveDs); - cy.wait(2000); + dataSources.SaveDatasource(true); cy.wait("@getWorkspace"); cy.get(reconnectDatasourceModal.ImportSuccessModal).should("be.visible"); cy.get(reconnectDatasourceModal.ImportSuccessModalCloseBtn).click({ @@ -118,7 +117,7 @@ describe("Git import flow ", { tags: ["@tag.Git"] }, function () { cy.wait(3000); //for uncommited changes to appear if any! cy.get("body").then(($body) => { if ($body.find(gitSyncLocators.gitPullCount).length > 0) { - cy.commitAndPush(); + gitSync.CommitAndPush(); } }); }); @@ -170,8 +169,7 @@ describe("Git import flow ", { tags: ["@tag.Git"] }, function () { agHelper.AssertElementExist(gitSync._bottomBarPull); cy.get(gitSyncLocators.closeGitSyncModal).click(); cy.wait(2000); - cy.merge(mainBranch); - cy.get(gitSyncLocators.closeGitSyncModal).click(); + gitSync.MergeToMaster(); cy.wait(2000); cy.latestDeployPreview(); table.AssertTableLoaded(); @@ -211,7 +209,7 @@ describe("Git import flow ", { tags: ["@tag.Git"] }, function () { cy.wait(2000); // wait for transition cy.dragAndDropToCanvas("buttonwidget", { x: 300, y: 600 }); cy.wait(3000); - cy.commitAndPush(); + gitSync.CommitAndPush(); cy.merge(newBranch); cy.get(gitSyncLocators.closeGitSyncModal).click(); cy.wait(2000);