From 57a505bb38a6624bb9448ad64380855ea5bb8744 Mon Sep 17 00:00:00 2001 From: sviatlana-stsiapanava Date: Thu, 14 Nov 2024 18:04:01 +0500 Subject: [PATCH 1/2] Stabilize the test case C440082 --- ...gs-incorrectly-formatted-identifiers.cy.js | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-incorrectly-formatted-identifiers.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-incorrectly-formatted-identifiers.cy.js index 69967fcc66..104a62d097 100644 --- a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-incorrectly-formatted-identifiers.cy.js +++ b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-incorrectly-formatted-identifiers.cy.js @@ -22,11 +22,23 @@ const errorMessage = const getCalloutContent = (fileName) => { return `${fileName} is formatted incorrectly. Please correct the formatting and upload the file again.`; }; -const checkResponse = (alias, fileName) => { - cy.wait(alias).then((interception) => { - expect(interception.response.body.linkToTriggeringCsvFile).to.include(fileName); - expect(interception.response.body.errorMessage).to.eq(errorMessage); - }); +const checkResponse = (alias, fileName, maxRetries = 20) => { + let retries = 0; + const waitForFailedStatus = () => { + cy.wait(alias).then((interception) => { + if (interception.response.body.status === 'FAILED') { + retries++; + if (retries > maxRetries) { + throw new Error('Exceeded maximum retry attempts waiting for status to equal FAILED'); + } + expect(interception.response.body.linkToTriggeringCsvFile).to.include(fileName); + expect(interception.response.body.errorMessage).to.eq(errorMessage); + } else { + waitForFailedStatus(); + } + }); + }; + waitForFailedStatus(); }; describe('bulk-edit', () => { From 156d7be993d0ed5ac792a410a7ed8d7fb0b46887 Mon Sep 17 00:00:00 2001 From: sviatlana-stsiapanava Date: Fri, 15 Nov 2024 17:39:20 +0500 Subject: [PATCH 2/2] Fix the test case C378102 --- .../e2e/bulk-edit/in-app/bulk-edit-in-app-deleted-user.cy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-deleted-user.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-deleted-user.cy.js index 05fffcdd6f..c23b8bcf22 100644 --- a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-deleted-user.cy.js +++ b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-deleted-user.cy.js @@ -46,7 +46,7 @@ describe('bulk-edit', () => { after('delete test data', () => { cy.getAdminToken(); InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(item.itemBarcode); - Users.deleteViaApi(user1.userId); + Users.deleteViaApi(user2.userId); FileManager.deleteFile(`cypress/fixtures/${itemBarcodesFileName}`); }); @@ -73,7 +73,7 @@ describe('bulk-edit', () => { path: TopMenu.bulkEditPath, waiter: BulkEditSearchPane.waitLoading, }); - Users.deleteViaApi(user2.userId); + Users.deleteViaApi(user1.userId); BulkEditSearchPane.checkItemsRadio(); BulkEditSearchPane.selectRecordIdentifier(ITEM_IDENTIFIERS.ITEM_BARCODES);