diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index b256a2d6de..51f3339963 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js @@ -31,7 +31,7 @@ const mainBranch = "master"; let datasourceName; let repoName; -describe.skip("Git sync apps", function () { +describe("Git sync apps", function () { before(() => { // homePage.NavigateToHome(); // cy.createWorkspace(); @@ -208,7 +208,6 @@ describe.skip("Git sync apps", function () { it("3. Commit and push changes, validate data binding on all pages in edit and deploy mode on master", () => { // verfiy data binding on all pages in edit mode cy.wait(2000); - agHelper.RefreshPage("getPage"); cy.get(".t--draggable-inputwidgetv2").should("be.visible"); cy.get(".t--draggable-inputwidgetv2") .first() @@ -231,21 +230,25 @@ describe.skip("Git sync apps", function () { .find(".bp3-input") .should("have.value", "This is a test"); - cy.get(`.t--entity-item:contains(${pageName} Copy)`).click(); - cy.wait("@getPage"); - cy.readTabledataPublish("0", "1").then((cellData) => { - expect(cellData).to.be.equal("New Config"); - }); cy.get(`.t--entity-item:contains(${pageName})`).first().click(); cy.wait("@getPage"); cy.readTabledataPublish("0", "1").then((cellData) => { expect(cellData).to.be.equal("New Config"); }); + + cy.get(`.t--entity-item:contains(${pageName} Copy)`).click(); + cy.wait("@getPage"); + cy.readTabledataPublish("0", "1").then((cellData) => { + expect(cellData).to.be.equal("New Config"); + }); // commit and push the changes - cy.commitAndPush(); + gitSync.CommitAndPush(true); cy.wait(2000); // verify data binding on all pages in deploy mode cy.latestDeployPreview(); + cy.get(".t--page-switch-tab") + .contains(`${pageName}`) + .click({ force: true }); cy.readTabledataPublish("0", "1").then((cellData) => { expect(cellData).to.be.equal("New Config"); }); @@ -256,7 +259,7 @@ describe.skip("Git sync apps", function () { expect(cellData).to.be.equal("New Config"); }); cy.get(".t--page-switch-tab").contains(`${newPage}`).click({ force: true }); - agHelper.RefreshPage(); + agHelper.RefreshPage("viewPage"); cy.get(".bp3-input") .first() .invoke("val")