Skip to content

Commit

Permalink
fix: console log update and fix modal issue (#38692)
Browse files Browse the repository at this point in the history
## Description
Fix the issue for modal and remove unwanted logs.


Fixes #
https://app.zenhub.com/workspaces/qa-63316faf86bb2e170ed2e46b/issues/gh/appsmithorg/appsmith/38729

## Automation

/ok-to-test tags="@tag.JS"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12843319044>
> Commit: 8cd4512
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12843319044&attempt=2"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.JS`
> Spec:
> <hr>Sat, 18 Jan 2025 18:43:41 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

## Summary by CodeRabbit

- **Tests**
- Improved test reliability by adding page reload and modal visibility
checks in end-to-end testing.
- Increased timeout for sidebar visibility checks to accommodate varying
load times.
- Removed unnecessary console log statements to clean up test output
across various test cases.
- Verified download functionality with various scenarios, ensuring
appropriate error messages are displayed.
- Streamlined tests for local storage operations by removing debug
output.
- Cleaned up test output for show alert functions by removing debug log
statements.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
sagar-qa007 authored Jan 19, 2025
1 parent fd72197 commit db75a6c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 38 deletions.
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
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
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
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
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
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
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");
}
}

0 comments on commit db75a6c

Please sign in to comment.