Bug 32898: Fix Cypress tests

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/t/cypress/integration/Agreements_spec.ts b/t/cypress/integration/Agreements_spec.ts
index 5404625..632fc25 100644 (file)
--- a/t/cypress/integration/Agreements_spec.ts
+++ b/t/cypress/integration/Agreements_spec.ts
@@ -133,7 +133,7 @@ describe("Agreement CRUD operations", () => {
 
     it("List agreements", () => {
         // GET agreements returns 500
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 500,
             error: "Something went wrong",
         });
@@ -167,11 +167,11 @@ describe("Agreement CRUD operations", () => {
 
     it("Add agreement", () => {
         // No agreement, no license yet
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: [],
         });
-        cy.intercept("GET", "/api/v1/erm/licenses", {
+        cy.intercept("GET", "/api/v1/erm/licenses*", {
             statusCode: 200,
             body: [],
         });
@@ -299,7 +299,7 @@ describe("Agreement CRUD operations", () => {
             "Agreement created"
         );
 
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: [{ agreement_id: 1, description: "an existing agreement" }],
         });
@@ -307,7 +307,7 @@ describe("Agreement CRUD operations", () => {
         // Add new license
         let licenses_to_relate = get_licenses_to_relate();
         let related_license = agreement.agreement_licenses[0];
-        cy.intercept("GET", "/api/v1/erm/licenses", {
+        cy.intercept("GET", "/api/v1/erm/licenses*", {
             statusCode: 200,
             body: licenses_to_relate,
         });
@@ -331,7 +331,7 @@ describe("Agreement CRUD operations", () => {
 
         // Add new related agreement
         let related_agreement = agreement.agreement_relationships[0];
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: cy.get_agreements_to_relate(),
         });
@@ -358,7 +358,7 @@ describe("Agreement CRUD operations", () => {
         cy.intercept(
             {
                 method: "GET",
-                url: "/api/v1/erm/agreements",
+                url: "/api/v1/erm/agreements*",
                 times: 1
             },
             {
@@ -382,12 +382,12 @@ describe("Agreement CRUD operations", () => {
             "get-agreement"
         );
         // Intercept related licenses request after entering agreement edit
-        cy.intercept("GET", "/api/v1/erm/licenses", {
+        cy.intercept("GET", "/api/v1/erm/licenses*", {
             statusCode: 200,
             body: licenses_to_relate,
         }).as("get-related-licenses");
         // Intercept related agreements request after entering agreement edit
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: cy.get_agreements_to_relate(),
         }).as("get-related-agreements");

diff --git a/t/cypress/integration/Licenses_spec.ts b/t/cypress/integration/Licenses_spec.ts
index 91599b2..3a88d03 100644 (file)
--- a/t/cypress/integration/Licenses_spec.ts
+++ b/t/cypress/integration/Licenses_spec.ts
@@ -49,7 +49,7 @@ describe("License CRUD operations", () => {
 
     it("List license", () => {
         // GET license returns 500
-        cy.intercept("GET", "/api/v1/erm/licenses", {
+        cy.intercept("GET", "/api/v1/erm/licenses*", {
             statusCode: 500,
             error: "Something went wrong",
         });

diff --git a/t/cypress/integration/Packages_spec.ts b/t/cypress/integration/Packages_spec.ts
index 20de7ee..ee508f3 100644 (file)
--- a/t/cypress/integration/Packages_spec.ts
+++ b/t/cypress/integration/Packages_spec.ts
@@ -40,7 +40,7 @@ describe("Package CRUD operations", () => {
 
     it("List package", () => {
         // GET package returns 500
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
             statusCode: 500,
             error: "Something went wrong",
         });
@@ -78,7 +78,7 @@ describe("Package CRUD operations", () => {
 
     it("Add package", () => {
 
-        cy.intercept("GET", "/api/v1/erm/agreements", []);
+        cy.intercept("GET", "/api/v1/erm/agreements*", []);
 
         // Click the button in the toolbar
         cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
@@ -127,7 +127,7 @@ describe("Package CRUD operations", () => {
 
         // Add new related agreement
         let related_agreement = erm_package.package_agreements[0];
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: cy.get_agreements_to_relate(),
         });
@@ -159,7 +159,7 @@ describe("Package CRUD operations", () => {
         ).as("get-package");
         cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
         // Intercept related agreements request after entering agreement edit
-        cy.intercept("GET", "/api/v1/erm/agreements", {
+        cy.intercept("GET", "/api/v1/erm/agreements*", {
             statusCode: 200,
             body: cy.get_agreements_to_relate(),
         }).as("get-related-agreements");

diff --git a/t/cypress/integration/Titles_spec.ts b/t/cypress/integration/Titles_spec.ts
index dfdde44..88b5bb1 100644 (file)
--- a/t/cypress/integration/Titles_spec.ts
+++ b/t/cypress/integration/Titles_spec.ts
@@ -92,7 +92,7 @@ describe("Title CRUD operations", () => {
         cy.contains("Save").click();
 
         // First attempt to import list has no packages
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
             statusCode: 200,
             body: []
         }).as("get-empty-packages");
@@ -103,7 +103,7 @@ describe("Title CRUD operations", () => {
         cy.get("#package_list .vs__selected").should('not.exist');
 
         // Make sure packages are returned
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
             statusCode: 200,
             body: get_packages_to_relate(),
         }).as("get-related-packages");
@@ -123,7 +123,7 @@ describe("Title CRUD operations", () => {
 
     it("List title", () => {
         // GET title returns 500
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/titles", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/titles*", {
             statusCode: 500,
             error: "Something went wrong",
         });
@@ -163,7 +163,7 @@ describe("Title CRUD operations", () => {
 
         cy.intercept({
             method: "GET",
-            url: "/api/v1/erm/eholdings/local/packages",
+            url: "/api/v1/erm/eholdings/local/packages*",
             times: 1
         },
         {
@@ -236,7 +236,7 @@ describe("Title CRUD operations", () => {
 
         // Add new related package (resource)
         let related_package = erm_title.resources[0];
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
             statusCode: 200,
             body: get_packages_to_relate(),
         }).as('get-related-packages');
@@ -268,7 +268,7 @@ describe("Title CRUD operations", () => {
         ).as("get-title");
         cy.visit("/cgi-bin/koha/erm/eholdings/local/titles");
         // Intercept related packages request after entering title edit
-        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
+        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
             statusCode: 200,
             body: get_packages_to_relate(),
         }).as('get-related-packages');