Merge branch 'eureka-test-rbugfest' of https://github.com/folio-org/s…

…tripes-testing into FAT-17699
folio-org · Dec 20, 2024 · 91f9c76 · 91f9c76
2 parents fa44a73 + c140acb
commit 91f9c76
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 40 deletions.
diff --git a/...hority-files/imported-marcAuthority-record-from-member1-not-discoverable-in-member2.cy.js b/...hority-files/imported-marcAuthority-record-from-member1-not-discoverable-in-member2.cy.js
@@ -43,6 +43,15 @@ describe('Data Import', () => {
               Permissions.moduleDataImportEnabled.gui,
             ]);
             MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405522');
+            cy.resetTenant();
+            cy.assignAffiliationToUser(Affiliations.College, users.userProperties.userId);
+            cy.setTenant(Affiliations.College);
+            cy.assignPermissionsToExistingUser(users.userProperties.userId, [
+              Permissions.uiMarcAuthoritiesAuthorityRecordView.gui,
+              Permissions.moduleDataImportEnabled.gui,
+            ]);
+            MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405522');
+            cy.resetTenant();
           })
           .then(() => {
             cy.login(users.userProperties.username, users.userProperties.password, {

diff --git a/...marcAuthority-files/updated-imported-marcAuth-record-from-central-updated-in-member.cy.js b/...marcAuthority-files/updated-imported-marcAuth-record-from-central-updated-in-member.cy.js
@@ -102,6 +102,7 @@ describe('Data Import', () => {
 
     before('Create test data and login', () => {
       cy.getAdminToken();
+      MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405144');
       // create user A
       cy.createTempUser([
         Permissions.moduleDataImportEnabled.gui,

diff --git a/...port/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js b/...port/importing-marcBib-files/update-$0-in-linked-fileds-of-shared-marcBib-in-member.cy.js
@@ -139,16 +139,7 @@ describe('Data Import', () => {
 
     before('Create test data', () => {
       cy.getAdminToken();
-      MarcAuthorities.getMarcAuthoritiesViaApi({
-        limit: 100,
-        query: 'keyword="C407696" and (authRefType==("Authorized" or "Auth/Ref"))',
-      }).then((authorities) => {
-        if (authorities) {
-          authorities.forEach(({ id }) => {
-            MarcAuthority.deleteViaAPI(id, true);
-          });
-        }
-      });
+      MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C407696');
       cy.createTempUser([
         Permissions.inventoryAll.gui,
         Permissions.moduleDataImportEnabled.gui,
@@ -309,7 +300,7 @@ describe('Data Import', () => {
 
         ConsortiumManager.switchActiveAffiliation(tenantNames.college, tenantNames.central);
         TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVENTORY);
-        InventoryInstances.waitLoading();
+        InventoryInstances.waitContentLoading();
         InventorySearchAndFilter.verifyPanesExist();
         InventoryInstances.searchByTitle(createdAuthorityIDs[0]);
         InventoryInstance.waitInstanceRecordViewOpened(testData.instanceTitle);

diff --git a/...search-in-inventory/title-look-up-plugin-in-requests-app-use-shared-facet-in-member.cy.js b/...search-in-inventory/title-look-up-plugin-in-requests-app-use-shared-facet-in-member.cy.js
@@ -17,6 +17,7 @@ import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation';
 import UserEdit from '../../../../support/fragments/users/userEdit';
 import Users from '../../../../support/fragments/users/users';
 import getRandomPostfix from '../../../../support/utils/stringTools';
+import InventoryInstances from '../../../../support/fragments/inventory/inventoryInstances';
 
 function createFOLIOAndUploadMARCInstanceViaApi(titlesFOLIOInstance, marcFile, createdRecordsIds) {
   titlesFOLIOInstance.forEach((title) => {
@@ -97,6 +98,10 @@ describe('Inventory', () => {
 
     before('Create user, data', () => {
       cy.getAdminToken();
+      InventoryInstances.deleteInstanceByTitleViaApi('C410702');
+      cy.setTenant(Affiliations.University);
+      InventoryInstances.deleteInstanceByTitleViaApi('C410702');
+      cy.resetTenant();
       cy.createTempUser([
         Permissions.uiInventoryViewInstances.gui,
         Permissions.uiRequestsCreate.gui,

diff --git a/cypress/e2e/consortia/marc/marc-authority/marc-authority-edit-central.cy.js b/cypress/e2e/consortia/marc/marc-authority/marc-authority-edit-central.cy.js
@@ -42,6 +42,7 @@ describe('MARC', () => {
       before('Create test data', () => {
         cy.resetTenant();
         cy.getAdminToken();
+        MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405142');
         DataImport.uploadFileViaApi(
           marcFile.marc,
           marcFile.fileName,
@@ -125,6 +126,8 @@ describe('MARC', () => {
 
           ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
           MarcAuthorities.waitLoading();
+          cy.reload();
+          MarcAuthorities.waitLoading();
           ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.college);
           MarcAuthorities.searchBeats(testData.updatedTitle);
           MarcAuthorities.select(createdAuthorityID);

diff --git a/cypress/e2e/consortia/marc/marc-authority/marc-authority-shared-edit-member.cy.js b/cypress/e2e/consortia/marc/marc-authority/marc-authority-shared-edit-member.cy.js
@@ -125,6 +125,8 @@ describe('MARC', () => {
             QuickMarcEditor.clickArrowDownButton(4);
             QuickMarcEditor.verifyTagValue(5, testData.tag010);
             MarcAuthority.clickSaveAndCloseButton();
+            cy.wait(2000);
+            MarcAuthority.clickSaveAndCloseButton();
             QuickMarcEditor.checkDeleteModal(1);
             MarcAuthority.continueWithSaveAndCheck();
             MarcAuthority.contains(testData.updatedTag100Value);

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
@@ -59,6 +59,9 @@ describe('MARC', () => {
 
       before('Create users, data', () => {
         cy.getAdminToken();
+        MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C407654');
+        cy.setTenant(Affiliations.University);
+        MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C407654');
         cy.resetTenant();
         cy.createTempUser([
           Permissions.inventoryAll.gui,
@@ -109,6 +112,8 @@ describe('MARC', () => {
               path: TopMenu.inventoryPath,
               waiter: InventoryInstances.waitContentLoading,
             }).then(() => {
+              cy.reload();
+              InventoryInstances.waitContentLoading();
               ConsortiumManager.switchActiveAffiliation(
                 tenantNames.central,
                 tenantNames.university,

diff --git a/.../e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js b/.../e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-central.cy.js
@@ -105,6 +105,12 @@ describe('MARC', () => {
       before('Create users, data', () => {
         cy.getAdminToken();
         MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C405927');
+        InventoryInstances.deleteInstanceByTitleViaApi('C405927');
+        cy.setTenant(Affiliations.University);
+        InventoryInstances.deleteInstanceByTitleViaApi('C405927');
+        cy.setTenant(Affiliations.College);
+        InventoryInstances.deleteInstanceByTitleViaApi('C405927');
+        cy.resetTenant();
 
         cy.createTempUser([
           Permissions.inventoryAll.gui,

diff --git a/...s/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js b/...s/e2e/consortia/marc/marc-authority/update-shared-linked-marc-auth-record-in-member.cy.js
@@ -104,16 +104,12 @@ describe('MARC', () => {
 
       before('Create users, data', () => {
         cy.getAdminToken();
-        MarcAuthorities.getMarcAuthoritiesViaApi({
-          limit: 100,
-          query: 'keyword="C407633" and (authRefType==("Authorized" or "Auth/Ref"))',
-        }).then((authorities) => {
-          if (authorities) {
-            authorities.forEach(({ id }) => {
-              MarcAuthority.deleteViaAPI(id, true);
-            });
-          }
-        });
+        MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C407633');
+        InventoryInstances.deleteInstanceByTitleViaApi('C407633');
+        cy.setTenant(Affiliations.University);
+        InventoryInstances.deleteInstanceByTitleViaApi('C407633');
+        cy.resetTenant();
+
         cy.createTempUser([
           Permissions.inventoryAll.gui,
           Permissions.uiMarcAuthoritiesAuthorityRecordView.gui,
@@ -169,7 +165,7 @@ describe('MARC', () => {
             cy.resetTenant();
             cy.loginAsAdmin({
               path: TopMenu.inventoryPath,
-              waiter: InventoryInstances.waitLoading,
+              waiter: InventoryInstances.waitContentLoading,
             }).then(() => {
               linkingInTenants.forEach((tenants) => {
                 ConsortiumManager.switchActiveAffiliation(

diff --git a/...aphic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js b/...aphic/create-new-marcBib/manual-linking/link-shared-marcBib-and-marcAuth-on-central.cy.js
@@ -57,9 +57,8 @@ describe('MARC', () => {
 
         before('Create users, data', () => {
           cy.getAdminToken();
-
           MarcAuthorities.deleteMarcAuthorityByTitleViaAPI('C422141');
-
+          InventoryInstances.deleteInstanceByTitleViaApi('C422141');
           cy.createTempUser([
             Permissions.uiInventoryViewInstances.gui,
             Permissions.uiQuickMarcQuickMarcBibliographicEditorCreate.gui,
@@ -70,7 +69,6 @@ describe('MARC', () => {
           ]).then((userProperties) => {
             users.userAProperties = userProperties;
           });
-
           cy.createTempUser([
             Permissions.uiInventoryViewInstances.gui,
             Permissions.uiQuickMarcQuickMarcBibliographicEditorAll.gui,
@@ -91,6 +89,8 @@ describe('MARC', () => {
                 path: TopMenu.dataImportPath,
                 waiter: DataImport.waitLoading,
               });
+              cy.reload();
+              DataImport.waitLoading();
               cy.resetTenant();
               marcFiles.forEach((marcFile) => {
                 DataImport.uploadFileViaApi(

diff --git a/...nsortia/marc/marc-bibliographic/derive-marcBib/derive-from-local-marc-bib-in-member.cy.js b/...nsortia/marc/marc-bibliographic/derive-marcBib/derive-from-local-marc-bib-in-member.cy.js
@@ -88,6 +88,8 @@ describe('MARC', () => {
               ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.central);
               ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
               InventoryInstances.waitContentLoading();
+              cy.reload();
+              InventoryInstances.waitContentLoading();
               ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.college);
             });
           });

diff --git a/...uto-linking-shared-marcBib-with-shared-marcAuth-on-central-shadow-marcBib-in-member.cy.js b/...uto-linking-shared-marcBib-with-shared-marcAuth-on-central-shadow-marcBib-in-member.cy.js
@@ -100,15 +100,8 @@ describe('MARC', () => {
 
         before('Create users, data', () => {
           cy.getAdminToken();
-          MarcAuthorities.getMarcAuthoritiesViaApi({
-            limit: 100,
-            query: 'keyword="C410818" and (authRefType==("Authorized" or "Auth/Ref"))',
-          }).then((authorities) => {
-            if (authorities) {
-              authorities.forEach(({ id }) => {
-                MarcAuthority.deleteViaAPI(id, true);
-              });
-            }
+          ['C410818', 'C410755', 'C410749'].forEach((title) => {
+            MarcAuthorities.deleteMarcAuthorityByTitleViaAPI(title);
           });
 
           cy.createTempUser([
@@ -220,9 +213,11 @@ describe('MARC', () => {
             QuickMarcEditor.verifyTagFieldAfterLinking(...testData.linked600Field_2);
             QuickMarcEditor.verifyTagFieldAfterLinking(...testData.linked650Field);
             QuickMarcEditor.verifyTagFieldAfterUnlinking(...testData.notLinked710Field);
+            QuickMarcEditor.deleteField(4);
             QuickMarcEditor.pressSaveAndClose();
-            cy.wait(1000);
+            cy.wait(2000);
             QuickMarcEditor.pressSaveAndClose();
+            QuickMarcEditor.confirmDelete();
             QuickMarcEditor.checkAfterSaveAndClose();
             InventoryInstance.checkExpectedMARCSource();
 
@@ -234,6 +229,7 @@ describe('MARC', () => {
             InventoryInstance.checkExpectedMARCSource();
             InventoryInstance.editMarcBibliographicRecord();
             QuickMarcEditor.checkPaneheaderContains(testData.editSharedRecordText);
+            QuickMarcEditor.addEmptyFields(4);
             QuickMarcEditor.verifyTagFieldAfterLinking(...testData.linked100Field);
             QuickMarcEditor.verifyTagFieldAfterLinking(...testData.linked600Field_1);
             QuickMarcEditor.verifyTagFieldAfterLinking(...testData.linked600Field_2);

diff --git a/...rtia/marc/marc-bibliographic/edit-marc-bib/edit-subfields-shared-marc-bib-in-member.cy.js b/...rtia/marc/marc-bibliographic/edit-marc-bib/edit-subfields-shared-marc-bib-in-member.cy.js
@@ -134,6 +134,7 @@ describe('MARC', () => {
             QuickMarcEditor.updateExistingField(testData.tag100, testData.tag100UpdatedContent);
             QuickMarcEditor.checkContentByTag(testData.tag100, testData.tag100UpdatedContent);
             QuickMarcEditor.clickSaveAndKeepEditingButton();
+            QuickMarcEditor.clickSaveAndKeepEditingButton();
             QuickMarcEditor.confirmDeletingFields();
             QuickMarcEditor.checkAfterSaveAndKeepEditing();
             QuickMarcEditor.checkContentByTag(testData.tag100, testData.tag100UpdatedContent);

diff --git a/...phic/edit-marc-bib/manual-linking/link-local-marcBib-with-shared-marcAuth-in-member.cy.js b/...phic/edit-marc-bib/manual-linking/link-local-marcBib-with-shared-marcAuth-in-member.cy.js
@@ -130,7 +130,11 @@ describe('MARC', () => {
                     linkingTagAndValues.tag,
                     linkingTagAndValues.rowIndex,
                   );
+                  QuickMarcEditor.deleteField(4);
                   QuickMarcEditor.pressSaveAndClose();
+                  cy.wait(2000);
+                  QuickMarcEditor.pressSaveAndClose();
+                  QuickMarcEditor.confirmDelete();
                   QuickMarcEditor.checkAfterSaveAndClose();
                 });
 
@@ -199,7 +203,9 @@ describe('MARC', () => {
               linkingTagAndValues.zeroSubfield,
               linkingTagAndValues.seventhBox,
             );
+            QuickMarcEditor.clickSaveAndKeepEditingButton();
             QuickMarcEditor.clickSaveAndKeepEditing();
+
             QuickMarcEditor.openLinkingAuthorityByIndex(16);
             MarcAuthorities.checkFieldAndContentExistence(
               linkingTagAndValues.tag,

diff --git a/...ic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-central.cy.js b/...ic/edit-marc-bib/manual-linking/link-shared-marcBib-with-shared-marcAuth-in-central.cy.js
@@ -174,6 +174,10 @@ describe('MARC', () => {
               linkingTagAndValues.zeroSubfield,
               linkingTagAndValues.seventhBox,
             );
+            QuickMarcEditor.deleteField(4);
+            QuickMarcEditor.pressSaveAndClose();
+            QuickMarcEditor.confirmDelete();
+            cy.wait(2000);
             QuickMarcEditor.pressSaveAndClose();
             QuickMarcEditor.checkAfterSaveAndClose();
             InventoryInstance.checkPresentedText(testData.updatedInstanceTitle);

diff --git a/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/marc-bib-edit-in-central.cy.js b/cypress/e2e/consortia/marc/marc-bibliographic/edit-marc-bib/marc-bib-edit-in-central.cy.js
@@ -99,6 +99,8 @@ describe('MARC', () => {
           QuickMarcEditor.updateExistingField(testData.tag500, testData.tag500UpdatedValue);
           QuickMarcEditor.moveFieldUp(18);
           QuickMarcEditor.pressSaveAndClose();
+          cy.wait(1500);
+          QuickMarcEditor.pressSaveAndClose();
           QuickMarcEditor.checkAfterSaveAndClose();
           InventoryInstance.checkInstanceTitle(testData.updatedTitle);
           InventoryInstance.verifyLastUpdatedSource(
@@ -111,6 +113,9 @@ describe('MARC', () => {
             waiter: InventoryInstances.waitContentLoading,
           });
           ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
+          InventoryInstances.waitContentLoading();
+          cy.reload();
+          InventoryInstances.waitContentLoading();
           InventoryInstances.searchByTitle(createdInstanceID);
           InventoryInstances.selectInstance();
           InventoryInstance.checkInstanceTitle(testData.updatedTitle);

diff --git a/...sortia/marc/marc-bibliographic/edit-marc-bib/user-can-edit-local-marc-bib-in-member.cy.js b/...sortia/marc/marc-bibliographic/edit-marc-bib/user-can-edit-local-marc-bib-in-member.cy.js
@@ -39,6 +39,8 @@ describe('MARC', () => {
 
       before('Create users, data', () => {
         cy.getAdminToken();
+        cy.setTenant(Affiliations.University);
+        InventoryInstances.deleteInstanceByTitleViaApi('C405549');
         cy.resetTenant();
         cy.createTempUser([
           Permissions.inventoryAll.gui,
@@ -105,6 +107,8 @@ describe('MARC', () => {
           QuickMarcEditor.updateExistingField(testData.tag245, `$a ${testData.tag245Content}`);
           QuickMarcEditor.updateExistingField(testData.tag500, `$a ${testData.tag500Content}`);
           QuickMarcEditor.pressSaveAndClose();
+          cy.wait(1200);
+          QuickMarcEditor.pressSaveAndClose();
           QuickMarcEditor.checkAfterSaveAndClose();
           InventoryInstance.checkInstanceTitle(testData.tag245Content);
           InventoryInstance.viewSource();

diff --git a/cypress/e2e/eureka/authorization-roles/view-edit-role.cy.js b/cypress/e2e/eureka/authorization-roles/view-edit-role.cy.js
@@ -7,10 +7,10 @@ describe('Eureka', () => {
   describe('Settings', () => {
     describe('Authorization roles', () => {
       const testData = {
-        roleName: `Auto Role C424001 ${getRandomPostfix()}`,
-        roleDescription: `Description C424001 ${getRandomPostfix()}`,
-        updatedRoleName: `Auto Role C424001 ${getRandomPostfix()} UPD`,
-        updatedRoleDescription: `Description C424001 ${getRandomPostfix()} UPD`,
+        roleName: `Auto Role C627446 ${getRandomPostfix()}`,
+        roleDescription: `Description C627446 ${getRandomPostfix()}`,
+        updatedRoleName: `Auto Role C627446 ${getRandomPostfix()} UPD`,
+        updatedRoleDescription: `Description C627446 ${getRandomPostfix()} UPD`,
         originalCapabilitySets: [
           {
             application: 'app-platform-complete',
@@ -227,7 +227,7 @@ describe('Eureka', () => {
       });
 
       it(
-        'C424001 Viewing/editing existing authorization role',
+        'C627446 Viewing/editing existing authorization role',
         { tags: ['criticalPath', 'eureka', 'eurekaPhase1', 'C424001'] },
         () => {
           const roleViewUrl = `${Cypress.config().baseUrl}${TopMenu.settingsAuthorizationRoles}/${