Merge pull request #41158 from appsmithorg/release

01/08 Daily Promotion

Author: btsgh

app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts

@@ -11,7 +11,11 @@ import {
 } from "../../../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../../../support/Pages/PageList";
 
-describe(
+// ! Git issue
+// Backend throws error when trying to import an app created in older versions of Appsmith
+// This test is skipped to avoid the error, but it can be unskipped for manual testing
+// Ref line: 46 - gitSync.ImportAppFromGit(workspaceName, appRepoName, true);
+describe.skip(
   "Import and validate older app (app created in older versions of Appsmith) from Gitea",
   {
     tags: [

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

@@ -34,13 +34,13 @@ describe(
 
         cy.intercept({
           method: "POST",
-          url: "/api/v1/git/auto-commit/app/*",
+          url: "/api/v1/git/applications/*/auto-commit",
         }).as("gitAutocommitTriggerApi");
 
         cy.intercept(
           {
             method: "GET",
-            url: "/api/v1/git/auto-commit/progress/app/*",
+            url: "/api/v1/git/applications/*/auto-commit/progress",
           },
           (req) => {
             req.on("response", (res) => {

app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js

@@ -188,7 +188,7 @@ describe(
 
       agHelper.GetNClick(gitSync.locators.quickActionsCommitBtn);
       agHelper.AssertElementVisibility(gitSync.locators.opsDiscardBtn);
-      cy.intercept("PUT", "/api/v1/git/discard/app/*", {
+      cy.intercept("PUT", "/api/v1/git/applications/*/discard", {
         body: {
           responseMeta: {
             status: 500,

app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js

@@ -1,6 +1,10 @@
 import * as _ from "../../../../../support/Objects/ObjectsCore";
 
-describe(
+// ! Git issue
+// Backend hangs perptually when trying to import an app created in older versions of Appsmith
+// This test is skipped to avoid the error, but it can be unskipped for manual testing
+// Ref line: 45 - gitSync.ImportAppFromGit(workspaceName, appRepoName, true);
+describe.skip(
   "Git import empty repository",
   {
     tags: [
@@ -37,13 +41,16 @@ describe(
         repoName = uid;
         _.gitSync.CreateTestGiteaRepo(repoName);
         _.gitSync.ImportAppFromGit(undefined, repoName, false);
-        cy.wait("@importFromGit").then((interception) => {
-          const status = interception.response.body.responseMeta.status;
-          const message = interception.response.body.responseMeta.error.message;
-          expect(status).to.be.gte(400);
-          expect(message).to.contain(failureMessage);
-          _.gitSync.CloseConnectModal();
-        });
+        cy.wait("@importFromGit", { requestTimeout: 30000 }).then(
+          (interception) => {
+            const status = interception.response.body.responseMeta.status;
+            const message =
+              interception.response.body.responseMeta.error.message;
+            expect(status).to.be.gte(400);
+            expect(message).to.contain(failureMessage);
+            _.gitSync.CloseConnectModal();
+          },
+        );
       });
     });
     after(() => {

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js

@@ -79,7 +79,9 @@ describe(
       cy.get(_.gitSync.locators.disconnectModalRevokeBtn).should("be.enabled");
 
       // disconnecting validation
-      cy.intercept("POST", "api/v1/git/disconnect/app/*").as("disconnect");
+      cy.intercept("POST", "api/v1/git/applications/*/disconnect").as(
+        "disconnect",
+      );
       cy.get(_.gitSync.locators.disconnectModalRevokeBtn).click();
       cy.wait(3000);
       cy.wait("@disconnect").should(

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts

@@ -35,7 +35,7 @@ describe(
 
         cy.intercept({
           method: "POST",
-          url: /\/api\/v1\/git\/branch\/app\/.*\/protected/,
+          url: /\/api\/v1\/git\/applications\/.*\/protected-branches/,
         }).as("gitProtectApi");
         cy.get("@gitRepoName").then((repName) => {
           repoName = repName;

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts

@@ -60,6 +60,7 @@ describe(
         _.gitSync.CommitAndPush();
 
         _.gitSync.ImportAppFromGit(ws2Name, repoName);
+        _.agHelper.WaitUntilEleAppear(_.gitSync.locators.quickActionsBranchBtn);
         _.gitSync.SwitchGitBranch(branchName);
         EditorNavigation.SelectEntityByName("MyText", EntityType.Widget);
         _.propPane.ValidatePropertyFieldValue("Text", "Hello World");

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitStatusLite_spec.ts

@@ -36,11 +36,10 @@ describe(
     it("Issue 26038 : No simultaneous git status and remote compare api calls on commit modal", function () {
       cy.wait(1000);
 
-      cy.intercept({
-        method: "GET",
-        url: "/api/v1/git/status/app/**",
-        query: { compareRemote: "true" },
-      }).as("gitStatusApi");
+      cy.intercept(
+        "GET",
+        /\/api\/v1\/git\/applications\/.*\/status\?compareRemote=.*/,
+      ).as("gitStatusApi");
 
       _.agHelper.GetNClick(_.locators._publishButton);
 

app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts

@@ -108,10 +108,6 @@ describe(
 
       _.gitSync.SwitchGitBranch(mainBranch);
 
-      cy.get(".t--upgrade").click({ force: true });
-
-      cy.get(".t--upgrade-confirm").click({ force: true });
-
       cy.location().should((location) => {
         expect(location.pathname).includes(newPathname);
       });

app/client/cypress/support/Objects/FeatureFlags.ts

@@ -4,6 +4,7 @@ import { ObjectsRegistry } from "./Registry";
 const defaultFlags = {
   rollout_remove_feature_walkthrough_enabled: false, // remove this flag from here when it's removed from code
   release_git_modularisation_enabled: true,
+  release_git_api_contracts_enabled: true,
 };
 
 export const featureFlagIntercept = (