From e5c4b5ec2fe2bc102371541fc6bcfafb1ffdcbfd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 11 Aug 2022 11:45:45 +0200 Subject: [PATCH] Bug 32030: Add some cypress tests Signed-off-by: Jonathan Field Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- cypress/integration/Agreements_spec.ts | 42 +++++++++- cypress/integration/Packages_spec.ts | 104 +++++++++++++++++++------ 2 files changed, 123 insertions(+), 23 deletions(-) diff --git a/cypress/integration/Agreements_spec.ts b/cypress/integration/Agreements_spec.ts index 928b201a0b..cad4a96f79 100644 --- a/cypress/integration/Agreements_spec.ts +++ b/cypress/integration/Agreements_spec.ts @@ -82,6 +82,16 @@ describe("Agreement CRUD operations", () => { }); it("Add agreement", () => { + // No agreement, no license yet + cy.intercept("GET", "/api/v1/erm/agreements", { + statusCode: 200, + body: [], + }); + cy.intercept("GET", "/api/v1/erm/licenses", { + statusCode: 200, + body: [], + }); + // Click the button in the toolbar cy.visit("/cgi-bin/koha/erm/agreements"); cy.contains("New agreement").click(); @@ -102,7 +112,10 @@ describe("Agreement CRUD operations", () => { "have.length", 1 ); // name, description, status - cy.get("#agreement_status .vs__search").type(agreement.status + '{enter}',{force:true}); + cy.get("#agreement_status .vs__search").type( + agreement.status + "{enter}", + { force: true } + ); cy.contains("Add new period").click(); cy.get("#agreements_add").contains("Submit").click(); @@ -165,6 +178,16 @@ describe("Agreement CRUD operations", () => { //cy.contains("Add new user").click(); //cy.contains("Select user").click(); + cy.get("#agreement_licenses").contains( + "There are no licenses created yet." + ); + cy.get("#agreement_relationships").contains( + "There are no other agreements created yet." + ); + + cy.get("#agreement_documents").contains("Add new document"); + // TODO Test document upload + // Submit the form, get 500 cy.intercept("POST", "/api/v1/erm/agreements", { statusCode: 500, @@ -184,6 +207,23 @@ describe("Agreement CRUD operations", () => { cy.get("main div[class='dialog message']").contains( "Agreement created" ); + + cy.intercept("GET", "/api/v1/erm/agreements", { + statusCode: 200, + body: [{ agreement_id: 1, description: "an existing agreement" }], + }); + cy.intercept("GET", "/api/v1/erm/licenses", { + statusCode: 200, + body: [{ license_id: 1, description: "a license" }], + }); + cy.visit("/cgi-bin/koha/erm/agreements/add"); + cy.get("#agreement_licenses").contains( + "Add new license" + ); + cy.get("#agreement_relationships").contains( + "Add new related agreement" + ); + }); it("Edit agreement", () => { diff --git a/cypress/integration/Packages_spec.ts b/cypress/integration/Packages_spec.ts index 55b68138ff..38389dfcfa 100644 --- a/cypress/integration/Packages_spec.ts +++ b/cypress/integration/Packages_spec.ts @@ -9,6 +9,7 @@ function get_package() { package_type: "complete", content_type: "Print", package_agreements: [], + resources_count: 0, }; } @@ -47,7 +48,11 @@ describe("Package CRUD operations", () => { "X-Total-Count": "1", }, }); - cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", erm_package); + cy.intercept( + "GET", + "/api/v1/erm/eholdings/local/packages/*", + erm_package + ); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); cy.get("#packages_list").contains("Showing 1 to 1 of 1 entries"); }); @@ -67,8 +72,18 @@ describe("Package CRUD operations", () => { 1 ); cy.get("#package_name").type(erm_package.name); - cy.get("#package_type .vs__search").type(erm_package.package_type + '{enter}',{force:true}); - cy.get("#package_content_type .vs__search").type(erm_package.content_type + '{enter}',{force:true}); + cy.get("#package_type .vs__search").type( + erm_package.package_type + "{enter}", + { force: true } + ); + cy.get("#package_content_type .vs__search").type( + erm_package.content_type + "{enter}", + { force: true } + ); + + cy.get("#package_agreements").contains( + "There are no agreements created yet." + ); // Submit the form, get 500 cy.intercept("POST", "/api/v1/erm/eholdings/local/packages", { @@ -86,9 +101,15 @@ describe("Package CRUD operations", () => { body: erm_package, }); cy.get("#packages_add").contains("Submit").click(); - cy.get("main div[class='dialog message']").contains( - "Package created" - ); + cy.get("main div[class='dialog message']").contains("Package created"); + + // Link with an agreement + cy.intercept("GET", "/api/v1/erm/agreements", { + statusCode: 200, + body: [{ package_id: 1, description: "an agreement" }], + }); + cy.visit("/cgi-bin/koha/erm/eholdings/local/packages/add"); + cy.get("#package_agreements").contains("Add new agreement"); }); it("Edit package", () => { @@ -103,13 +124,13 @@ describe("Package CRUD operations", () => { "X-Total-Count": "1", }, }); - cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", erm_package).as( - "get-package" - ); + cy.intercept( + "GET", + "/api/v1/erm/eholdings/local/packages/*", + erm_package + ).as("get-package"); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); - cy.get("#packages_list table tbody tr:first") - .contains("Edit") - .click(); + cy.get("#packages_list table tbody tr:first").contains("Edit").click(); cy.wait("@get-package"); cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet! cy.get("#packages_add h2").contains("Edit package"); @@ -135,9 +156,7 @@ describe("Package CRUD operations", () => { body: erm_package, }); cy.get("#packages_add").contains("Submit").click(); - cy.get("main div[class='dialog message']").contains( - "Package updated" - ); + cy.get("main div[class='dialog message']").contains("Package updated"); }); it("Show package", () => { @@ -152,9 +171,11 @@ describe("Package CRUD operations", () => { "X-Total-Count": "1", }, }); - cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", erm_package).as( - "get-package" - ); + cy.intercept( + "GET", + "/api/v1/erm/eholdings/local/packages/*", + erm_package + ).as("get-package"); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); let name_link = cy.get( "#packages_list table tbody tr:first td:first a" @@ -169,6 +190,43 @@ describe("Package CRUD operations", () => { cy.get("#packages_show h2").contains( "Package #" + erm_package.package_id ); + // There are no resources, the table should not be displayed + cy.contains("Titles (0)"); + cy.get("#table#title_list").should("not.exist"); + + // List resources + cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", { + ...erm_package, + resources_count: 1, + }); + cy.intercept( + "GET", + "/api/v1/erm/eholdings/local/packages/1/resources*", + { + statusCode: 200, + body: [ + { + package_id: erm_package.package_id, + resource_id: 1, + title_id: 1, + title: { + biblio_id: 42, + publication_title: "A great title", + publication_type: "", + }, + }, + ], + headers: { + "X-Base-Total-Count": "1", + "X-Total-Count": "1", + }, + } + ).as("get-resource"); + cy.visit("/cgi-bin/koha/erm/eholdings/local/packages/1"); + cy.contains("Titles (1)"); + cy.wait("@get-resource"); + cy.wait(500); + cy.get("table#title_list").contains("A great title"); }); it("Delete package", () => { @@ -184,7 +242,11 @@ describe("Package CRUD operations", () => { "X-Total-Count": "1", }, }); - cy.intercept("GET", "/api/v1/erm/eholdings/local/packages/*", erm_package); + cy.intercept( + "GET", + "/api/v1/erm/eholdings/local/packages/*", + erm_package + ); cy.visit("/cgi-bin/koha/erm/eholdings/local/packages"); cy.get("#packages_list table tbody tr:first") @@ -209,8 +271,6 @@ describe("Package CRUD operations", () => { body: null, }); cy.contains("Yes, delete").click(); - cy.get("main div[class='dialog message']").contains( - "Package deleted" - ); + cy.get("main div[class='dialog message']").contains("Package deleted"); }); }); -- 2.39.5