View | Details | Raw Unified | Return to bug 32898
Collapse All | Expand All

(-)a/t/cypress/integration/Agreements_spec.ts (-9 / +9 lines)
Lines 133-139 describe("Agreement CRUD operations", () => { Link Here
133
133
134
    it("List agreements", () => {
134
    it("List agreements", () => {
135
        // GET agreements returns 500
135
        // GET agreements returns 500
136
        cy.intercept("GET", "/api/v1/erm/agreements", {
136
        cy.intercept("GET", "/api/v1/erm/agreements*", {
137
            statusCode: 500,
137
            statusCode: 500,
138
            error: "Something went wrong",
138
            error: "Something went wrong",
139
        });
139
        });
Lines 167-177 describe("Agreement CRUD operations", () => { Link Here
167
167
168
    it("Add agreement", () => {
168
    it("Add agreement", () => {
169
        // No agreement, no license yet
169
        // No agreement, no license yet
170
        cy.intercept("GET", "/api/v1/erm/agreements", {
170
        cy.intercept("GET", "/api/v1/erm/agreements*", {
171
            statusCode: 200,
171
            statusCode: 200,
172
            body: [],
172
            body: [],
173
        });
173
        });
174
        cy.intercept("GET", "/api/v1/erm/licenses", {
174
        cy.intercept("GET", "/api/v1/erm/licenses*", {
175
            statusCode: 200,
175
            statusCode: 200,
176
            body: [],
176
            body: [],
177
        });
177
        });
Lines 299-305 describe("Agreement CRUD operations", () => { Link Here
299
            "Agreement created"
299
            "Agreement created"
300
        );
300
        );
301
301
302
        cy.intercept("GET", "/api/v1/erm/agreements", {
302
        cy.intercept("GET", "/api/v1/erm/agreements*", {
303
            statusCode: 200,
303
            statusCode: 200,
304
            body: [{ agreement_id: 1, description: "an existing agreement" }],
304
            body: [{ agreement_id: 1, description: "an existing agreement" }],
305
        });
305
        });
Lines 307-313 describe("Agreement CRUD operations", () => { Link Here
307
        // Add new license
307
        // Add new license
308
        let licenses_to_relate = get_licenses_to_relate();
308
        let licenses_to_relate = get_licenses_to_relate();
309
        let related_license = agreement.agreement_licenses[0];
309
        let related_license = agreement.agreement_licenses[0];
310
        cy.intercept("GET", "/api/v1/erm/licenses", {
310
        cy.intercept("GET", "/api/v1/erm/licenses*", {
311
            statusCode: 200,
311
            statusCode: 200,
312
            body: licenses_to_relate,
312
            body: licenses_to_relate,
313
        });
313
        });
Lines 331-337 describe("Agreement CRUD operations", () => { Link Here
331
331
332
        // Add new related agreement
332
        // Add new related agreement
333
        let related_agreement = agreement.agreement_relationships[0];
333
        let related_agreement = agreement.agreement_relationships[0];
334
        cy.intercept("GET", "/api/v1/erm/agreements", {
334
        cy.intercept("GET", "/api/v1/erm/agreements*", {
335
            statusCode: 200,
335
            statusCode: 200,
336
            body: cy.get_agreements_to_relate(),
336
            body: cy.get_agreements_to_relate(),
337
        });
337
        });
Lines 358-364 describe("Agreement CRUD operations", () => { Link Here
358
        cy.intercept(
358
        cy.intercept(
359
            {
359
            {
360
                method: "GET",
360
                method: "GET",
361
                url: "/api/v1/erm/agreements",
361
                url: "/api/v1/erm/agreements*",
362
                times: 1
362
                times: 1
363
            },
363
            },
364
            {
364
            {
Lines 382-393 describe("Agreement CRUD operations", () => { Link Here
382
            "get-agreement"
382
            "get-agreement"
383
        );
383
        );
384
        // Intercept related licenses request after entering agreement edit
384
        // Intercept related licenses request after entering agreement edit
385
        cy.intercept("GET", "/api/v1/erm/licenses", {
385
        cy.intercept("GET", "/api/v1/erm/licenses*", {
386
            statusCode: 200,
386
            statusCode: 200,
387
            body: licenses_to_relate,
387
            body: licenses_to_relate,
388
        }).as("get-related-licenses");
388
        }).as("get-related-licenses");
389
        // Intercept related agreements request after entering agreement edit
389
        // Intercept related agreements request after entering agreement edit
390
        cy.intercept("GET", "/api/v1/erm/agreements", {
390
        cy.intercept("GET", "/api/v1/erm/agreements*", {
391
            statusCode: 200,
391
            statusCode: 200,
392
            body: cy.get_agreements_to_relate(),
392
            body: cy.get_agreements_to_relate(),
393
        }).as("get-related-agreements");
393
        }).as("get-related-agreements");
(-)a/t/cypress/integration/Licenses_spec.ts (-1 / +1 lines)
Lines 49-55 describe("License CRUD operations", () => { Link Here
49
49
50
    it("List license", () => {
50
    it("List license", () => {
51
        // GET license returns 500
51
        // GET license returns 500
52
        cy.intercept("GET", "/api/v1/erm/licenses", {
52
        cy.intercept("GET", "/api/v1/erm/licenses*", {
53
            statusCode: 500,
53
            statusCode: 500,
54
            error: "Something went wrong",
54
            error: "Something went wrong",
55
        });
55
        });
(-)a/t/cypress/integration/Packages_spec.ts (-4 / +4 lines)
Lines 40-46 describe("Package CRUD operations", () => { Link Here
40
40
41
    it("List package", () => {
41
    it("List package", () => {
42
        // GET package returns 500
42
        // GET package returns 500
43
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
43
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
44
            statusCode: 500,
44
            statusCode: 500,
45
            error: "Something went wrong",
45
            error: "Something went wrong",
46
        });
46
        });
Lines 78-84 describe("Package CRUD operations", () => { Link Here
78
78
79
    it("Add package", () => {
79
    it("Add package", () => {
80
80
81
        cy.intercept("GET", "/api/v1/erm/agreements", []);
81
        cy.intercept("GET", "/api/v1/erm/agreements*", []);
82
82
83
        // Click the button in the toolbar
83
        // Click the button in the toolbar
84
        cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
84
        cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
Lines 127-133 describe("Package CRUD operations", () => { Link Here
127
127
128
        // Add new related agreement
128
        // Add new related agreement
129
        let related_agreement = erm_package.package_agreements[0];
129
        let related_agreement = erm_package.package_agreements[0];
130
        cy.intercept("GET", "/api/v1/erm/agreements", {
130
        cy.intercept("GET", "/api/v1/erm/agreements*", {
131
            statusCode: 200,
131
            statusCode: 200,
132
            body: cy.get_agreements_to_relate(),
132
            body: cy.get_agreements_to_relate(),
133
        });
133
        });
Lines 159-165 describe("Package CRUD operations", () => { Link Here
159
        ).as("get-package");
159
        ).as("get-package");
160
        cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
160
        cy.visit("/cgi-bin/koha/erm/eholdings/local/packages");
161
        // Intercept related agreements request after entering agreement edit
161
        // Intercept related agreements request after entering agreement edit
162
        cy.intercept("GET", "/api/v1/erm/agreements", {
162
        cy.intercept("GET", "/api/v1/erm/agreements*", {
163
            statusCode: 200,
163
            statusCode: 200,
164
            body: cy.get_agreements_to_relate(),
164
            body: cy.get_agreements_to_relate(),
165
        }).as("get-related-agreements");
165
        }).as("get-related-agreements");
(-)a/t/cypress/integration/Titles_spec.ts (-7 / +6 lines)
Lines 92-98 describe("Title CRUD operations", () => { Link Here
92
        cy.contains("Save").click();
92
        cy.contains("Save").click();
93
93
94
        // First attempt to import list has no packages
94
        // First attempt to import list has no packages
95
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
95
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
96
            statusCode: 200,
96
            statusCode: 200,
97
            body: []
97
            body: []
98
        }).as("get-empty-packages");
98
        }).as("get-empty-packages");
Lines 103-109 describe("Title CRUD operations", () => { Link Here
103
        cy.get("#package_list .vs__selected").should('not.exist');
103
        cy.get("#package_list .vs__selected").should('not.exist');
104
104
105
        // Make sure packages are returned
105
        // Make sure packages are returned
106
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
106
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
107
            statusCode: 200,
107
            statusCode: 200,
108
            body: get_packages_to_relate(),
108
            body: get_packages_to_relate(),
109
        }).as("get-related-packages");
109
        }).as("get-related-packages");
Lines 123-129 describe("Title CRUD operations", () => { Link Here
123
123
124
    it("List title", () => {
124
    it("List title", () => {
125
        // GET title returns 500
125
        // GET title returns 500
126
        cy.intercept("GET", "/api/v1/erm/eholdings/local/titles", {
126
        cy.intercept("GET", "/api/v1/erm/eholdings/local/titles*", {
127
            statusCode: 500,
127
            statusCode: 500,
128
            error: "Something went wrong",
128
            error: "Something went wrong",
129
        });
129
        });
Lines 163-169 describe("Title CRUD operations", () => { Link Here
163
163
164
        cy.intercept({
164
        cy.intercept({
165
            method: "GET",
165
            method: "GET",
166
            url: "/api/v1/erm/eholdings/local/packages",
166
            url: "/api/v1/erm/eholdings/local/packages*",
167
            times: 1
167
            times: 1
168
        },
168
        },
169
        {
169
        {
Lines 236-242 describe("Title CRUD operations", () => { Link Here
236
236
237
        // Add new related package (resource)
237
        // Add new related package (resource)
238
        let related_package = erm_title.resources[0];
238
        let related_package = erm_title.resources[0];
239
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
239
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
240
            statusCode: 200,
240
            statusCode: 200,
241
            body: get_packages_to_relate(),
241
            body: get_packages_to_relate(),
242
        }).as('get-related-packages');
242
        }).as('get-related-packages');
Lines 268-274 describe("Title CRUD operations", () => { Link Here
268
        ).as("get-title");
268
        ).as("get-title");
269
        cy.visit("/cgi-bin/koha/erm/eholdings/local/titles");
269
        cy.visit("/cgi-bin/koha/erm/eholdings/local/titles");
270
        // Intercept related packages request after entering title edit
270
        // Intercept related packages request after entering title edit
271
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages", {
271
        cy.intercept("GET", "/api/v1/erm/eholdings/local/packages*", {
272
            statusCode: 200,
272
            statusCode: 200,
273
            body: get_packages_to_relate(),
273
            body: get_packages_to_relate(),
274
        }).as('get-related-packages');
274
        }).as('get-related-packages');
275
- 

Return to bug 32898