Fix framework function

appsmithorg · Jan 17, 2025 · 5836c9e · 5836c9e
1 parent 6ae1e88
commit 5836c9e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.../e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts b/.../e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts
@@ -1,13 +1,14 @@
 import {
   agHelper,
   appSettings,
-  assertHelper,
   dataSources,
   deployMode,
   draggableWidgets,
   entityExplorer,
   jsEditor,
   propPane,
+  homePage,
+  debuggerHelper,
 } from "../../../../support/Objects/ObjectsCore";
 import { EntityItems } from "../../../../support/Pages/AssertHelper";
 import EditorNavigation, {
@@ -97,6 +98,7 @@ describe(
       EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", true);
       cy.get("@jsObjectName").then((jsObjectName: string) => {
+        console.log("Mera variable: ", jsObjectName);
         propPane.EnterJSContext(
           "onClick",
           `{{${jsObjectName}.myFun1()}}`,
@@ -161,6 +163,7 @@ describe(
       EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", true);
       cy.get("@jsObjectName").then((jsObjectName: string) => {
+        console.log("Mera variable: ", jsObjectName);
         propPane.EnterJSContext(
           "onClick",
           `{{${jsObjectName}.myFun1()}}`,
@@ -176,10 +179,11 @@ describe(
       agHelper.AssertElementVisibility(appSettings.locators._header);
       agHelper.ClickButton("Submit");
       agHelper.AssertURL(pageTwoUrl);
+      agHelper.CypressReload();
+      agHelper.WaitUntilEleAppear(debuggerHelper.locators._debuggerIcon);
     });
 
     it("3. To verify add a navigation using URL containing links to third party websites", () => {
-      assertHelper.AssertNetworkResponseData("@getConsolidatedData");
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", false);
@@ -226,6 +230,7 @@ describe(
       EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", true);
       cy.get("@jsObjectName").then((jsObjectName: string) => {
+        console.log("Mera variable: ", jsObjectName);
         propPane.EnterJSContext(
           "onClick",
           `{{${jsObjectName}.myFun1()}}`,
@@ -300,6 +305,7 @@ describe(
       EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", true);
       cy.get("@jsObjectName").then((jsObjectName: string) => {
+        console.log("Mera variable: ", jsObjectName);
         propPane.EnterJSContext(
           "onClick",
           `{{${jsObjectName}.myFun1()}}`,

diff --git a/.../Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts b/.../Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts
@@ -58,7 +58,7 @@ describe(
           false,
         );
       });
-      agHelper.RefreshPage();
+      agHelper.CypressReload();
       agHelper.WaitUntilEleAppear(locators._modalWrapper);
       agHelper.AssertElementVisibility(locators._modalWrapper);
       agHelper.AssertText(locators._modalButtonText, "text", "Confirm", 2);
@@ -67,7 +67,7 @@ describe(
 
       deployMode.DeployApp();
       agHelper.AssertElementVisibility(appSettings.locators._header);
-      agHelper.RefreshPage();
+      agHelper.CypressReload();
       assertHelper.AssertNetworkStatus("@getConsolidatedData");
       agHelper.WaitUntilEleAppear(locators._modalWrapper);
       agHelper.AssertElementVisibility(locators._modalWrapper);
@@ -95,6 +95,8 @@ describe(
       agHelper.ClickButton("Submit");
       agHelper.ValidateToastMessage("Modal2 is not defined", 0, 1);
       deployMode.NavigateBacktoEditor();
+      agHelper.CypressReload();
+      agHelper.WaitUntilEleAppear(locators._buttonByText("Submit"));
 
       const jsObjectBody = `export default {
         myFun1 () {
@@ -141,12 +143,13 @@ describe(
       EditorNavigation.SelectEntityByName("IconButton1", EntityType.Widget);
       propPane.ToggleJSMode("onClick", true);
       propPane.EnterJSContext("onClick", `{{closeModal(Modal2.name);}}`, true);
-      agHelper.RefreshPage();
+      agHelper.CypressReload();
       agHelper.ClickButton("Submit");
       agHelper.GetNClick(locators._modalButtonText, 0, true, 0);
       agHelper.ValidateToastMessage("Modal2 is not defined", 0, 1);
 
       deployMode.DeployApp();
+      agHelper.CypressReload();
       agHelper.AssertElementVisibility(appSettings.locators._header);
       agHelper.ClickButton("Submit");
       agHelper.GetNClick(locators._modalButtonText, 0, true, 0);
@@ -183,17 +186,17 @@ describe(
           false,
         );
       });
-      agHelper.RefreshPage();
+      agHelper.CypressReload();
       agHelper.ClickButton("Submit");
       agHelper.GetNClick(locators._modalButtonText, 0, true, 0);
       agHelper.ValidateToastMessage("Modal2 is not defined", 0, 1);
 
       deployMode.DeployApp();
+      agHelper.CypressReload();
       agHelper.AssertElementVisibility(appSettings.locators._header);
       agHelper.ClickButton("Submit");
       agHelper.GetNClick(locators._modalButtonText, 0, true, 0);
       agHelper.ValidateToastMessage("Modal2 is not defined", 0, 1);
-      deployMode.NavigateBacktoEditor();
     });
   },
 );