From 53e8163017de19eb93d09570d5e8cc9cb2bb21cc Mon Sep 17 00:00:00 2001 From: Midhun Kumar E Date: Thu, 26 Oct 2023 15:23:04 +0530 Subject: [PATCH] Fix failing specs (#8031) --- cypress-tests/cypress/commands/commands.js | 23 ++++++++------ .../e2e/editor/inspectorHappypath.cy.js | 7 +++++ .../e2e/editor/widget/buttonHappyPath.cy.js | 12 +++++-- .../cypress/e2e/editor/widget/csa.cy.js | 31 +++++++++++++++---- .../e2e/editor/widget/listViewHappyPath.cy.js | 4 ++- .../e2e/editor/widget/tableRegression.cy.js | 9 +++++- cypress-tests/cypress/support/utils/button.js | 7 ++++- 7 files changed, 71 insertions(+), 22 deletions(-) diff --git a/cypress-tests/cypress/commands/commands.js b/cypress-tests/cypress/commands/commands.js index 016af0bf06..8d8acc5164 100644 --- a/cypress-tests/cypress/commands/commands.js +++ b/cypress-tests/cypress/commands/commands.js @@ -56,8 +56,6 @@ Cypress.Commands.add("createApp", (appName) => { cy.get("body").then(($title) => { cy.get(getAppButtonSelector($title)).click(); - cy.clearAndType('[data-cy="app-name-input"]', appName); - cy.get('[data-cy="+ Create app"]').click(); }); cy.waitForAppLoad(); cy.skipEditorPopover(); @@ -108,18 +106,23 @@ Cypress.Commands.add( .find("pre.CodeMirror-line") .invoke("text") .then((text) => { - cy.wrap(subject).type(createBackspaceText(text), { delay: 0 }), - { - delay: 0, - }; + cy + .wrap(subject) + .last() + .click() + .type(createBackspaceText(text), { delay: 0 }), + { + delay: 0, + }; }); if (!Array.isArray(value)) { - cy.wrap(subject).type(value, { + cy.wrap(subject).last().type(value, { parseSpecialCharSequences: false, delay: 0, }); } else { cy.wrap(subject) + .last() .type(value[1], { parseSpecialCharSequences: false, delay: 0, @@ -186,9 +189,9 @@ Cypress.Commands.add( .invoke("text") .then((text) => { cy.wrap(subject).type(createBackspaceText(text)), - { - delay: 0, - }; + { + delay: 0, + }; }); } ); diff --git a/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js b/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js index a8dce694c5..02803d1140 100644 --- a/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js +++ b/cypress-tests/cypress/e2e/editor/inspectorHappypath.cy.js @@ -83,6 +83,9 @@ describe("Editor- Inspector", () => { .click() .type("home{enter}"); cy.get('[data-cy="button-add-query-param"]').click(); + cy.wait(1000); + cy.get('[data-cy="button-add-query-param"]').click(); + addSupportCSAData("query-param-key", "key"); addSupportCSAData("query-param-value", "value"); @@ -91,6 +94,8 @@ describe("Editor- Inspector", () => { selectEvent("On click", "Set variable"); addSupportCSAData("key", "globalVar"); addSupportCSAData("variable", "globalVar"); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button2")).click(); cy.get('[data-cy="real-canvas"]').click("topRight", { force: true }); @@ -98,6 +103,8 @@ describe("Editor- Inspector", () => { selectEvent("On click", "Set page variable"); addSupportCSAData("key", "pageVar"); addSupportCSAData("variable", "pageVar"); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button3")).click(); cy.get(commonWidgetSelector.sidebarinspector).click(); diff --git a/cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js index e5318b6dcc..9207f78956 100644 --- a/cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js +++ b/cypress-tests/cypress/e2e/editor/widget/buttonHappyPath.cy.js @@ -34,7 +34,7 @@ import { describe("Editor- Test Button widget", () => { beforeEach(() => { cy.apiLogin(); - cy.apiCreateApp(); + cy.apiCreateApp(`${fake.companyName}-App`); cy.openApp(); cy.dragAndDropWidget(buttonText.defaultWidgetText, 500, 500); }); @@ -76,6 +76,8 @@ describe("Editor- Test Button widget", () => { openEditorSidebar(data.widgetName); openAccordion(commonWidgetText.accordionEvents); addDefaultEventHandler(data.alertMessage); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget(data.widgetName)).click(); cy.verifyToastMessage(commonSelectors.toastMessage, data.alertMessage); @@ -341,6 +343,7 @@ describe("Editor- Test Button widget", () => { }); it("Should verify csa", () => { + cy.get('[data-tooltip-content="Hide query panel"]').click(); // cy.dragAndDropWidget(buttonText.defaultWidgetText); selectEvent("On click", "Show alert"); @@ -359,7 +362,8 @@ describe("Editor- Test Button widget", () => { cy.dragAndDropWidget(buttonText.defaultWidgetText, 500, 150); selectEvent("On click", "Control Component"); selectCSA("button1", "Disable"); - cy.get('[data-cy="Value-toggle-button"]').click(); + cy.get('[data-cy="Value-fx-button"]').realClick(); + cy.get('[data-cy="Value-input-field"]').clearAndTypeOnCodeMirror(`{{true`); cy.get('[data-cy="real-canvas"]').click("topRight", { force: true }); cy.dragAndDropWidget(buttonText.defaultWidgetText, 500, 200); @@ -370,7 +374,9 @@ describe("Editor- Test Button widget", () => { cy.dragAndDropWidget(buttonText.defaultWidgetText, 500, 250); selectEvent("On click", "Control Component"); selectCSA("button1", "Loading"); - cy.get('[data-cy="Value-toggle-button"]').click(); + cy.wait(500); + cy.get('[data-cy="Value-fx-button"]').realClick(); + cy.get('[data-cy="Value-input-field"]').clearAndTypeOnCodeMirror(`{{true`); cy.get(commonWidgetSelector.draggableWidget("textinput1")).type("testBtn"); cy.wait(500); diff --git a/cypress-tests/cypress/e2e/editor/widget/csa.cy.js b/cypress-tests/cypress/e2e/editor/widget/csa.cy.js index 95a385d5bf..3ac948e9a9 100644 --- a/cypress-tests/cypress/e2e/editor/widget/csa.cy.js +++ b/cypress-tests/cypress/e2e/editor/widget/csa.cy.js @@ -12,13 +12,15 @@ import { } from "Support/utils/commonWidget"; import { verifyComponent } from "Support/utils/basicComponents"; import { commonWidgetText } from "Texts/common"; +import { fake } from "Fixtures/fake"; describe("Editor- CSA", () => { const toolJetImage = "cypress/fixtures/Image/tooljet.png"; beforeEach(() => { cy.apiLogin(); - cy.apiCreateApp(); + cy.apiCreateApp(`${fake.companyName}-App`); cy.openApp(); + cy.get('[data-tooltip-content="Hide query panel"]').click(); }); afterEach(() => { @@ -36,6 +38,8 @@ describe("Editor- CSA", () => { selectEvent("On click", "Control Component"); selectCSA("tabs1", "Set current tab"); addSupportCSAData("Id", "2"); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button1")).click(); cy.get(".nav-link").eq(0).verifyVisibleElement("not.have.class", "active"); @@ -67,7 +71,14 @@ describe("Editor- CSA", () => { cy.get('[data-cy="draggable-widget-numberinput1"]') .click() .type(`{selectAll}{backspace}30{enter}`); + cy.wait(200); + cy.forceClickOnCanvas(); + + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button2")).click(); + cy.wait(200); + cy.get(commonWidgetSelector.draggableWidget("button2")).click(); + cy.verifyToastMessage( commonSelectors.toastMessage, "Form submitted successfully" @@ -77,6 +88,8 @@ describe("Editor- CSA", () => { cy.get('[data-cy="draggable-widget-numberinput1"]') .click() .type(`{selectAll}{backspace}20{enter}`); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button3")).click(); cy.get('[data-cy="draggable-widget-numberinput1"]').should( "have.value", @@ -96,7 +109,8 @@ describe("Editor- CSA", () => { selectEvent("On click", "Control Component"); selectCSA("dropdown1", "Select option"); addSupportCSAData("Select", "{{3"); - + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button1")).click(); cy.get( '[data-cy="draggable-widget-dropdown1"] .css-1qrxvr1-singleValue' @@ -128,6 +142,8 @@ describe("Editor- CSA", () => { cy.get(commonWidgetSelector.draggableWidget("textarea1")) .should("be.visible") .and("have.text", "New Text"); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button2")).click(); cy.get(commonWidgetSelector.draggableWidget("textarea1")) @@ -180,10 +196,13 @@ describe("Editor- CSA", () => { cy.dragAndDropWidget("Button", 500, 300); selectEvent("On click", "Control Component"); selectCSA("icon1", "Set Visibility"); - cy.get('[data-cy="Value-toggle-button"]').click(); - cy.get('[data-cy="Value-toggle-button"]') - .should("be.visible") - .and("not.be.checked"); + cy.get('[data-cy="Value-fx-button"]').click(); + cy.get('[data-cy="Value-input-field"]').clearAndTypeOnCodeMirror("{{false"); + // cy.get('[data-cy="Value-toggle-button"]') + // .should("be.visible") + // .and("not.be.checked"); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget("button1")).click(); cy.verifyToastMessage( diff --git a/cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js index 725c841bc3..fe21f3809d 100644 --- a/cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js +++ b/cypress-tests/cypress/e2e/editor/widget/listViewHappyPath.cy.js @@ -35,7 +35,7 @@ import { describe("List view widget", () => { beforeEach(() => { cy.apiLogin(); - cy.apiCreateApp(); + cy.apiCreateApp(`${fake.companyName}-App`); cy.openApp(); cy.viewport(1200, 1200); cy.dragAndDropWidget("List View", 50, 500); @@ -164,6 +164,8 @@ describe("List view widget", () => { ) ); cy.get(commonWidgetSelector.buttonCloseEditorSideBar).click(); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(`[data-cy=${data.widgetName.toLowerCase()}-row-1]`).click(); cy.verifyToastMessage(commonSelectors.toastMessage, data.marks[1]); diff --git a/cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js b/cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js index 1fea385edf..f08a07b469 100644 --- a/cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js +++ b/cypress-tests/cypress/e2e/editor/widget/tableRegression.cy.js @@ -275,6 +275,10 @@ describe("Table", () => { "have.text", "Button Position" ); // dropdown_type + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); + openEditorSidebar(data.widgetName); + cy.get('[data-cy="pages-name-fakename1"]').click(); cy.get('[data-cy="rightActions-cell-2"]') .eq(0) @@ -291,6 +295,9 @@ describe("Table", () => { ); cy.get('[data-cy="add-event-handler"]').eq(1).click(); + cy.waitForAutoSave(); + openEditorSidebar(data.widgetName); + cy.get('[data-cy="pages-name-fakename1"]').click(); cy.get('[data-cy="leftActions-cell-0"]').eq(0).find("button").click(); cy.verifyToastMessage(commonSelectors.toastMessage, "Hello world!"); openEditorSidebar(data.widgetName); @@ -1098,7 +1105,7 @@ describe("Table", () => { verifyNodeData(tableText.defaultWidgetName, "Object", "22 entries "); cy.wait(1000); openNode(tableText.defaultWidgetName, 0, 1); - openNode(tableText.defaultWidgetName, 0, 1); + // openNode(tableText.defaultWidgetName, 0, 1); verifyNodeData("newRows", "Array", "1 item "); openNode("newRows"); verifyNodeData("0", "Object", "3 entries "); diff --git a/cypress-tests/cypress/support/utils/button.js b/cypress-tests/cypress/support/utils/button.js index 1ed2ed70e2..2662b7a839 100644 --- a/cypress-tests/cypress/support/utils/button.js +++ b/cypress-tests/cypress/support/utils/button.js @@ -22,7 +22,12 @@ export const verifyControlComponentAction = (widgetName, value) => { cy.get(commonWidgetSelector.componentTextInput) .find('[data-cy*="-input-field"]') .clearAndTypeOnCodeMirror(value); + cy.forceClickOnCanvas(); + cy.waitForAutoSave(); cy.get(commonWidgetSelector.draggableWidget(widgetName)).click(); - cy.get(commonWidgetSelector.draggableWidget('textinput1')).should("have.value", value); + cy.get(commonWidgetSelector.draggableWidget("textinput1")).should( + "have.value", + value + ); };