From 36bc9d314234c882bbd941fb0836f57d2ad81838 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 6 Oct 2022 15:57:49 +0530 Subject: [PATCH 1/3] test: flaky Cypress test --- cypress/integration/workspace_blocks.js | 5 ++--- cypress/support/commands.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cypress/integration/workspace_blocks.js b/cypress/integration/workspace_blocks.js index 47c5424bce..7ca6ec5e0c 100644 --- a/cypress/integration/workspace_blocks.js +++ b/cypress/integration/workspace_blocks.js @@ -71,15 +71,13 @@ context("Workspace Blocks", () => { url: "api/method/frappe.desk.form.load.getdoctype?**", }).as("get_doctype"); - cy.visit("/app/tools"); cy.get(".codex-editor__redactor .ce-block"); cy.get(".standard-actions .btn-secondary[data-label=Edit]").click(); // test quick list creation cy.get(".ce-block").first().click({ force: true }).type("{enter}"); cy.get(".block-list-container .block-list-item").contains("Quick List").click(); - - cy.get_open_dialog().find(".modal-header").click(); + cy.wait(300); cy.fill_field("document_type", "ToDo", "Link").blur(); cy.fill_field("label", "ToDo", "Data").blur(); @@ -122,6 +120,7 @@ context("Workspace Blocks", () => { cy.get_open_dialog() .find(".filter-field .input-with-feedback") + .focus() .type("{selectall}Approved"); cy.get_open_dialog().find(".modal-header").click(); cy.get_open_dialog().find(".btn-primary").click(); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index a51e1daf17..20de7508c0 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -285,7 +285,7 @@ Cypress.Commands.add("get_open_dialog", () => { Cypress.Commands.add("save", () => { cy.intercept("/api/method/frappe.desk.form.save.savedocs").as("save_call"); - cy.get(`button[data-label="Save"]:visible`).click({ scrollBehavior: false, force: true }); + cy.get(`button[data-label="Save"]:visible`).click({ scrollBehavior: "top", force: true }); cy.wait("@save_call"); }); Cypress.Commands.add("hide_dialog", () => { From 930f8c34ed156fa291174d02dafe8cc065202295 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 6 Oct 2022 16:52:39 +0530 Subject: [PATCH 2/3] test: minor change --- cypress/integration/workspace_blocks.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cypress/integration/workspace_blocks.js b/cypress/integration/workspace_blocks.js index 7ca6ec5e0c..2db646f38e 100644 --- a/cypress/integration/workspace_blocks.js +++ b/cypress/integration/workspace_blocks.js @@ -77,10 +77,9 @@ context("Workspace Blocks", () => { // test quick list creation cy.get(".ce-block").first().click({ force: true }).type("{enter}"); cy.get(".block-list-container .block-list-item").contains("Quick List").click(); - cy.wait(300); + cy.fill_field("label", "ToDo", "Data"); cy.fill_field("document_type", "ToDo", "Link").blur(); - cy.fill_field("label", "ToDo", "Data").blur(); cy.wait("@get_doctype"); cy.get_open_dialog().find(".filter-edit-area").should("contain", "No filters selected"); From 458757708fad0dde6630baf770efeb39b09b2d6e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 6 Oct 2022 18:05:24 +0530 Subject: [PATCH 3/3] test: minor change --- cypress/integration/dashboard_links.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/dashboard_links.js b/cypress/integration/dashboard_links.js index 061899ec95..ebcdfa0048 100644 --- a/cypress/integration/dashboard_links.js +++ b/cypress/integration/dashboard_links.js @@ -17,7 +17,7 @@ context("Dashboard links", () => { .window() .its("frappe") .then((frappe) => { - return frappe.xcall("frappe.tests.ui_test_helpers.update_child_table", { + frappe.call("frappe.tests.ui_test_helpers.update_child_table", { name: child_table_doctype_name, }); });