From af3ece31afb9a298cdad32751ea5a86a69116bcd Mon Sep 17 00:00:00 2001 From: Vadim Eremichev Date: Mon, 16 Dec 2024 10:21:21 +0200 Subject: [PATCH] test fixes for eureka ecs pt1 (#4558) --- ...-fileds-of-shared-marcBib-in-central.cy.js | 22 ++++--- ...d-fileds-of-shared-marcBib-in-member.cy.js | 14 ++++- ...d-with-selected-auth-file-at-central.cy.js | 12 ++-- ...ate-local-linked-marc-auth-in-member.cy.js | 22 +++++-- ...d-linked-marc-auth-record-in-central.cy.js | 4 ++ ...ed-linked-marc-auth-record-in-member.cy.js | 61 +++++++++++-------- .../create-local-marc-bib-in-member.cy.js | 2 + .../create-shared-marc-bib-in-central.cy.js | 2 + ...ared-marcBib-and-marcAuth-on-central.cy.js | 2 + ...rcBib-from-shadow-instance-in-member.cy.js | 2 + ...rcBib-with-shared-marcAuth-in-member.cy.js | 2 + .../create-authority-file-member.cy.js | 13 ++-- ...to-linking-when-creating-new-marcBib.cy.js | 2 +- .../marc-holdings/holding-quickmark.cy.js | 1 + .../marc-authority/manageAuthorityFiles.js | 2 +- 15 files changed, 111 insertions(+), 52 deletions(-) diff --git a/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-central.cy.js b/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-central.cy.js index 3ac1503172..4a84ce6fdc 100644 --- a/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-central.cy.js +++ b/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-central.cy.js @@ -85,20 +85,20 @@ describe('Data Import', () => { ]; const linkingTagAndValues = [ { - rowIndex: 21, + rowIndex: 20, value: 'C411802 Marvel comics', tag: '630', content: '$a C411802 Marvel comics $t Comiket $v Periodicals. $z United States $w 830 $0 800269554076962001 $2 fast', }, { - rowIndex: 22, + rowIndex: 21, value: 'C411802 Speaking Oratory', tag: '650', content: '$a C411802 Speaking Oratory $b debating $2 fast', }, { - rowIndex: 27, + rowIndex: 26, value: 'C411802 Radio "Vaticana".', tag: '710', boxFourth: '$a C411802 Radio "Vaticana". $b Hrvatski program', @@ -213,6 +213,8 @@ describe('Data Import', () => { QuickMarcEditor.verifyAfterLinkingUsingRowIndex(fields.tag, fields.rowIndex); }); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); }) .then(() => { @@ -243,11 +245,15 @@ describe('Data Import', () => { }).location; Locations.createViaApi(collegeLocationData).then((location) => { testData.collegeLocation = location; - InventoryHoldings.createHoldingRecordViaApi({ - instanceId: createdAuthorityIDs[0], - permanentLocationId: testData.collegeLocation.id, - }).then((holding) => { - testData.collegeHoldings.push(holding); + + InventoryHoldings.getHoldingsFolioSource().then((holdingSources) => { + InventoryHoldings.createHoldingRecordViaApi({ + instanceId: createdAuthorityIDs[0], + permanentLocationId: testData.collegeLocation.id, + sourceId: holdingSources.id, + }).then((holding) => { + testData.collegeHoldings.push(holding); + }); }); }); diff --git a/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js b/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js index a5c003ff88..6629b61713 100644 --- a/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js +++ b/cypress/e2e/consortia/data-import/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js @@ -1,4 +1,5 @@ import { + APPLICATION_NAMES, DEFAULT_JOB_PROFILE_NAMES, EXISTING_RECORD_NAMES, FOLIO_RECORD_TYPE, @@ -31,6 +32,7 @@ import TopMenu from '../../../../support/fragments/topMenu'; import Users from '../../../../support/fragments/users/users'; import FileManager from '../../../../support/utils/fileManager'; import getRandomPostfix from '../../../../support/utils/stringTools'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; describe('Data Import', () => { describe('Importing MARC Bib files', () => { @@ -212,6 +214,8 @@ describe('Data Import', () => { QuickMarcEditor.verifyAfterLinkingUsingRowIndex(fields.tag, fields.rowIndex); }); QuickMarcEditor.pressSaveAndClose(); + cy.wait(2000); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); }) .then(() => { @@ -274,7 +278,9 @@ describe('Data Import', () => { InventorySearchAndFilter.saveUUIDs(); ExportFile.downloadCSVFile(nameForCSVFile, 'SearchInstanceUUIDs*'); FileManager.deleteFolder(Cypress.config('downloadsFolder')); - cy.visit(TopMenu.dataExportPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.DATA_EXPORT); + ExportFile.waitLoading(); + // download exported marc file ExportFile.uploadFile(nameForCSVFile); ExportFile.exportWithDefaultJobProfile(nameForCSVFile); @@ -290,7 +296,8 @@ describe('Data Import', () => { ); // upload the exported marc file with 999.f.f.s fields - cy.visit(TopMenu.dataImportPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.DATA_IMPORT); + DataImport.waitLoading(); DataImport.verifyUploadState(); DataImport.uploadFile(nameForUpdatedMarcFile, nameForUpdatedMarcFile); JobProfiles.waitLoadingList(); @@ -301,7 +308,8 @@ describe('Data Import', () => { Logs.openFileDetails(nameForUpdatedMarcFile); ConsortiumManager.switchActiveAffiliation(tenantNames.college, tenantNames.central); - cy.visit(TopMenu.inventoryPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY); + InventoryInstances.waitLoading(); InventorySearchAndFilter.verifyPanesExist(); InventoryInstances.searchByTitle(createdAuthorityIDs[0]); InventoryInstance.waitInstanceRecordViewOpened(testData.instanceTitle); diff --git a/cypress/e2e/consortia/marc/marc-authority/create-marc-authority/create-shared-auth-record-with-selected-auth-file-at-central.cy.js b/cypress/e2e/consortia/marc/marc-authority/create-marc-authority/create-shared-auth-record-with-selected-auth-file-at-central.cy.js index 40166b58d2..007301101c 100644 --- a/cypress/e2e/consortia/marc/marc-authority/create-marc-authority/create-shared-auth-record-with-selected-auth-file-at-central.cy.js +++ b/cypress/e2e/consortia/marc/marc-authority/create-marc-authority/create-shared-auth-record-with-selected-auth-file-at-central.cy.js @@ -18,6 +18,8 @@ describe('MARC', () => { startWithNumber: '1', searchOption: 'Keyword', marcValue: 'Create a new Shared MARC authority record with Local authority file test', + marcValueShared: + 'Shared\nCreate a new Shared MARC authority record with Local authority file test', headerText: 'Create a new shared MARC authority record', AUTHORIZED: 'Authorized', sharedIcon: 'Shared', @@ -78,9 +80,9 @@ describe('MARC', () => { cy.resetTenant(); cy.getAdminToken(); Users.deleteViaApi(users.userProperties.userId); - MarcAuthority.deleteViaAPI(testData.authorityId); + MarcAuthority.deleteViaAPI(testData.authorityId, true); ManageAuthorityFiles.unsetAllDefaultFOLIOFilesAsActiveViaAPI(); - cy.deleteAuthoritySourceFileViaAPI(testData.authSourceID); + cy.deleteAuthoritySourceFileViaAPI(testData.authSourceID, true); }); it( @@ -95,7 +97,9 @@ describe('MARC', () => { QuickMarcEditor.verifyAuthorityFileSelected(testData.sourceName); QuickMarcEditor.clickSaveAndCloseInModal(); QuickMarcEditor.checkContentByTag('001', `${testData.prefix}${testData.startWithNumber}`); - MarcAuthority.addNewField(4, newField.tag, newField.content); + MarcAuthority.addNewField(3, newField.tag, newField.content); + QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); QuickMarcEditor.pressSaveAndClose(); MarcAuthority.verifyAfterSaveAndClose(); QuickMarcEditor.verifyPaneheaderWithContentAbsent(testData.headerText); @@ -114,7 +118,7 @@ describe('MARC', () => { MarcAuthorities.chooseAuthoritySourceOption(testData.sourceName); MarcAuthorities.checkResultsSelectedByAuthoritySource([testData.sourceName]); - MarcAuthorities.selectTitle(testData.marcValue); + MarcAuthorities.selectTitle(testData.marcValueShared); MarcAuthorities.checkAfterSearch( testData.AUTHORIZED, `${testData.sharedIcon}${testData.marcValue}`, diff --git a/cypress/e2e/consortia/marc/marc-authority/update-local-linked-marc-auth-in-member.cy.js b/cypress/e2e/consortia/marc/marc-authority/update-local-linked-marc-auth-in-member.cy.js index 29c1244407..f5724a2174 100644 --- a/cypress/e2e/consortia/marc/marc-authority/update-local-linked-marc-auth-in-member.cy.js +++ b/cypress/e2e/consortia/marc/marc-authority/update-local-linked-marc-auth-in-member.cy.js @@ -6,12 +6,13 @@ import InventoryInstances from '../../../../support/fragments/inventory/inventor import getRandomPostfix from '../../../../support/utils/stringTools'; import InventoryInstance from '../../../../support/fragments/inventory/inventoryInstance'; import DataImport from '../../../../support/fragments/data_import/dataImport'; -import { DEFAULT_JOB_PROFILE_NAMES } from '../../../../support/constants'; +import { DEFAULT_JOB_PROFILE_NAMES, APPLICATION_NAMES } from '../../../../support/constants'; import QuickMarcEditor from '../../../../support/fragments/quickMarcEditor'; import ConsortiumManager from '../../../../support/fragments/settings/consortium-manager/consortium-manager'; import MarcAuthority from '../../../../support/fragments/marcAuthority/marcAuthority'; import MarcAuthorities from '../../../../support/fragments/marcAuthority/marcAuthorities'; import InventorySearchAndFilter from '../../../../support/fragments/inventory/inventorySearchAndFilter'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; describe('MARC', () => { describe('MARC Authority', () => { @@ -129,6 +130,8 @@ describe('MARC', () => { linkingTagAndValues.rowIndex, ); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); }); }); @@ -147,7 +150,8 @@ describe('MARC', () => { 'C407654 Update local linked "MARC Authority" record in member tenant (consortia) (spitfire)', { tags: ['criticalPathECS', 'spitfire', 'C407654'] }, () => { - cy.visit(TopMenu.marcAuthorities); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.MARC_AUTHORITY); + MarcAuthorities.waitLoading(); MarcAuthorities.searchBy(testData.authoritySearchOption, testData.authorityTitle); MarcAuthorities.selectTitle(testData.authorityTitle); MarcAuthority.edit(); @@ -157,9 +161,12 @@ describe('MARC', () => { // if clicked too fast, delete modal might not appear cy.wait(1000); QuickMarcEditor.pressSaveAndClose(); + cy.wait(2000); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.verifyUpdateLinkedBibsKeepEditingModal(1); QuickMarcEditor.confirmUpdateLinkedBibsKeepEditing(1); - cy.visit(TopMenu.inventoryPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY); + InventoryInstances.waitLoading(); InventoryInstances.searchByTitle(createdRecordIDs[0]); InventoryInstances.selectInstance(); InventoryInstance.editMarcBibliographicRecord(); @@ -185,13 +192,15 @@ describe('MARC', () => { InventoryInstance.verifyNoResultFoundMessage( `No results found for "${testData.instanceTitle}". Please check your spelling and filters.`, ); - cy.visit(TopMenu.marcAuthorities); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.MARC_AUTHORITY); + MarcAuthorities.waitLoading(); MarcAuthorities.searchBy(testData.authoritySearchOption, testData.updated100FieldValue); MarcAuthorities.checkNoResultsMessage( `No results found for "${testData.updated100FieldValue}". Please check your spelling and filters.`, ); - cy.visit(TopMenu.inventoryPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY); + InventoryInstances.waitLoading(); ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college); InventoryInstances.waitContentLoading(); InventorySearchAndFilter.searchByParameter( @@ -201,7 +210,8 @@ describe('MARC', () => { InventoryInstance.verifyNoResultFoundMessage( `No results found for "${testData.instanceTitle}". Please check your spelling and filters.`, ); - cy.visit(TopMenu.marcAuthorities); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.MARC_AUTHORITY); + MarcAuthorities.waitLoading(); MarcAuthorities.searchBy(testData.authoritySearchOption, testData.updated100FieldValue); MarcAuthorities.checkNoResultsMessage( `No results found for "${testData.updated100FieldValue}". Please check your spelling and filters.`, diff --git a/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js b/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js index a7989834ff..0263be97f1 100644 --- a/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js +++ b/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js @@ -104,6 +104,7 @@ describe('MARC', () => { before('Create users, data', () => { cy.getAdminToken(); + MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405927'); cy.createTempUser([ Permissions.inventoryAll.gui, @@ -154,6 +155,7 @@ describe('MARC', () => { }); }) .then(() => { + cy.resetTenant(); cy.loginAsAdmin({ path: TopMenu.inventoryPath, waiter: InventoryInstances.waitContentLoading, @@ -177,6 +179,8 @@ describe('MARC', () => { linkingTagAndValues.rowIndex, ); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); }); }); diff --git a/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js b/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js index bcebc5b0be..e13655a2d9 100644 --- a/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js +++ b/cypress/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js @@ -6,11 +6,12 @@ import InventoryInstances from '../../../../support/fragments/inventory/inventor import getRandomPostfix from '../../../../support/utils/stringTools'; import InventoryInstance from '../../../../support/fragments/inventory/inventoryInstance'; import DataImport from '../../../../support/fragments/data_import/dataImport'; -import { DEFAULT_JOB_PROFILE_NAMES } from '../../../../support/constants'; +import { DEFAULT_JOB_PROFILE_NAMES, APPLICATION_NAMES } from '../../../../support/constants'; import QuickMarcEditor from '../../../../support/fragments/quickMarcEditor'; import ConsortiumManager from '../../../../support/fragments/settings/consortium-manager/consortium-manager'; import MarcAuthority from '../../../../support/fragments/marcAuthority/marcAuthority'; import MarcAuthorities from '../../../../support/fragments/marcAuthority/marcAuthorities'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; describe('MARC', () => { describe('MARC Authority', () => { @@ -125,7 +126,6 @@ describe('MARC', () => { }) .then(() => { cy.assignAffiliationToUser(Affiliations.University, users.userProperties.userId); - cy.assignAffiliationToUser(Affiliations.College, users.userProperties.userId); cy.setTenant(Affiliations.University); cy.assignPermissionsToExistingUser(users.userProperties.userId, [ Permissions.inventoryAll.gui, @@ -134,8 +134,10 @@ describe('MARC', () => { Permissions.uiQuickMarcQuickMarcAuthoritiesEditorAll.gui, Permissions.uiQuickMarcQuickMarcBibliographicEditorAll.gui, ]); + cy.resetTenant(); }) .then(() => { + cy.assignAffiliationToUser(Affiliations.College, users.userProperties.userId); cy.setTenant(Affiliations.College); cy.assignPermissionsToExistingUser(users.userProperties.userId, [ Permissions.inventoryAll.gui, @@ -165,28 +167,36 @@ describe('MARC', () => { }) .then(() => { cy.resetTenant(); - cy.loginAsAdmin(); - cy.visit(TopMenu.inventoryPath); - linkingInTenants.forEach((tenants) => { - ConsortiumManager.switchActiveAffiliation(tenants.currentTeant, tenants.openingTenat); - InventoryInstances.waitContentLoading(); - tenants.linkingInstances.forEach((instance) => { - InventoryInstances.searchByTitle(instance); - InventoryInstances.selectInstanceByTitle(instance); - cy.wait(2000); - InventoryInstance.editMarcBibliographicRecord(); - QuickMarcEditor.clickLinkIconInTagField(linkingTagAndValues.rowIndex); - MarcAuthorities.switchToSearch(); - InventoryInstance.verifySelectMarcAuthorityModal(); - InventoryInstance.verifySearchOptions(); - InventoryInstance.searchResults(linkingTagAndValues.value); - InventoryInstance.clickLinkButton(); - QuickMarcEditor.verifyAfterLinkingUsingRowIndex( - linkingTagAndValues.tag, - linkingTagAndValues.rowIndex, + cy.loginAsAdmin({ + path: TopMenu.inventoryPath, + waiter: InventoryInstances.waitLoading, + }).then(() => { + linkingInTenants.forEach((tenants) => { + ConsortiumManager.switchActiveAffiliation( + tenants.currentTeant, + tenants.openingTenat, ); - QuickMarcEditor.pressSaveAndClose(); - QuickMarcEditor.checkAfterSaveAndClose(); + InventoryInstances.waitContentLoading(); + tenants.linkingInstances.forEach((instance) => { + InventoryInstances.searchByTitle(instance); + InventoryInstances.selectInstanceByTitle(instance); + cy.wait(2000); + InventoryInstance.editMarcBibliographicRecord(); + QuickMarcEditor.clickLinkIconInTagField(linkingTagAndValues.rowIndex); + MarcAuthorities.switchToSearch(); + InventoryInstance.verifySelectMarcAuthorityModal(); + InventoryInstance.verifySearchOptions(); + InventoryInstance.searchResults(linkingTagAndValues.value); + InventoryInstance.clickLinkButton(); + QuickMarcEditor.verifyAfterLinkingUsingRowIndex( + linkingTagAndValues.tag, + linkingTagAndValues.rowIndex, + ); + QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); + QuickMarcEditor.checkAfterSaveAndClose(); + }); }); }); }); @@ -227,9 +237,12 @@ describe('MARC', () => { // if clicked too fast, delete modal might not appear cy.wait(1000); QuickMarcEditor.pressSaveAndClose(); + cy.wait(2000); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.verifyUpdateLinkedBibsKeepEditingModal(4); QuickMarcEditor.confirmUpdateLinkedBibsKeepEditing(4); - cy.visit(TopMenu.inventoryPath); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY); + InventoryInstances.waitLoading(); instancesToCheckInM1.forEach((instance) => { InventoryInstances.searchByTitle(instance); InventoryInstances.selectInstanceByTitle(instance); diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-local-marc-bib-in-member.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-local-marc-bib-in-member.cy.js index dc8356a2dd..6b188a7dd9 100644 --- a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-local-marc-bib-in-member.cy.js +++ b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-local-marc-bib-in-member.cy.js @@ -86,6 +86,8 @@ describe('MARC', () => { QuickMarcEditor.updateIndicatorValue(newField.tag, '2', 0); QuickMarcEditor.updateIndicatorValue(newField.tag, '0', 1); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); InventoryInstance.getId().then((id) => { createdInstanceID.push(id); diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-shared-marc-bib-in-central.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-shared-marc-bib-in-central.cy.js index 146eb8a04d..c7784e8472 100644 --- a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-shared-marc-bib-in-central.cy.js +++ b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/create-shared-marc-bib-in-central.cy.js @@ -88,6 +88,8 @@ describe('MARC', () => { QuickMarcEditor.updateIndicatorValue(newField.tag, '2', 0); QuickMarcEditor.updateIndicatorValue(newField.tag, '0', 1); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); InventoryInstance.getId().then((id) => { createdInstanceID.push(id); diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js index 98c56dbb0b..328f2b2921 100644 --- a/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js +++ b/cypress/e2e/consortia/marc/marc-bibliographic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js @@ -161,6 +161,8 @@ describe('MARC', () => { '$e writer', ); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); InventoryInstance.getId().then((id) => { createdRecordsID.push(id); diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/derive-marcBib/derive-new-local-marcBib-from-shadow-instance-in-member.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/derive-marcBib/derive-new-local-marcBib-from-shadow-instance-in-member.cy.js index 65a92fb549..e6fc03cd08 100644 --- a/cypress/e2e/consortia/marc/marc-bibliographic/derive-marcBib/derive-new-local-marcBib-from-shadow-instance-in-member.cy.js +++ b/cypress/e2e/consortia/marc/marc-bibliographic/derive-marcBib/derive-new-local-marcBib-from-shadow-instance-in-member.cy.js @@ -233,6 +233,8 @@ describe('MARC', () => { QuickMarcEditor.verifyTagFieldAfterLinking(...linked700Field); QuickMarcEditor.verifyTagFieldAfterUnlinking(...notLinked710Field); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndCloseDerive(); InventoryInstance.checkPresentedText(testData.instanceEditedTitle); InventoryInstance.checkSharedTextInDetailView(false); diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-member.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-member.cy.js index 10565f603a..5028102d6a 100644 --- a/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-member.cy.js +++ b/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-member.cy.js @@ -185,6 +185,8 @@ describe('MARC', () => { linkingTagAndValues.seventhBox, ); QuickMarcEditor.pressSaveAndClose(); + cy.wait(1500); + QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); InventoryInstance.checkPresentedText(testData.updatedInstanceTitle); InventoryInstance.verifyRecordAndMarcAuthIcon( diff --git a/cypress/e2e/consortia/settings/marc-authority/create-authority-file-member.cy.js b/cypress/e2e/consortia/settings/marc-authority/create-authority-file-member.cy.js index 9d12120d10..8c306d5271 100644 --- a/cypress/e2e/consortia/settings/marc-authority/create-authority-file-member.cy.js +++ b/cypress/e2e/consortia/settings/marc-authority/create-authority-file-member.cy.js @@ -27,26 +27,29 @@ describe('MARC', () => { before('Create users, login', () => { cy.resetTenant(); cy.getAdminToken(); - cy.createTempUser([Permissions.uiSettingsManageAuthorityFiles.gui]).then( - (userProperties) => { + cy.createTempUser([Permissions.uiSettingsManageAuthorityFiles.gui]) + .then((userProperties) => { testData.user = userProperties; cy.assignAffiliationToUser(Affiliations.College, testData.user.userId); - cy.assignAffiliationToUser(Affiliations.University, testData.user.userId); cy.setTenant(Affiliations.College); cy.assignPermissionsToExistingUser(testData.user.userId, [ Permissions.uiSettingsManageAuthorityFiles.gui, ]); + cy.resetTenant(); + cy.assignAffiliationToUser(Affiliations.University, testData.user.userId); cy.setTenant(Affiliations.University); cy.assignPermissionsToExistingUser(testData.user.userId, [ Permissions.uiSettingsViewAuthorityFiles.gui, ]); + }) + .then(() => { + cy.resetTenant(); cy.login(testData.user.username, testData.user.password).then(() => { ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.central); ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college); cy.visit(TopMenu.settingsAuthorityFilesPath); }); - }, - ); + }); }); after('Delete data, users', () => { diff --git a/cypress/e2e/marc/marc-bibliographic/edit-marc-bib/automated-linking/manual-and-auto-linking-when-creating-new-marcBib.cy.js b/cypress/e2e/marc/marc-bibliographic/edit-marc-bib/automated-linking/manual-and-auto-linking-when-creating-new-marcBib.cy.js index 32c7e66b9d..9a2f84d13e 100644 --- a/cypress/e2e/marc/marc-bibliographic/edit-marc-bib/automated-linking/manual-and-auto-linking-when-creating-new-marcBib.cy.js +++ b/cypress/e2e/marc/marc-bibliographic/edit-marc-bib/automated-linking/manual-and-auto-linking-when-creating-new-marcBib.cy.js @@ -229,7 +229,7 @@ describe('MARC', () => { '', ); QuickMarcEditor.pressSaveAndClose(); - cy.wait(1500); + cy.wait(2000); QuickMarcEditor.pressSaveAndClose(); QuickMarcEditor.checkAfterSaveAndClose(); diff --git a/cypress/e2e/marc/marc-holdings/holding-quickmark.cy.js b/cypress/e2e/marc/marc-holdings/holding-quickmark.cy.js index 8e62c3a533..c9d58e7504 100644 --- a/cypress/e2e/marc/marc-holdings/holding-quickmark.cy.js +++ b/cypress/e2e/marc/marc-holdings/holding-quickmark.cy.js @@ -66,6 +66,7 @@ describe('MARC', () => { HoldingsRecordView.close(); InventoryInstance.openHoldingView(); HoldingsRecordView.editInQuickMarc(); + QuickMarcEditor.waitLoading(); }); after(() => { diff --git a/cypress/support/fragments/settings/marc-authority/manageAuthorityFiles.js b/cypress/support/fragments/settings/marc-authority/manageAuthorityFiles.js index 0d6b9546c2..1fabd4c250 100644 --- a/cypress/support/fragments/settings/marc-authority/manageAuthorityFiles.js +++ b/cypress/support/fragments/settings/marc-authority/manageAuthorityFiles.js @@ -234,7 +234,7 @@ const defaultFolioAuthorityFiles = [ name: DEFAULT_FOLIO_AUTHORITY_FILES.MEDICAL_SUBJECT_HEADINGS, prefix: 'D', startsWith: '', - baseUrl: 'https://id.nlm.nih.gov/mesh/', + baseUrl: 'https://id.nlm.nih.gov/mesh/1/', }, { name: DEFAULT_FOLIO_AUTHORITY_FILES.RARE_BOOKS_AND_MANUSCRIPTS_SECTION,