Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: console log update and fix modal issue #38692

Merged
merged 7 commits into from
Jan 19, 2025
Merged

fix: console log update and fix modal issue #38692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c37faba
console log update
sagar-qa007 Jan 16, 2025
2082883
Merge branch 'release' into fix/modalfornatigation
sagar-qa007 Jan 16, 2025
fb3a912
Fix some issue
sagar-qa007 Jan 16, 2025
6ce4abc
remove unused logs
sagar-qa007 Jan 16, 2025
6ae1e88
Fix case
sagar-qa007 Jan 17, 2025
5836c9e
Fix framework function
sagar-qa007 Jan 17, 2025
8cd4512
Minor update
sagar-qa007 Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...ss/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down
11 changes: 0 additions & 11 deletions ...egression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}}`,
Expand All @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand All @@ -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()}}`,
Expand All @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand All @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand All @@ -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()}}`,
Expand Down
3 changes: 0 additions & 3 deletions ...Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down
6 changes: 6 additions & 0 deletions .../e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
entityExplorer,
jsEditor,
propPane,
homePage,
debuggerHelper,
} from "../../../../support/Objects/ObjectsCore";
import { EntityItems } from "../../../../support/Pages/AssertHelper";
import EditorNavigation, {
Expand Down Expand Up @@ -177,9 +179,12 @@ describe(
agHelper.AssertElementVisibility(appSettings.locators._header);
agHelper.ClickButton("Submit");
agHelper.AssertURL(pageTwoUrl);
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);
Expand Down Expand Up @@ -250,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",
Expand Down
6 changes: 0 additions & 6 deletions ...s/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down Expand Up @@ -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()}}`,
Expand Down
20 changes: 12 additions & 8 deletions .../Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowCloseModalFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
agHelper,
apiPage,
appSettings,
assertHelper,
deployMode,
draggableWidgets,
entityExplorer,
Expand Down Expand Up @@ -50,23 +51,25 @@ 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()}}`,
true,
false,
);
});
agHelper.RefreshPage();
agHelper.CypressReload();
agHelper.WaitUntilEleAppear(locators._modalWrapper);
agHelper.AssertElementVisibility(locators._modalWrapper);
agHelper.AssertText(locators._modalButtonText, "text", "Confirm", 2);
agHelper.AssertText(locators._modalButtonText, "text", "Close", 1);
agHelper.GetNClick(locators._closeModal, 0, true, 0);

deployMode.DeployApp();
agHelper.AssertElementVisibility(appSettings.locators._header);
agHelper.RefreshPage();
agHelper.CypressReload();
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);
Expand All @@ -92,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 () {
Expand All @@ -113,7 +118,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()}}`,
Expand All @@ -139,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);
Expand Down Expand Up @@ -174,25 +179,24 @@ 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()}}`,
true,
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();
});
},
);
4 changes: 2 additions & 2 deletions app/client/cypress/support/Pages/IDE/Sidebar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -22,7 +22,7 @@ export class Sidebar {
);
}

assertVisible(timeout: number = 10000) {
assertVisible(timeout: number = 60000) {
cy.get(this.locators.sidebar, { timeout }).should("be.visible");
}
}
Loading