From c37faba3fad3cfde57fccf836099d9a337329dcf Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 16 Jan 2025 13:12:52 +0530 Subject: [PATCH 1/6] console log update --- .../FrameworkFunctions_ShowCloseModalFunctions_spec.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts index 2fef0c704cef..22d7ff16cb8a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts @@ -50,7 +50,6 @@ 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()}}`, @@ -66,7 +65,9 @@ describe( deployMode.DeployApp(); agHelper.AssertElementVisibility(appSettings.locators._header); + cy.reload(); agHelper.RefreshPage(); + agHelper.WaitUntilEleAppear(locators._modalWrapper, 0); agHelper.AssertElementVisibility(locators._modalWrapper); agHelper.AssertText(locators._modalButtonText, "text", "Confirm", 2); agHelper.AssertText(locators._modalButtonText, "text", "Close", 1); @@ -113,7 +114,6 @@ 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()}}`, @@ -174,7 +174,6 @@ describe( EditorNavigation.SelectEntityByName("IconButton1", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.myFun1()}}`, From fb3a912e41465049af418d676a7363ab9b97e93f Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 16 Jan 2025 17:36:46 +0530 Subject: [PATCH 2/6] Fix some issue --- .../FrameworkFunctions_NavigateToFunctions_spec.ts | 2 ++ app/client/cypress/support/Pages/IDE/Sidebar.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts index 173e6437e981..3aa9e293bb18 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts @@ -1,6 +1,7 @@ import { agHelper, appSettings, + assertHelper, dataSources, deployMode, draggableWidgets, @@ -180,6 +181,7 @@ describe( }); 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); diff --git a/app/client/cypress/support/Pages/IDE/Sidebar.ts b/app/client/cypress/support/Pages/IDE/Sidebar.ts index 6d9d93c125f4..e45c902ca1ae 100644 --- a/app/client/cypress/support/Pages/IDE/Sidebar.ts +++ b/app/client/cypress/support/Pages/IDE/Sidebar.ts @@ -10,7 +10,7 @@ export class Sidebar { } navigate(button: string, willFail = false) { - this.assertVisible(); + this.assertVisible(Cypress.config().pageLoadTimeout); cy.get(this.locators.sidebar) .find(this.locators.sidebarButton(button)) .as("navigateBtn") @@ -22,7 +22,7 @@ export class Sidebar { ); } - assertVisible(timeout: number = 10000) { + assertVisible(timeout: number = 60000) { cy.get(this.locators.sidebar, { timeout }).should("be.visible"); } } From 6ce4abcba119434e0b3222b5101430bfc9758b59 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Thu, 16 Jan 2025 20:05:57 +0530 Subject: [PATCH 3/6] remove unused logs --- .../FrameworkFunctions_DownloadFunctions_spec.ts | 8 -------- ...ameworkFunctions_LocalRemoveValueFunctions_spec.ts | 11 ----------- ...rameworkFunctions_LocalStoreValueFunctions_spec.ts | 3 --- .../FrameworkFunctions_NavigateToFunctions_spec.ts | 4 ---- .../FrameworkFunctions_ShowAlertFunctions_spec.ts | 6 ------ ...FrameworkFunctions_ShowCloseModalFunctions_spec.ts | 1 - 6 files changed, 33 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts index 9c9687242657..f0ed5f29efd8 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts @@ -71,7 +71,6 @@ 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()}}`, @@ -163,7 +162,6 @@ 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()}}`, @@ -238,7 +236,6 @@ 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()}}`, @@ -329,7 +326,6 @@ 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()}}`, @@ -404,7 +400,6 @@ 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()}}`, @@ -481,7 +476,6 @@ 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()}}`, @@ -572,7 +566,6 @@ 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()}}`, @@ -665,7 +658,6 @@ 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/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts index a3736466d5b6..c096870d7018 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts @@ -80,7 +80,6 @@ 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}.storeValue()}}`, @@ -93,7 +92,6 @@ describe( EditorNavigation.SelectEntityByName("Button2", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.removeValue()}}`, @@ -164,7 +162,6 @@ 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}.removeNonExistentValue()}}`, @@ -233,7 +230,6 @@ 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}.removeInvalidKey()}}`, @@ -354,7 +350,6 @@ 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}.storeValues()}}`, @@ -367,7 +362,6 @@ describe( EditorNavigation.SelectEntityByName("Button2", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.removeValue1()}}`, @@ -380,7 +374,6 @@ describe( EditorNavigation.SelectEntityByName("Button3", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.removeValue2()}}`, @@ -516,7 +509,6 @@ 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}.storeValues()}}`, @@ -529,7 +521,6 @@ describe( EditorNavigation.SelectEntityByName("Button2", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.removeValue1()}}`, @@ -628,7 +619,6 @@ 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}.storeTempValue()}}`, @@ -641,7 +631,6 @@ describe( EditorNavigation.SelectEntityByName("Button2", EntityType.Widget); propPane.ToggleJSMode("onClick", true); cy.get("@jsObjectName").then((jsObjectName: string) => { - console.log("Mera variable: ", jsObjectName); propPane.EnterJSContext( "onClick", `{{${jsObjectName}.removeTempValue()}}`, diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts index e427948b4c74..05e406eb032e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts @@ -68,7 +68,6 @@ 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()}}`, @@ -229,7 +228,6 @@ 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()}}`, @@ -311,7 +309,6 @@ 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/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts index 3aa9e293bb18..0fa6f4164dd7 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts @@ -97,7 +97,6 @@ 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()}}`, @@ -162,7 +161,6 @@ 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()}}`, @@ -228,7 +226,6 @@ 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()}}`, @@ -303,7 +300,6 @@ 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/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts index 9ea7b04c0f62..514f8187027d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts @@ -54,7 +54,6 @@ 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()}}`, @@ -110,7 +109,6 @@ 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()}}`, @@ -177,7 +175,6 @@ 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()}}`, @@ -252,7 +249,6 @@ 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()}}`, @@ -327,7 +323,6 @@ 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()}}`, @@ -402,7 +397,6 @@ 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/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts index 22d7ff16cb8a..d5bbe98ffc6f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts @@ -65,7 +65,6 @@ describe( deployMode.DeployApp(); agHelper.AssertElementVisibility(appSettings.locators._header); - cy.reload(); agHelper.RefreshPage(); agHelper.WaitUntilEleAppear(locators._modalWrapper, 0); agHelper.AssertElementVisibility(locators._modalWrapper); From 6ae1e885dee453f65da73a70242bc938eb1e92e0 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Fri, 17 Jan 2025 13:13:10 +0530 Subject: [PATCH 4/6] Fix case --- .../FrameworkFunctions_ShowCloseModalFunctions_spec.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts index d5bbe98ffc6f..6739c2b1c121 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts @@ -2,6 +2,7 @@ import { agHelper, apiPage, appSettings, + assertHelper, deployMode, draggableWidgets, entityExplorer, @@ -58,6 +59,7 @@ describe( ); }); agHelper.RefreshPage(); + agHelper.WaitUntilEleAppear(locators._modalWrapper); agHelper.AssertElementVisibility(locators._modalWrapper); agHelper.AssertText(locators._modalButtonText, "text", "Confirm", 2); agHelper.AssertText(locators._modalButtonText, "text", "Close", 1); @@ -66,7 +68,8 @@ describe( deployMode.DeployApp(); agHelper.AssertElementVisibility(appSettings.locators._header); agHelper.RefreshPage(); - agHelper.WaitUntilEleAppear(locators._modalWrapper, 0); + assertHelper.AssertNetworkStatus("@getConsolidatedData"); + agHelper.WaitUntilEleAppear(locators._modalWrapper); agHelper.AssertElementVisibility(locators._modalWrapper); agHelper.AssertText(locators._modalButtonText, "text", "Confirm", 2); agHelper.AssertText(locators._modalButtonText, "text", "Close", 1); From 5836c9e5f562b5a6c5df48fbe4c41a282f091266 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Fri, 17 Jan 2025 15:40:58 +0530 Subject: [PATCH 5/6] Fix framework function --- .../FrameworkFunctions_NavigateToFunctions_spec.ts | 10 ++++++++-- ...ameworkFunctions_ShowCloseModalFunctions_spec.ts | 13 ++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts index 0fa6f4164dd7..feaaa6646044 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts +++ b/app/client/cypress/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/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts index 6739c2b1c121..758999670c99 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts +++ b/app/client/cypress/e2e/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(); }); }, ); From 8cd4512993023ed476ed3a159893518c64acb2e1 Mon Sep 17 00:00:00 2001 From: Sagar Khalasi Date: Sat, 18 Jan 2025 16:13:30 +0530 Subject: [PATCH 6/6] Minor update --- .../FrameworkFunctions_NavigateToFunctions_spec.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts index feaaa6646044..6e481ba700bc 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts @@ -179,11 +179,12 @@ describe( agHelper.AssertElementVisibility(appSettings.locators._header); agHelper.ClickButton("Submit"); agHelper.AssertURL(pageTwoUrl); - agHelper.CypressReload(); agHelper.WaitUntilEleAppear(debuggerHelper.locators._debuggerIcon); + agHelper.CypressReload(); }); it("3. To verify add a navigation using URL containing links to third party websites", () => { + agHelper.RefreshPage(); EditorNavigation.SelectEntityByName("Page1", EntityType.Page); EditorNavigation.SelectEntityByName("Button1", EntityType.Widget); propPane.ToggleJSMode("onClick", false); @@ -254,6 +255,7 @@ describe( }); it("4. To verify navigation to a hidden page in same as well a new window", () => { + agHelper.RefreshPage(); PageList.AddNewPage(); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Page3",