From 72b73e0a5b34aa5f4e847f84f45c1cffd6c0b1da Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 11 May 2022 17:11:50 +0200
Subject: [PATCH] Bug 32030: Fix tests

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 cypress/integration/Agreements_spec.ts        | 116 +++++++++++-------
 .../vue/components/ERM/AgreementLicenses.vue  |   5 +-
 .../vue/components/ERM/AgreementsFormAdd.vue  |   2 +-
 .../ERM/AgreementsFormConfirmDelete.vue       |   2 +-
 .../js/vue/components/ERM/AgreementsList.vue  |   4 +-
 .../js/vue/components/ERM/AgreementsShow.vue  |   2 +-
 .../js/vue/components/ERM/LicensesFormAdd.vue |   2 +-
 .../ERM/LicensesFormConfirmDelete.vue         |   2 +-
 .../js/vue/components/ERM/LicensesList.vue    |   2 +-
 .../js/vue/components/ERM/LicensesShow.vue    |   2 +-
 koha-tmpl/intranet-tmpl/prog/js/vue/routes.js |   1 +
 .../intranet-tmpl/prog/js/vue/stores/main.js  |   2 +-
 t/db_dependent/api/v1/erm_agreements.t        |  10 +-
 13 files changed, 98 insertions(+), 54 deletions(-)

diff --git a/cypress/integration/Agreements_spec.ts b/cypress/integration/Agreements_spec.ts
index c50a5f9103..0a6c030d16 100644
--- a/cypress/integration/Agreements_spec.ts
+++ b/cypress/integration/Agreements_spec.ts
@@ -34,6 +34,7 @@ function get_agreement() {
             },
         ],
         user_roles: [],
+        agreement_licenses: [],
     };
 }
 
@@ -45,17 +46,20 @@ 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",
         });
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
-        cy.get("#agreements").contains("Something went wrong");
+        cy.visit("/cgi-bin/koha/erm/erm.pl");
+        cy.get("#navmenulist").contains("Agreements").click();
+        cy.get("main div[class='dialog alert']").contains(
+            /Something went wrong/
+        );
 
         // GET agreements returns empty list
         cy.intercept("GET", "/api/v1/erm/agreements*", []);
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
-        cy.get("#agreements").contains("There are no agreements defined.");
+        cy.visit("/cgi-bin/koha/erm/agreements");
+        cy.get("#agreements_list").contains("There are no agreements defined.");
 
         // GET agreements returns something
         let agreement = get_agreement();
@@ -70,30 +74,39 @@ describe("Agreement CRUD operations", () => {
             },
         });
         cy.intercept("GET", "/api/v1/erm/agreements/*", agreement);
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
-        cy.get("#agreements").contains("Showing 1 to 1 of 1 entries");
+        cy.visit("/cgi-bin/koha/erm/agreements");
+        cy.get("#agreements_list").contains("Showing 1 to 1 of 1 entries");
     });
 
-    it ("Add agreement", () => {
+    it("Add agreement", () => {
         // Click the button in the toolbar
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
+        cy.visit("/cgi-bin/koha/erm/agreements");
         cy.contains("New agreement").click();
-        cy.get("#agreements h2").contains("New agreement");
+        cy.get("#agreements_add h2").contains("New agreement");
 
         // Fill in the form for normal attributes
         let agreement = get_agreement();
 
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("input:invalid,textarea:invalid,select:invalid").should("have.length", 3);
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("input:invalid,textarea:invalid,select:invalid").should(
+            "have.length",
+            3
+        );
         cy.get("#agreement_name").type(agreement.name);
         cy.get("#agreement_description").type(agreement.description);
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("input:invalid,textarea:invalid,select:invalid").should("have.length", 1); // name, description, status
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("input:invalid,textarea:invalid,select:invalid").should(
+            "have.length",
+            1
+        ); // name, description, status
         cy.get("#agreement_status").select(agreement.status);
 
         cy.contains("Add new period").click();
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("input:invalid,textarea:invalid,select:invalid").should("have.length", 1); // Start date
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("input:invalid,textarea:invalid,select:invalid").should(
+            "have.length",
+            1
+        ); // Start date
 
         // Add new periods
         cy.contains("Add new period").click();
@@ -154,8 +167,8 @@ describe("Agreement CRUD operations", () => {
             statusCode: 500,
             error: "Something went wrong",
         });
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("#agreements").contains(
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Internal Server Error"
         );
 
@@ -164,11 +177,13 @@ describe("Agreement CRUD operations", () => {
             statusCode: 201,
             body: agreement,
         });
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("#agreements").contains("Agreement created");
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("main div[class='dialog message']").contains(
+            "Agreement created"
+        );
     });
 
-    it ("Edit agreement", () => {
+    it("Edit agreement", () => {
         let agreement = get_agreement();
         let agreements = [agreement];
         // Click the 'Edit' button from the list
@@ -180,12 +195,16 @@ describe("Agreement CRUD operations", () => {
                 "X-Total-Count": "1",
             },
         });
-        cy.intercept("GET", "/api/v1/erm/agreements/*", agreement).as("get-agreement");
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
-        cy.get("#agreements table tbody tr:first").contains("Edit").click();
+        cy.intercept("GET", "/api/v1/erm/agreements/*", agreement).as(
+            "get-agreement"
+        );
+        cy.visit("/cgi-bin/koha/erm/agreements");
+        cy.get("#agreements_list table tbody tr:first")
+            .contains("Edit")
+            .click();
         cy.wait("@get-agreement");
         cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#agreements h2").contains("Edit agreement");
+        cy.get("#agreements_add h2").contains("Edit agreement");
 
         // Form has been correctly filled in
         cy.get("#agreement_name").should("have.value", agreements[0].name);
@@ -211,8 +230,8 @@ describe("Agreement CRUD operations", () => {
             statusCode: 500,
             error: "Something went wrong",
         });
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("#agreements").contains(
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Internal Server Error"
         );
 
@@ -221,11 +240,13 @@ describe("Agreement CRUD operations", () => {
             statusCode: 200,
             body: agreement,
         });
-        cy.get("#agreements").contains("Submit").click();
-        cy.get("#agreements").contains("Agreement updated");
+        cy.get("#agreements_add").contains("Submit").click();
+        cy.get("main div[class='dialog message']").contains(
+            "Agreement updated"
+        );
     });
 
-    it ("Show agreement", () => {
+    it("Show agreement", () => {
         let agreement = get_agreement();
         let agreements = [agreement];
         // Click the "name" link from the list
@@ -237,14 +258,23 @@ describe("Agreement CRUD operations", () => {
                 "X-Total-Count": "1",
             },
         });
-        cy.intercept("GET", "/api/v1/erm/agreements/*", agreement).as("get-agreement");
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
-        let name_link = cy.get("#agreements table tbody tr:first td:first a");
-        name_link.should("have.text", agreement.name + " (#" + agreement.agreement_id + ")");
+        cy.intercept("GET", "/api/v1/erm/agreements/*", agreement).as(
+            "get-agreement"
+        );
+        cy.visit("/cgi-bin/koha/erm/agreements");
+        let name_link = cy.get(
+            "#agreements_list table tbody tr:first td:first a"
+        );
+        name_link.should(
+            "have.text",
+            agreement.name + " (#" + agreement.agreement_id + ")"
+        );
         name_link.click();
         cy.wait("@get-agreement");
         cy.wait(500); // Cypress is too fast! Vue hasn't populated the form yet!
-        cy.get("#agreements h2").contains("Agreement #" + agreement.agreement_id);
+        cy.get("#agreements_show h2").contains(
+            "Agreement #" + agreement.agreement_id
+        );
 
         // TODO There are more to test here:
         // Dates correctly formatted
@@ -252,7 +282,7 @@ describe("Agreement CRUD operations", () => {
         // AV's libs displayed
         // Tables for periods and users
     });
-    it ("Delete agreement", () => {
+    it("Delete agreement", () => {
         let agreement = get_agreement();
         let agreements = [agreement];
 
@@ -266,10 +296,12 @@ describe("Agreement CRUD operations", () => {
             },
         });
         cy.intercept("GET", "/api/v1/erm/agreements/*", agreement);
-        cy.visit("/cgi-bin/koha/erm/agreements.pl");
+        cy.visit("/cgi-bin/koha/erm/agreements");
 
-        cy.get("#agreements table tbody tr:first").contains("Delete").click();
-        cy.get("#agreements h2").contains("Delete agreement");
+        cy.get("#agreements_list table tbody tr:first")
+            .contains("Delete")
+            .click();
+        cy.get("#agreements_confirm_delete h2").contains("Delete agreement");
         cy.contains("Agreement name: " + agreement.name);
 
         // Submit the form, get 500
@@ -278,7 +310,7 @@ describe("Agreement CRUD operations", () => {
             error: "Something went wrong",
         });
         cy.contains("Yes, delete").click();
-        cy.get("#agreements").contains(
+        cy.get("main div[class='dialog alert']").contains(
             "Something went wrong: Internal Server Error"
         );
 
@@ -288,6 +320,8 @@ describe("Agreement CRUD operations", () => {
             body: null,
         });
         cy.contains("Yes, delete").click();
-        cy.get("#agreements").contains("Agreement deleted");
+        cy.get("main div[class='dialog message']").contains(
+            "Agreement deleted"
+        );
     });
 });
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue
index b59838f01d..580bf9baee 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementLicenses.vue
@@ -2,6 +2,7 @@
     <fieldset class="rows" id="agreement_licenses">
         <legend>Licenses</legend>
         <fieldset
+            :id="`agreement_license_${counter}`"
             class="rows"
             v-for="(agreement_license, counter) in agreement_licenses"
             v-bind:key="counter"
@@ -115,8 +116,8 @@ export default {
         av_agreement_license_location: Array,
         agreement_licenses: Array,
     },
-    beforeCreate(){
-        fetchLicenses().then((licenses) => this.licenses = licenses )
+    beforeCreate() {
+        fetchLicenses().then((licenses) => this.licenses = licenses)
     },
     methods: {
         addLicense() {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index 4733576c2b..4c012c824f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="agreements_add">
         <h2 v-if="agreement.agreement_id">
             Edit agreement #{{ agreement.agreement_id }}
         </h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue
index 160683a6e8..01c1ab39b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormConfirmDelete.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="agreements_confirm_delete">
         <h2>Delete agreement</h2>
         <div>
             <form @submit="onSubmit($event)">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
index c195444d26..c97ba17f9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else-if="this.agreements" id="agreements_list">
         <Toolbar />
-        <table v-if="agreements.length" id="agreement_list"></table>
+        <table v-if="this.agreements.length" id="agreement_list"></table>
         <div v-else-if="this.initialized" class="dialog message">
             There are no agreements defined.
         </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
index 7e751a5d5f..cc8336c4eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="agreements_show">
         <h2>Agreement #{{ agreement.agreement_id }}</h2>
         <div>
             <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
index 880e4847bd..90920194a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="licenses_add">
         <h2 v-if="license.license_id">
             Edit license #{{ license.license_id }}
         </h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue
index 091d79ad39..cd318f7454 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="licenses_confirm_delete">
         <h2>Delete license</h2>
         <div>
             <form @submit="onSubmit($event)">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
index 85ca7f359d..cc3ad05703 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else-if="this.licenses" id="licenses_list">
         <Toolbar />
         <table v-if="licenses.length" id="license_list"></table>
         <div v-else-if="this.initialized" class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
index 23a95b8bf3..35c9ab5193 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="!this.initialized">Loading...</div>
-    <div v-else>
+    <div v-else id="licenses_show">
         <h2>License #{{ license.license_id }}</h2>
         <div>
             <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
index af5a56ed98..b3fe613a62 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes.js
@@ -18,6 +18,7 @@ const breadcrumbs = {
     licenses: { text: "Licenses", path: "/cgi-bin/koha/erm/licenses" },
 };
 export const routes = [
+    { path: "/cgi-bin/koha/mainpage.pl" },
     {
         path: "/cgi-bin/koha/erm/erm.pl",
         component: ERMHome,
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
index d52622c402..f21d957ba6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js
@@ -15,7 +15,7 @@ export const useMainStore = defineStore("main", {
             this.displayed_already = false;
         },
         setError(error) {
-            this.error = "Something went wrong: " + error;
+            this.error = error;
             this.message = null;
             this.displayed_already = false;
         },
diff --git a/t/db_dependent/api/v1/erm_agreements.t b/t/db_dependent/api/v1/erm_agreements.t
index 99f4c34e4d..8456b726d6 100755
--- a/t/db_dependent/api/v1/erm_agreements.t
+++ b/t/db_dependent/api/v1/erm_agreements.t
@@ -110,7 +110,7 @@ subtest 'list() tests' => sub {
 
 subtest 'get() tests' => sub {
 
-    plan tests => 8;
+    plan tests => 14;
 
     $schema->storage->txn_begin;
 
@@ -140,6 +140,14 @@ subtest 'get() tests' => sub {
           . $agreement->agreement_id )->status_is(200)
       ->json_is( $agreement->to_api );
 
+    $t->get_ok( "//$userid:$password@/api/v1/erm/agreements/"
+          . $agreement->agreement_id  => {'x-koha-embed' => 'periods,user_roles,agreement_licenses'} )->status_is(200)
+      ->json_is( { %{ $agreement->to_api }, periods => [], user_roles => [], agreement_licenses => [] });
+
+    $t->get_ok( "//$userid:$password@/api/v1/erm/agreements/"
+          . $agreement->agreement_id  => {'x-koha-embed' => 'periods,user_roles,user_roles.patron,agreement_licenses,agreement_licenses.license'} )->status_is(200)
+      ->json_is( { %{ $agreement->to_api }, periods => [], user_roles => [], agreement_licenses => [] });
+
     $t->get_ok( "//$unauth_userid:$password@/api/v1/erm/agreements/"
           . $agreement->agreement_id )->status_is(403);
 
-- 
2.39.5