From da3fd27cc20daa26530d2322a98f52326ebe6f4d Mon Sep 17 00:00:00 2001
From: Vijetha-Kaja <vijetha@appsmith.com>
Date: Fri, 4 Aug 2023 18:22:35 +0530
Subject: [PATCH] test: Cypress - Bug 23822 Automation (#25784)

## Description

- Added necessary assertions to cover
https://github.com/appsmithorg/appsmith/issues/23822

## Type of change

- Automation

## How Has This Been Tested?
- Cypress test runs

## Checklist:
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---
 .../v1.9.24/DSCrudAndBindings_Spec.ts         | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
index fa6b11e304..4fc726ddf5 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts
@@ -37,7 +37,7 @@ describe("Import and validate older app (app created in older versions of Appsmi
     homePage.AssertNCloseImport();
   });
 
-  it("1. Validate merge status", () => {
+  it("1. Validate merge status + Bug23822", () => {
     entityExplorer.AssertEntityPresenceInExplorer("ListingAndReviews");
     //Wait for the app to settle
     agHelper.Sleep(3000);
@@ -49,11 +49,31 @@ describe("Import and validate older app (app created in older versions of Appsmi
     agHelper.AssertElementVisible(gitSync._gitSyncModal);
 
     //This is expected due to Canvas Splitting PR changes in v1.9.24
+    agHelper.GetNAssertContains(
+      gitSync._gitStatusChanges,
+      /[0-9] page(|s) modified/,
+    );
     agHelper.GetNAssertElementText(
       gitSync._gitStatusChanges,
-      "4 pages modified",
-      "contain.text",
+      "Application settings modified",
+      "not.contain.text",
     );
+    agHelper.GetNAssertElementText(
+      gitSync._gitStatusChanges,
+      "Theme modified",
+      "not.contain.text",
+    );
+    agHelper.AssertContains(/[0-9] quer(y|ies) modified/, "not.exist");
+
+    // Commented out due to #25739 - to be fixed by dev later
+    // agHelper.GetNAssertElementText(
+    //   gitSync._gitStatusChanges,
+    //   "datasource modified",
+    //   "not.contain.text",
+    // );
+
+    agHelper.AssertContains(/[0-9] JS Object(|s) modified/, "not.exist");
+    agHelper.AssertContains(/[0-9] librar(y|ies) modified/, "not.exist");
     agHelper.GetNAssertElementText(
       gitSync._gitStatusChanges,
       "Some of the changes above are due to an improved file structure designed to reduce merge conflicts. You can safely commit them to your repository.",