appsmithorg · hetunandu · Mar 14, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 6, 2025
diff --git a/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js b/app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js
@@ -92,7 +92,7 @@ describe(
       cy.get(appPage.closeButton).closest("div").click({ force: true });
       PageLeftPane.switchSegment(PagePaneSegment.UI);
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
-      cy.xpath(appPage.postApi).click({ force: true });
+      cy.get(appPage.postApi).click({ force: true });
       cy.ResponseCheck("Test");
       // cy.ResponseCheck("Task completed");
       cy.ResponseCheck("Curt50@gmail.com");
-      cy.ResponseCheck("Test");
-      // cy.ResponseCheck("Task completed");
-      cy.ResponseCheck("Curt50@gmail.com");
+      cy.ResponseCheck({
+        subject: "Test",
+        recipient: "Curt50@gmail.com"
+      });
+      // cy.ResponseCheck("Task completed");
-      cy.ResponseCheck("Test");
-      // cy.ResponseCheck("Task completed");
-      cy.ResponseCheck("Curt50@gmail.com");
+      cy.ResponseCheck({
+        subject: "Test",
+        recipient: "Curt50@gmail.com"
+      });
+      // cy.ResponseCheck("Task completed");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts
@@ -112,6 +112,8 @@ describe(
       "8. No autocomplete for Removed libraries",
       { tags: ["@tag.excludeForAirgap"] },
       function () {
+        AppSidebar.navigate(AppSidebarButton.Editor);
+        EditorNavigation.SelectEntityByName("Text1Copy", EntityType.Widget);
         entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT");
         AppSidebar.navigate(AppSidebarButton.Libraries);
         installer.uninstallLibrary("uuidjs");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug20275_Spec.js
@@ -30,7 +30,7 @@ describe(
         prettify: false,
       });
 
-      jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false);
+      jsEditor.EnableDisableAsyncFuncSettings("myFun1", true);
 
       ee.DragDropWidgetNVerify(WIDGET.TEXT, 200, 600);
       EditorNavigation.SelectEntityByName("Text1", EntityType.Widget);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js
@@ -108,11 +108,6 @@ describe(
         action: "Rename",
       });
       cy.EditApiNameFromExplorer("SecondAPI");
-      cy.xpath(apiwidget.popover)
-        .last()
-        .should("be.hidden")
-        .invoke("show")
-        .click({ force: true });
       ee.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "SecondAPI",
         action: "Move to page",

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
@@ -59,7 +59,7 @@ describe(
         toastToValidate: "moved to page",
         entityType: EntityItems.Page,
       });
-      EditorNavigation.SelectEntityByName(newPageId, EntityType.Page);
+      PageList.VerifyIsCurrentPage(newPageId);
       PageLeftPane.switchSegment(PagePaneSegment.JS);
       PageLeftPane.assertPresence("RenamedJSObjectCopy");
       jsEditor.ValidateDefaultJSObjProperties("RenamedJSObjectCopy");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Renaming_spec.js
@@ -32,7 +32,10 @@ describe(
         cy.get(".t--context-menu").click({ force: true });
       });
       cy.selectAction("Rename");
-      cy.get(explorer.editEntity).last().type(firstApiName, { force: true });
+      cy.get(explorer.editEntity)
+        .last()
+        .clear()
+        .type(firstApiName, { force: true });
       cy.validateMessage(firstApiName);
       agHelper.PressEnter();
       entityExplorer.ActionContextMenuByEntityName({
@@ -98,7 +101,10 @@ describe("Entity Naming conflict test", { tags: ["@tag.IDE"] }, function () {
     });
     cy.selectAction("Rename");
 
-    cy.get(explorer.editEntity).last().type(firstApiName, { force: true });
+    cy.get(explorer.editEntity)
+      .last()
+      .clear()
+      .type(firstApiName, { force: true });
     entityExplorer.ValidateDuplicateMessageToolTip(firstApiName);
     cy.get("body").click(0, 0);
     cy.wait(2000);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Tab_rename_Delete_spec.ts
@@ -31,7 +31,7 @@ describe(
         entityNameinLeftSidebar: "Tab2",
         action: "Rename",
       });
-      agHelper.TypeText(locators._entityNameEditing("Tab2"), tabname);
+      agHelper.TypeText(locators._entityNameEditing, tabname, { clear: true });
       agHelper.Sleep(2000);
       entityExplorer.ValidateDuplicateMessageToolTip(tabname);
       cy.get(explorer.editEntity)

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncGitBugs_spec.js
@@ -158,7 +158,7 @@ describe(
 
       gitSync.CreateGitBranch(tempBranch, true);
       cy.wait(2000);
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      PageList.VerifyIsCurrentPage("Page1");
       PageLeftPane.switchSegment(PagePaneSegment.JS);
       // verify jsObject is not duplicated
       PageLeftPane.assertPresence(jsObject);
@@ -232,8 +232,8 @@ describe(
         cy.xpath("//input[@class='bp3-input' and @value='Success']").should(
           "be.visible",
         );
-        // switch to Page1 copy and verify jsObject data binding
-        EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+        // switch to Page1 and verify jsObject data binding
+        PageList.VerifyIsCurrentPage("Page1");
         PageLeftPane.switchSegment(PagePaneSegment.JS);
         // verify jsObject is not duplicated
         PageLeftPane.assertPresence(jsObject);

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
@@ -119,7 +119,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page1",
         pageName,
-        false,
+        true,
         EntityItems.Page,
       );
       PageList.ClonePage(pageName);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
@@ -83,7 +83,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page2",
         "ParentPage1",
-        false,
+        true,
         EntityItems.Page,
       );
       dataSources.NavigateToDSCreateNew();
@@ -101,7 +101,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page2",
         "ChildPage1",
-        false,
+        true,
         EntityItems.Page,
       );
       dataSources.NavigateToDSCreateNew();
@@ -132,7 +132,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "ParentPage1",
         "ParentPageRenamed",
-        false,
+        true,
         EntityItems.Page,
       );
       agHelper.RemoveUIElement(

diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Bug_Fixes.js
@@ -25,6 +25,6 @@ describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
 
     cy.get(".t--widget-imagewidget").eq(0).click();
     //check if the entities are expanded
-    cy.get(`[data-guided-tour-id="explorer-entity-Image1"]`).should("exist");
+    cy.get(`[data-testid="t--entity-item-Image1"]`).should("exist");
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Command_Click_Navigation_spec.js
@@ -155,9 +155,14 @@ describe(
       agHelper.Sleep();
 
       // Assert context switching works when going back to canvas
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      cy.get(`div.t--entity-item[data-selected='true']`).should(
+        "have.length",
+        1,
+      );
 
-      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+      EditorNavigation.SelectEntityByName("Text1", EntityType.Widget, {}, [
+        "Container1",
+      ]);
       cy.get(".t--property-pane-title").should("contain", "Text1");
 
       // Go back to JS editor

diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts
@@ -9,9 +9,10 @@ import {
   installer,
   draggableWidgets,
 } from "../../../../support/Objects/ObjectsCore";
-import {
+import EditorNavigation, {
   AppSidebar,
   AppSidebarButton,
+  EntityType,
   PageLeftPane,
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
@@ -32,6 +33,7 @@ describe(
       AppSidebar.navigate(AppSidebarButton.Editor);
       entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 200, 200);
       PageLeftPane.switchSegment(PagePaneSegment.UI);
+      EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
       entityExplorer.RenameEntityFromExplorer("Table1", "jsonwebtoken");
       AppSidebar.navigate(AppSidebarButton.Libraries);
       installer.OpenInstaller();

diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_ForkApp_spec.ts
@@ -35,12 +35,20 @@ describe("Fork application with Jsobjects", {}, function () {
     for (let i = 1; i <= 11; i++) {
       agHelper.GetNClick(locators._entityTestId(`JS${i}`));
       agHelper.FailIfErrorToast("");
-      agHelper.AssertClassExists(locators._entityTestId(`JS${i}`), "active");
+      agHelper.AssertAttribute(
+        locators._entityTestId(`JS${i}`),
+        "data-selected",
+        "true",
+      );
     }
     for (let i = 12; i <= 17; i++) {
       agHelper.GetNClick(locators._entityTestId(`J${i}`));
       agHelper.FailIfErrorToast("");
-      agHelper.AssertClassExists(locators._entityTestId(`J${i}`), "active");
+      agHelper.AssertAttribute(
+        locators._entityTestId(`J${i}`),
+        "data-selected",
+        "true",
+      );
     }
 
     jsEditor.CreateJSObject('"MiddleName": "Test",\n', {
@@ -51,9 +59,17 @@ describe("Fork application with Jsobjects", {}, function () {
       lineNumber: 5,
     });
     agHelper.GetNClick(locators._entityTestId("J16"));
-    agHelper.AssertClassExists(locators._entityTestId("J16"), "active");
+    agHelper.AssertAttribute(
+      locators._entityTestId("J16"),
+      "data-selected",
+      "true",
+    );
     agHelper.GetNClick(locators._entityTestId("J17"));
-    agHelper.AssertClassExists(locators._entityTestId("J17"), "active");
+    agHelper.AssertAttribute(
+      locators._entityTestId("J17"),
+      "data-selected",
+      "true",
+    );
     agHelper.GetNAssertContains(".CodeMirror-line ", '"MiddleName": "Test"');
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js
@@ -45,7 +45,7 @@ describe("Slug URLs", { tags: ["@tag.AppUrl"] }, () => {
     entityExplorer.RenameEntityFromExplorer(
       "Page1",
       "Renamed",
-      false,
+      true,
       EntityItems.Page,
     );
     assertHelper.AssertNetworkStatus("updatePage");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PageActions_spec.ts
@@ -24,15 +24,16 @@ describe("Check Page Actions Menu", {}, function () {
     agHelper.GetNClick(locators._contextMenuItem("Rename"));
     agHelper.TypeText(propPane._placeholderName, `NewPage{enter}`, {
       parseSpecialCharSeq: true,
+      clear: true,
     });
 
     PageList.ClonePage("NewPage");
     PageList.HidePage("NewPage Copy");
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("NewPage Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("NewPage Copy");
     PageList.assertAbsence("NewPage Copy");
@@ -84,6 +85,7 @@ describe("Check Page Actions Menu", {}, function () {
     agHelper.GetNClick(locators._contextMenuItem("Rename"));
     agHelper.TypeText(propPane._placeholderName, `Page2{enter}`, {
       parseSpecialCharSeq: true,
+      clear: true,
     });
 
     PageList.ClonePage("Page2");
@@ -92,8 +94,8 @@ describe("Check Page Actions Menu", {}, function () {
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("Page2 Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("Page2 Copy");
     PageList.assertAbsence("Page2 Copy");
@@ -106,15 +108,16 @@ describe("Check Page Actions Menu", {}, function () {
     agHelper.GetNClick(locators._contextMenuItem("Rename"));
     agHelper.TypeText(propPane._placeholderName, `HomePage{enter}`, {
       parseSpecialCharSeq: true,
+      clear: true,
     });
 
     PageList.ClonePage("HomePage");
     PageList.HidePage("HomePage Copy");
     PageList.ShowList();
     agHelper.AssertAttribute(
       locators._entityTestId("HomePage Copy"),
-      "disabled",
-      "disabled",
+      "data-disabled",
+      "true",
     );
     PageList.DeletePage("HomePage Copy");
     PageList.assertAbsence("HomePage Copy");

diff --git a/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts b/app/client/cypress/e2e/Regression/ClientSide/PartialImportExport/PartialImportRegularApp.ts
@@ -25,7 +25,7 @@ describe(
       entityExplorer.RenameEntityFromExplorer(
         "Page1",
         "Home",
-        false,
+        true,
         entityItems.Page,
       );
     });

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts
@@ -82,15 +82,30 @@ describe(
         refactorInput.inputWidget.newName,
       );
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
+
+      EditorNavigation.SelectEntityByName(
+        refactorInput.query.oldName,
+        EntityType.Query,
+      );
       entityExplorer.RenameEntityFromExplorer(
         refactorInput.query.oldName,
         refactorInput.query.newName,
       );
+
+      EditorNavigation.SelectEntityByName(
+        refactorInput.api.oldName,
+        EntityType.Api,
+      );
       entityExplorer.RenameEntityFromExplorer(
         refactorInput.api.oldName,
         refactorInput.api.newName,
       );
+
       PageLeftPane.switchSegment(PagePaneSegment.JS);
+      EditorNavigation.SelectEntityByName(
+        refactorInput.jsObject.oldName,
+        EntityType.JSObject,
+      );
       entityExplorer.RenameEntityFromExplorer(
         refactorInput.jsObject.oldName,
         refactorInput.jsObject.newName,

diff --git a/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SetProperty/SetOptions_Spec.ts
@@ -209,7 +209,7 @@ describe(
 
     it("3. Update 'setOptions' property - during onPage load", () => {
       EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-      jsEditor.EnableDisableAsyncFuncSettings("myFun1", true, false); //for on page load execution
+      jsEditor.EnableDisableAsyncFuncSettings("myFun1", true); //for on page load execution
       deployMode.DeployApp();
       agHelper
         .GetText(
@@ -268,7 +268,7 @@ describe(
         ])}, () => {showAlert('unable to run API')});
       }
     }`);
-      jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true, false); //for on page load execution, since sync function is updated to async
+      jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true); //for on page load execution, since sync function is updated to async
       deployMode.DeployApp();
       agHelper.WaitForCondition(
         agHelper
@@ -313,7 +313,7 @@ describe(
         Select3.setOptions(Select1.options.concat(Select2.options));
       }
     }`);
-      jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true, false); //for on page load execution, since sync function is updated to async
+      jsEditor.EnableDisableAsyncFuncSettings("myFunc1", true); //for on page load execution, since sync function is updated to async
       EditorNavigation.SelectEntityByName("Input1", EntityType.Widget);
       propPane.UpdatePropertyFieldValue("Default value", "{{Select3.options}}");
       deployMode.DeployApp();
@@ -355,7 +355,7 @@ describe(
         setTimeout(() => {Select1.setOptions(localValue)}, 1000);
       }
     }`);
-      jsEditor.EnableDisableAsyncFuncSettings("myFun1", false, false); //for on page load execution
+      jsEditor.EnableDisableAsyncFuncSettings("myFun1", false); //for on page load execution
       deployMode.DeployApp();
       agHelper
         .GetText(
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ describe( @@
           entityExplorer.RenameEntityFromExplorer(
             "Page1",
             "Home",
-            false,
+            true,
             entityItems.Page,
           );
         });
@@ Expand Down @@