test: updated git tests for regression

app/client/cypress/e2e/Regression/ClientSide/Git/MergeBranch_spec.ts

@@ -0,0 +1,160 @@
+import commonLocators from "../../../../locators/commonlocators.json";
+
+import {
+  agHelper,
+  entityExplorer,
+  jsEditor,
+  deployMode,
+  gitSync,
+  apiPage,
+  dataSources,
+  assertHelper,
+  locators,
+  appSettings,
+} from "../../../../support/Objects/ObjectsCore";
+import EditorNavigation, {
+  EntityType,
+  PageLeftPane,
+  PagePaneSegment,
+} from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
+
+let repoName;
+let demoBranch: any;
+describe("Git Branch:", {}, function () {
+  before(() => {
+    gitSync.CreateNConnectToGit();
+    cy.get("@gitRepoName").then((repName) => {
+      repoName = repName;
+    });
+  });
+
+  it("1. Verify branch with same name cannot be created", function () {
+    gitSync.CreateGitBranch("Test_Branch");
+    gitSync.verifyNoDuplicateBranch("Test_Branch");
+  });
+
+  it("2. Verify delete branch", function () {
+    gitSync.CreateGitBranch("Demo", true);
+    gitSync.GetCurrentBranchName().then((branchName: any) => {
+      cy.wrap(demoBranch).as("demoBranch");
+      demoBranch = branchName;
+      gitSync.SwitchGitBranch("master");
+      DeleteBranchFromUI(demoBranch);
+      cy.wait(5000);
+      gitSync.SwitchGitBranch(`origin/${demoBranch}`);
+
+      // Verify cannot delete checked out branch
+      //   DeleteBranchFromUI(demoBranch);
+      //   agHelper.ValidateToastMessage("Cannot delete checked out branch.");
+      //   cy.wait(5000)
+    });
+  });
+
+  it("3. Verify merge branch", function () {
+    gitSync.CreateGitBranch("Demo1", true);
+    PageList.AddNewPage();
+    gitSync.CommitAndPush();
+    cy.wait(3000);
+    cy.then(() => {
+      gitSync.CheckMergeConflicts(demoBranch);
+      agHelper.GetNClick(gitSync.locators.opsMergeBtn);
+      assertHelper.AssertNetworkStatus("@mergeBranch");
+      gitSync.CloseOpsModal();
+      gitSync.SwitchGitBranch(demoBranch);
+      PageList.assertPresence("Page2");
+    });
+  });
+
+  it("4. Verify merge branch with new query", function () {
+    gitSync.SwitchGitBranch("Demo1");
+    dataSources.CreateMockDB("Users");
+    dataSources.CreateQueryAfterDSSaved("select * from users limit 10");
+    dataSources.RunQuery();
+    gitSync.CommitAndPush();
+    cy.then(() => {
+      gitSync.CheckMergeConflicts(demoBranch);
+      agHelper.GetNClick(gitSync.locators.opsMergeBtn);
+      assertHelper.AssertNetworkStatus("@mergeBranch");
+      gitSync.CloseOpsModal();
+      gitSync.SwitchGitBranch(demoBranch);
+      EditorNavigation.NavigateToPage("Page2", true);
+      PageLeftPane.switchSegment(PagePaneSegment.Queries);
+      agHelper.AssertElementVisibility(locators._entityTestId("Query1"));
+    });
+  });
+
+  it("5. Verify merge branch with new JS object", function () {
+    gitSync.SwitchGitBranch("Demo1");
+    EditorNavigation.NavigateToPage("Page2", true);
+    jsEditor.CreateJSObject('return "Success";');
+    gitSync.CommitAndPush();
+    cy.then(() => {
+      gitSync.CheckMergeConflicts(demoBranch);
+      agHelper.GetNClick(gitSync.locators.opsMergeBtn);
+      assertHelper.AssertNetworkStatus("@mergeBranch");
+      gitSync.CloseOpsModal();
+      gitSync.SwitchGitBranch(demoBranch);
+      EditorNavigation.NavigateToPage("Page2", true);
+      PageLeftPane.switchSegment(PagePaneSegment.JS);
+      agHelper.AssertElementVisibility(locators._entityTestId("JSObject1"));
+    });
+  });
+
+  it("6. Verify merge branch with theme change", function () {
+    gitSync.SwitchGitBranch("Demo1");
+    appSettings.OpenAppSettings();
+    appSettings.GoToThemeSettings();
+    cy.get(commonLocators.changeThemeBtn).click({ force: true });
+    agHelper.AssertAutoSave();
+    // select a theme
+    cy.get(commonLocators.themeCard).last().click({ force: true });
+    agHelper.AssertAutoSave();
+    // check for alert
+    cy.get(`${commonLocators.themeCard}`)
+      .last()
+      .siblings("div")
+      .first()
+      .invoke("text")
+      .then((text) => {
+        cy.get(commonLocators.toastmsg).contains(`Theme ${text} applied`);
+      });
+
+    // check if color of canvas is same as theme bg color
+    cy.get(`${commonLocators.themeCard} > main`)
+      .last()
+      .invoke("css", "background-color")
+      .then((backgroudColor) => {
+        cy.get(commonLocators.canvas).should(
+          "have.css",
+          "background-color",
+          backgroudColor,
+        );
+
+        gitSync.CommitAndPush();
+        cy.then(() => {
+          gitSync.CheckMergeConflicts(demoBranch);
+          agHelper.GetNClick(gitSync.locators.opsMergeBtn);
+          assertHelper.AssertNetworkStatus("@mergeBranch");
+          gitSync.CloseOpsModal();
+          gitSync.SwitchGitBranch(demoBranch);
+          cy.get(commonLocators.canvas).should(
+            "have.css",
+            "background-color",
+            backgroudColor,
+          );
+        });
+      });
+  });
+
+  function DeleteBranchFromUI(branch: any) {
+    cy.get(gitSync.locators.quickActionsBranchBtn).click();
+    agHelper.HoverElement(
+      `${gitSync.locators.branchItem}:contains('${branch}')`,
+    );
+    cy.get(gitSync.locators.branchItemMenuBtn).click({ force: true });
+    cy.get(gitSync.locators.branchItemMenuDeleteBtn)
+      .should("be.visible")
+      .click({ force: true });
+  }
+});

app/client/cypress/limited-tests.txt

@@ -1,7 +1,7 @@
 # To run only limited tests - give the spec names in below format:
-#cypress/e2e/Regression/ClientSide/VisualTests/JSEditorIndent_spec.js
+cypress/e2e/Regression/ClientSide/Git/MergeBranch_spec.ts
 # For running all specs - uncomment below:
 #cypress/e2e/**/**/*
-cypress/e2e/Regression/ClientSide/Anvil/Widgets/*
+#cypress/e2e/Regression/ClientSide/Anvil/Widgets/*
 
 #ci-test-limit uses this file to run minimum of specs. Do not run entire suite with this command.

app/client/cypress/support/Pages/GitSync.ts

@@ -88,6 +88,7 @@ export class GitSync {
     repoLimitErrorModalDisconnectLink:
       "[data-testid='t--git-repo-limit-error-disconnect-link']",
     deployMenuConnect: "[data-testid='t--git-deploy-menu-connect']",
+    createNewBranchButton: ".t--create-new-branch-button",
   };
 
   public OpenConnectModal() {
@@ -536,4 +537,29 @@ export class GitSync {
       .invoke("get", "branch")
       .should("equal", branch);
   }
+
+  public verifyNoDuplicateBranch(branch = "br") {
+    this.agHelper.AssertElementVisibility(this.locators.quickActionsPullBtn);
+    this.agHelper.AssertElementExist(this.locators.quickActionsCommitBtn);
+    cy.waitUntil(
+      () => {
+        this.agHelper.GetNClick(this.locators.quickActionsBranchBtn, 0, true);
+        if (this.agHelper.IsElementVisible(this.locators.branchSearchInput)) {
+          return true; //visible, return true to stop waiting
+        }
+        return false; //not visible, return false to continue waiting
+      },
+      { timeout: Cypress.config("pageLoadTimeout") },
+    );
+    cy.get("@guid").then((uid) => {
+      this.agHelper.TypeText(
+        this.locators.branchSearchInput,
+        `{selectall}` + `${branch + uid}`,
+        { parseSpecialCharSeq: true },
+      );
+    });
+
+    this.agHelper.AssertElementAbsence(this.locators.createNewBranchButton);
+    this.agHelper.GetNClick(this.locators.branchCloseBtn);
+  }
 }