From 4edf8e5b7a3fa6701ecde1700b0acd878b70986b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Sep 2025 12:19:41 +0200 Subject: [PATCH] Bug 38201: Remove DT warnings from Cypress tests (cherry picked from commit b2a779e12f3ae23e10cba6177f248e12263306f8) Signed-off-by: Jonathan Druart Signed-off-by: Lucas Gass --- t/cypress/integration/ERM/Dialog_spec.ts | 8 +++++--- t/cypress/integration/ERM/Packages_spec.ts | 11 ++++------- t/cypress/integration/Preservation/Trains.ts | 15 ++++++++++++++- .../integration/Preservation/WaitingList.ts | 17 ++++++++++++++++- t/cypress/support/e2e.js | 1 + 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/t/cypress/integration/ERM/Dialog_spec.ts b/t/cypress/integration/ERM/Dialog_spec.ts index ce0235be7ca..71d4829b6b0 100644 --- a/t/cypress/integration/ERM/Dialog_spec.ts +++ b/t/cypress/integration/ERM/Dialog_spec.ts @@ -17,6 +17,7 @@ function get_package() { package_id: 1, }, ], + notes: "", resources_count: 0, }; } @@ -100,12 +101,13 @@ describe("Dialog operations", () => { "X-Base-Total-Count": "1", "X-Total-Count": "1", }, - }); + }).as("get-packages"); cy.get("#packages_add").contains("Submit").click(); + cy.wait("@get-packages"); + cy.get("#packages_list").should("exist"); cy.get("main div[class='alert alert-info']").contains( "Package created" ); - cy.get("#packages_list").should("exist"); cy.get("main div[class='alert alert-info']").should("have.length", 1); cy.intercept("GET", "/api/v1/erm/eholdings/local/titles*", { @@ -115,7 +117,7 @@ describe("Dialog operations", () => { "X-Base-Total-Count": "1", "X-Total-Count": "1", }, - }); + }).as("get-titles"); cy.get(".sidebar_menu").contains("Titles").click(); // Info messages should be cleared when view is changed cy.get("main div[class='alert alert-info']").should("not.exist"); diff --git a/t/cypress/integration/ERM/Packages_spec.ts b/t/cypress/integration/ERM/Packages_spec.ts index d912755679a..56d9870c535 100644 --- a/t/cypress/integration/ERM/Packages_spec.ts +++ b/t/cypress/integration/ERM/Packages_spec.ts @@ -32,8 +32,9 @@ describe("Package CRUD operations", () => { "X-Base-Total-Count": "0", "X-Total-Count": "0", }, - }); + }).as("get-packages"); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); + cy.wait("@get-packages"); cy.get("#packages_list").contains("There are no packages defined"); // GET packages returns something @@ -47,13 +48,9 @@ describe("Package CRUD operations", () => { "X-Base-Total-Count": "1", "X-Total-Count": "1", }, - }); - cy.intercept( - "GET", - "/api/v1/erm/eholdings/local/packages/*", - erm_package - ); + }).as("get-packages"); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); + cy.wait("@get-packages"); cy.get("#packages_list").contains("Showing 1 to 1 of 1 entries"); }); diff --git a/t/cypress/integration/Preservation/Trains.ts b/t/cypress/integration/Preservation/Trains.ts index 9b2834d210e..727f3de9bc3 100644 --- a/t/cypress/integration/Preservation/Trains.ts +++ b/t/cypress/integration/Preservation/Trains.ts @@ -68,25 +68,31 @@ function get_items() { biblio: { biblio_id: 1, title: "a biblio title", + author: "an author", }, external_id: "bc_1", item_id: 1, + callnumber: "cn_1", }, { biblio: { biblio_id: 2, title: "an other biblio title", + author: "another author", }, external_id: "bc_2", item_id: 2, + callnumber: "cn_2", }, { biblio: { biblio_id: 3, title: "yet an other biblio title", + author: "yet another author", }, external_id: "bc_3", item_id: 3, + callnumber: "cn_3", }, ]; } @@ -128,6 +134,8 @@ function get_train_items() { train_item_1.processing_id = 1; train_item_1.processing = get_processings()[0]; train_item_1.item_id = 1; + train_item_1.train_item_id = 1; + train_item_1.user_train_item_id = 1; let train_item_2 = get_items()[1]; let processing_attributes = get_attributes(); @@ -158,6 +166,8 @@ function get_train_items() { train_item_2.processing_id = 1; train_item_2.processing = get_processings()[0]; train_item_2.item_id = 2; + train_item_2.train_item_id = 2; + train_item_2.user_train_item_id = 2; let train_item_3 = get_items()[0]; let processing_attributes = get_other_attributes(); @@ -181,6 +191,8 @@ function get_train_items() { train_item_3.processing_id = 2; train_item_3.processing = get_processings()[1]; train_item_3.item_id = 3; + train_item_3.train_item_id = 3; + train_item_3.user_train_item_id = 3; return [train_item_1, train_item_2, train_item_3]; } @@ -568,8 +580,9 @@ describe("Trains", () => { "GET", "/api/v1/preservation/trains/" + train.train_id, train_with_one_item - ); + ).as("get-train"); cy.contains("Submit").click(); + cy.wait("@get-train"); cy.get("#trains_show").contains("Showing 1 to 1 of 1 entries"); let train_with_2_items = Object.assign({}, train); diff --git a/t/cypress/integration/Preservation/WaitingList.ts b/t/cypress/integration/Preservation/WaitingList.ts index 9c55e80a5aa..961ae83bc96 100644 --- a/t/cypress/integration/Preservation/WaitingList.ts +++ b/t/cypress/integration/Preservation/WaitingList.ts @@ -7,20 +7,35 @@ function get_items() { biblio: { biblio_id: 1, title: "a biblio title", + author: "an author", }, external_id: "bc_1", item_id: 1, + callnumber: "cn_1", }, { biblio: { biblio_id: 2, - title: "yet another biblio title", + title: "an other biblio title", + author: "another author", + }, + external_id: "bc_2", + item_id: 2, + callnumber: "cn_2", + }, + { + biblio: { + biblio_id: 3, + title: "yet an other biblio title", + author: "yet another author", }, external_id: "bc_3", item_id: 3, + callnumber: "cn_3", }, ]; } + let config = { permissions: { manage_sysprefs: "1" }, settings: { diff --git a/t/cypress/support/e2e.js b/t/cypress/support/e2e.js index cde77420fa1..d2efe54732c 100644 --- a/t/cypress/support/e2e.js +++ b/t/cypress/support/e2e.js @@ -337,6 +337,7 @@ cy.get_package = () => { name: "package 1", package_type: "complete", content_type: "Print", + notes: "", package_agreements: [ { agreement: { -- 2.51.0