From d42381a3ac12fa89170e0dc3ecb42cde858ba988 Mon Sep 17 00:00:00 2001 From: vashjs Date: Fri, 10 Oct 2025 10:12:32 +0100 Subject: [PATCH 1/2] FAT-22105 Fix failed tests for bulk-edit --- cypress.config.js | 4 ++-- ...ngs-electronic-access-permanent-location.cy.js | 2 +- ...n-app-holdings-electronic-fields-actions.cy.js | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index 2cb20a567a..0d0b54230f 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -33,7 +33,7 @@ module.exports = defineConfig({ pageLoadTimeout: 60000, downloadsFolder: 'cypress/downloads', env: { - OKAPI_HOST: 'https://folio-etesting-cypress-kong.ci.folio.org', + OKAPI_HOST: 'https://folio-etesting-snapshot-kong.ci.folio.org', OKAPI_TENANT: 'diku', diku_login: 'diku_admin', diku_password: 'admin', @@ -153,7 +153,7 @@ module.exports = defineConfig({ return result; }, - baseUrl: 'https://folio-etesting-cypress-diku.ci.folio.org', + baseUrl: 'https://folio-etesting-snapshot-diku.ci.folio.org', testIsolation: false, }, }); diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-permanent-location.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-permanent-location.cy.js index cb69cd1296..46509b87e5 100644 --- a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-permanent-location.cy.js +++ b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-permanent-location.cy.js @@ -188,7 +188,7 @@ describe('Bulk-edit', () => { secondItem.holdingsHRID, ); - const holdingsElectronicAccessInFile = `${electronicAccessTableHeadersInFile}${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${firstElectronicAccess.uri};${firstElectronicAccess.linkText};;|;${secondElectronicAccess.uri};;${secondElectronicAccess.materialsSpecification};${secondElectronicAccess.publicNote}`; + const holdingsElectronicAccessInFile = `${electronicAccessTableHeadersInFile}${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${firstElectronicAccess.uri};${firstElectronicAccess.linkText};-;-|-;${secondElectronicAccess.uri};-;${secondElectronicAccess.materialsSpecification};${secondElectronicAccess.publicNote}`; verifyValuesInCsvFile( matchedRecordsFileName, diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-fields-actions.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-fields-actions.cy.js index e5da9b65ec..7c4953ac3e 100644 --- a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-fields-actions.cy.js +++ b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-fields-actions.cy.js @@ -96,7 +96,8 @@ describe('Bulk-edit', () => { BulkEditSearchPane.uploadFile(holdingUUIDsFileName); BulkEditSearchPane.waitFileUploading(); BulkEditActions.downloadMatchedResults(); - let contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note\n${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${firstElectronicAccess.uri};${firstElectronicAccess.linkText};${firstElectronicAccess.materialsSpecification};|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${secondElectronicAccess.uri};${secondElectronicAccess.linkText};${secondElectronicAccess.materialsSpecification};",`; + let contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note +${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${firstElectronicAccess.uri};${firstElectronicAccess.linkText};${firstElectronicAccess.materialsSpecification};-|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};${secondElectronicAccess.uri};${secondElectronicAccess.linkText};${secondElectronicAccess.materialsSpecification};-",`; ExportFile.verifyFileIncludes(matchedRecordsFileName, [contentToVerify]); BulkEditSearchPane.verifyMatchedResults(item.holdingsHRID); BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Electronic access'); @@ -149,7 +150,7 @@ describe('Bulk-edit', () => { 0, ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE, ); - BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '-'); + BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, ''); BulkEditSearchPane.verifyElectronicAccessElementByIndex(2, '-'); BulkEditSearchPane.verifyElectronicAccessElementByIndex( 3, @@ -165,7 +166,7 @@ describe('Bulk-edit', () => { ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE, 2, ); - BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '-', 2); + BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '', 2); BulkEditSearchPane.verifyElectronicAccessElementByIndex(2, '-', 2); BulkEditSearchPane.verifyElectronicAccessElementByIndex( 3, @@ -178,7 +179,7 @@ describe('Bulk-edit', () => { 2, ); BulkEditActions.downloadPreview(); - contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note\n${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;;${newElectronicAccessFields.materialsSpecification};${newElectronicAccessFields.publicNote}|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;;${secondElectronicAccess.materialsSpecification};${newElectronicAccessFields.publicNote}",`; + contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note\n${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;-;${newElectronicAccessFields.materialsSpecification};${newElectronicAccessFields.publicNote}|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;-;${secondElectronicAccess.materialsSpecification};${newElectronicAccessFields.publicNote}",`; ExportFile.verifyFileIncludes(previewFileName, [contentToVerify]); BulkEditActions.commitChanges(); BulkEditSearchPane.waitFileUploading(); @@ -186,7 +187,7 @@ describe('Bulk-edit', () => { 0, ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE, ); - BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '-'); + BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, ''); BulkEditSearchPane.verifyElectronicAccessElementByIndex(2, '-'); BulkEditSearchPane.verifyElectronicAccessElementByIndex( 3, @@ -202,7 +203,7 @@ describe('Bulk-edit', () => { ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE, 2, ); - BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '-', 2); + BulkEditSearchPane.verifyElectronicAccessElementByIndex(1, '', 2); BulkEditSearchPane.verifyElectronicAccessElementByIndex(2, '-', 2); BulkEditSearchPane.verifyElectronicAccessElementByIndex( 3, @@ -216,7 +217,7 @@ describe('Bulk-edit', () => { ); BulkEditActions.openActions(); BulkEditActions.downloadChangedCSV(); - contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note\n${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;;${newElectronicAccessFields.materialsSpecification};${newElectronicAccessFields.publicNote}|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;;${secondElectronicAccess.materialsSpecification};${newElectronicAccessFields.publicNote}",`; + contentToVerify = `"URL relationship;URI;Link text;Material specified;URL public note\n${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;-;${newElectronicAccessFields.materialsSpecification};${newElectronicAccessFields.publicNote}|${ELECTRONIC_ACCESS_RELATIONSHIP_NAME.RESOURCE};;-;${secondElectronicAccess.materialsSpecification};${newElectronicAccessFields.publicNote}",`; ExportFile.verifyFileIncludes(changedRecordsFileName, [contentToVerify]); TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY); From 997ef2846ad27bcc0f889cdd2d89b88cf12f6222 Mon Sep 17 00:00:00 2001 From: vashjs Date: Fri, 10 Oct 2025 10:15:28 +0100 Subject: [PATCH 2/2] FAT-22105 Fix failed tests for bulk-edit --- cypress.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index 0d0b54230f..2cb20a567a 100644 --- a/cypress.config.js +++ b/cypress.config.js @@ -33,7 +33,7 @@ module.exports = defineConfig({ pageLoadTimeout: 60000, downloadsFolder: 'cypress/downloads', env: { - OKAPI_HOST: 'https://folio-etesting-snapshot-kong.ci.folio.org', + OKAPI_HOST: 'https://folio-etesting-cypress-kong.ci.folio.org', OKAPI_TENANT: 'diku', diku_login: 'diku_admin', diku_password: 'admin', @@ -153,7 +153,7 @@ module.exports = defineConfig({ return result; }, - baseUrl: 'https://folio-etesting-snapshot-diku.ci.folio.org', + baseUrl: 'https://folio-etesting-cypress-diku.ci.folio.org', testIsolation: false, }, });