FAT-7200 (#1419)

* fixed tests * added reload * fixed C17018, C6707, C3506 * deleted retries * changed all methods getting instance hrid via api * added cy.reload in all tests with import
folio-org · Jul 28, 2023 · 7ee5c1b · 7ee5c1b
1 parent 64fa1df
commit 7ee5c1b
Show file tree

Hide file tree

Showing 71 changed files with 585 additions and 412 deletions.
diff --git a/cypress/e2e/data-import/e2e/delete-all-logs-from-landing-page.cy.js b/cypress/e2e/data-import/e2e/delete-all-logs-from-landing-page.cy.js
@@ -41,6 +41,7 @@ describe('ui-data-import', () => {
           fileNameToUpload = `C358137autotestFile.${getRandomPostfix()}.mrc`;
           // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
           DataImport.verifyUploadState();
+          cy.reload();
           DataImport.waitLoading();
           DataImport.uploadFile(filePath, fileNameToUpload);
           JobProfiles.searchJobProfileForImport(jobProfileToRun);

diff --git a/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js b/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js
@@ -93,6 +93,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile('ediFileForC343338.edi', fileName);
       JobProfiles.searchJobProfileForImport(jobProfile.profileName);
       JobProfiles.selectJobProfile();

diff --git a/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js b/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js
@@ -75,6 +75,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile('ediFileForC347615.edi', fileName);
     DataImport.waitFileIsUploaded();
     JobProfiles.searchJobProfileForImport(jobProfile.profileName);

diff --git a/cypress/e2e/data-import/e2e/field-protection-overrides.cy.js b/cypress/e2e/data-import/e2e/field-protection-overrides.cy.js
@@ -245,6 +245,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile('marcFileForC17018-BeforeOverride.mrc', fileNameForCreatingInstance);
     JobProfiles.searchJobProfileForImport(jobProfileToRun);
     JobProfiles.runImportFile();
@@ -256,72 +257,74 @@ describe('ui-data-import', () => {
     });
     FileDetails.checkSrsRecordQuantityInSummaryTable('1', 0);
     FileDetails.checkInstanceQuantityInSummaryTable('1', 0);
-
-    // get Instance HRID through API
-    InventorySearchAndFilter.getInstanceHRID()
-      .then(hrId => {
-        instanceHrid = hrId[0];
-        DataImport.editMarcFile(fileForEditRev1, editedFileNameRev1, [instanceHridFromFile], [instanceHrid]);
-        DataImport.editMarcFile(fileForEditRev2, editedFileNameRev2, [instanceHridFromFile], [instanceHrid]);
-
-        // upload a marc file
-        cy.visit(TopMenu.dataImportPath);
-        // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
-        DataImport.verifyUploadState();
-        DataImport.uploadFile(editedFileNameRev1, fileNameForProtect);
-        JobProfiles.searchJobProfileForImport(jobProfileForUpdate.profileName);
-        JobProfiles.runImportFile();
-        JobProfiles.waitFileIsImported(fileNameForProtect);
-        Logs.checkStatusOfJobProfile(JOB_STATUS_NAMES.COMPLETED);
-        Logs.openFileDetails(fileNameForProtect);
-        [FileDetails.columnNameInResultList.srsMarc, FileDetails.columnNameInResultList.instance].forEach(columnName => {
-          FileDetails.checkStatusInColumn(FileDetails.status.updated, columnName);
-        });
-        FileDetails.checkSrsRecordQuantityInSummaryTable('1', 1);
-        FileDetails.checkInstanceQuantityInSummaryTable('1', 1);
-
-        cy.visit(TopMenu.inventoryPath);
-        InventorySearchAndFilter.searchInstanceByHRID(instanceHrid);
-        InstanceRecordView.verifyAdministrativeNote(administrativeNote);
-        InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[0].type, resourceIdentifiers[0].value, 0);
-        InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[1].type, resourceIdentifiers[1].value, 2);
-        InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[2].type, resourceIdentifiers[2].value, 1);
-        InstanceRecordView.verifyInstanceNote(instanceNote);
-        // verify table data in marc bibliographic source
-        InventoryInstance.viewSource();
-        resourceIdentifiers.forEach(element => {
-          InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.firstField, element.value);
-        });
-        InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.secondField, instanceNote);
-
-        // upload a marc file
-        cy.visit(TopMenu.dataImportPath);
-        // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
-        DataImport.verifyUploadState();
-        DataImport.uploadFile(editedFileNameRev2, fileNameForOverride);
-        JobProfiles.searchJobProfileForImport(jobProfileForOverride.profileName);
-        JobProfiles.runImportFile();
-        JobProfiles.waitFileIsImported(fileNameForOverride);
-        Logs.checkStatusOfJobProfile(JOB_STATUS_NAMES.COMPLETED);
-        Logs.openFileDetails(fileNameForOverride);
-        [FileDetails.columnNameInResultList.srsMarc, FileDetails.columnNameInResultList.instance].forEach(columnName => {
-          FileDetails.checkStatusInColumn(FileDetails.status.updated, columnName);
-        });
-        FileDetails.checkSrsRecordQuantityInSummaryTable('1', 1);
-        FileDetails.checkInstanceQuantityInSummaryTable('1', 1);
-
-        cy.visit(TopMenu.inventoryPath);
-        InventorySearchAndFilter.searchInstanceByHRID(instanceHrid);
-        InstanceRecordView.verifyAdministrativeNote(administrativeNote);
-        InstanceRecordView.verifyAdministrativeNote(updatedAdministativeNote);
-        resourceIdentifiers.forEach(element => {
-          InventoryInstance.verifyResourceIdentifierAbsent(element.value);
-        });
-        InstanceRecordView.verifyInstanceNote(updatedInstanceNote);
-        // verify table data in marc bibliographic source
-        InventoryInstance.viewSource();
-        InventoryViewSource.notContains(`${protectedFields.firstField}\t`);
-        InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.secondField, updatedInstanceNote);
+    // open Instance for getting hrid
+    FileDetails.openInstanceInInventory('Created');
+    InventoryInstance.getAssignedHRID().then(initialInstanceHrId => {
+      instanceHrid = initialInstanceHrId;
+
+      DataImport.editMarcFile(fileForEditRev1, editedFileNameRev1, [instanceHridFromFile], [instanceHrid]);
+      DataImport.editMarcFile(fileForEditRev2, editedFileNameRev2, [instanceHridFromFile], [instanceHrid]);
+
+      // upload a marc file
+      cy.visit(TopMenu.dataImportPath);
+      // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
+      DataImport.verifyUploadState();
+      cy.reload();
+      DataImport.uploadFile(editedFileNameRev1, fileNameForProtect);
+      JobProfiles.searchJobProfileForImport(jobProfileForUpdate.profileName);
+      JobProfiles.runImportFile();
+      JobProfiles.waitFileIsImported(fileNameForProtect);
+      Logs.checkStatusOfJobProfile(JOB_STATUS_NAMES.COMPLETED);
+      Logs.openFileDetails(fileNameForProtect);
+      [FileDetails.columnNameInResultList.srsMarc, FileDetails.columnNameInResultList.instance].forEach(columnName => {
+        FileDetails.checkStatusInColumn(FileDetails.status.updated, columnName);
+      });
+      FileDetails.checkSrsRecordQuantityInSummaryTable('1', 1);
+      FileDetails.checkInstanceQuantityInSummaryTable('1', 1);
+
+      cy.visit(TopMenu.inventoryPath);
+      InventorySearchAndFilter.searchInstanceByHRID(instanceHrid);
+      InstanceRecordView.verifyAdministrativeNote(administrativeNote);
+      InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[0].type, resourceIdentifiers[0].value, 0);
+      InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[1].type, resourceIdentifiers[1].value, 2);
+      InventoryInstance.verifyResourceIdentifier(resourceIdentifiers[2].type, resourceIdentifiers[2].value, 1);
+      InstanceRecordView.verifyInstanceNote(instanceNote);
+      // verify table data in marc bibliographic source
+      InventoryInstance.viewSource();
+      resourceIdentifiers.forEach(element => {
+        InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.firstField, element.value);
+      });
+      InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.secondField, instanceNote);
+
+      // upload a marc file
+      cy.visit(TopMenu.dataImportPath);
+      // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
+      DataImport.verifyUploadState();
+      cy.reload();
+      DataImport.uploadFile(editedFileNameRev2, fileNameForOverride);
+      JobProfiles.searchJobProfileForImport(jobProfileForOverride.profileName);
+      JobProfiles.runImportFile();
+      JobProfiles.waitFileIsImported(fileNameForOverride);
+      Logs.checkStatusOfJobProfile(JOB_STATUS_NAMES.COMPLETED);
+      Logs.openFileDetails(fileNameForOverride);
+      [FileDetails.columnNameInResultList.srsMarc, FileDetails.columnNameInResultList.instance].forEach(columnName => {
+        FileDetails.checkStatusInColumn(FileDetails.status.updated, columnName);
       });
+      FileDetails.checkSrsRecordQuantityInSummaryTable('1', 1);
+      FileDetails.checkInstanceQuantityInSummaryTable('1', 1);
+
+      cy.visit(TopMenu.inventoryPath);
+      InventorySearchAndFilter.searchInstanceByHRID(instanceHrid);
+      InstanceRecordView.verifyAdministrativeNote(administrativeNote);
+      InstanceRecordView.verifyAdministrativeNote(updatedAdministativeNote);
+      resourceIdentifiers.forEach(element => {
+        InventoryInstance.verifyResourceIdentifierAbsent(element.value);
+      });
+      InstanceRecordView.verifyInstanceNote(updatedInstanceNote);
+      // verify table data in marc bibliographic source
+      InventoryInstance.viewSource();
+      InventoryViewSource.notContains(`${protectedFields.firstField}\t`);
+      InventoryViewSource.verifyFieldInMARCBibSource(protectedFields.secondField, updatedInstanceNote);
+    });
   });
 });
diff --git a/cypress/e2e/data-import/e2e/field-protection-settings.cy.js b/cypress/e2e/data-import/e2e/field-protection-settings.cy.js
@@ -17,7 +17,6 @@ import Logs from '../../../support/fragments/data_import/logs/logs';
 import FileDetails from '../../../support/fragments/data_import/logs/fileDetails';
 import InstanceRecordView from '../../../support/fragments/inventory/instanceRecordView';
 import MarcFieldProtection from '../../../support/fragments/settings/dataImport/marcFieldProtection';
-import InventorySearchAndFilter from '../../../support/fragments/inventory/inventorySearchAndFilter';
 import MatchProfiles from '../../../support/fragments/data_import/match_profiles/matchProfiles';
 import NewMatchProfile from '../../../support/fragments/data_import/match_profiles/newMatchProfile';
 import InventoryViewSource from '../../../support/fragments/inventory/inventoryViewSource';
@@ -156,6 +155,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile('marcFileForC17017.mrc', nameMarcFileForCreate);
     JobProfiles.searchJobProfileForImport(jobProfile.profileName);
     JobProfiles.runImportFile();
@@ -167,24 +167,23 @@ describe('ui-data-import', () => {
     FileDetails.checkSrsRecordQuantityInSummaryTable('1');
     FileDetails.checkInstanceQuantityInSummaryTable('1');
     Logs.clickOnHotLink(0, 3, 'Created');
-    InstanceRecordView.viewSource();
-    InstanceRecordView.verifySrsMarcRecord();
-    InventoryViewSource.verifyFieldInMARCBibSource('500', dataForField500);
-    InventoryViewSource.verifyFieldInMARCBibSource(marcFieldProtected[0], dataForField507);
-    InventoryViewSource.verifyFieldInMARCBibSource(marcFieldProtected[1], dataForField920);
-
-    // get Instance HRID through API
-    InventorySearchAndFilter.getInstanceHRID()
-      .then(hrId => {
-        instanceHrid = hrId[0];
-        // change file using order number
-        DataImport.editMarcFile(
-          'marcFileForC17017.mrc',
-          editedMarcFileName,
-          [dataFromField001, dataForField500, dataForField507, dataForField920],
-          [instanceHrid, updateDataForField500, updateDataForField507, updateDataForField920]
-        );
-      });
+    InventoryInstance.getAssignedHRID().then(initialInstanceHrId => {
+      instanceHrid = initialInstanceHrId;
+      InstanceRecordView.viewSource();
+      InstanceRecordView.verifySrsMarcRecord();
+      InventoryViewSource.verifyFieldInMARCBibSource('500', dataForField500);
+      InventoryViewSource.verifyFieldInMARCBibSource(marcFieldProtected[0], dataForField507);
+      InventoryViewSource.verifyFieldInMARCBibSource(marcFieldProtected[1], dataForField920);
+
+
+      // change file using order number
+      DataImport.editMarcFile(
+        'marcFileForC17017.mrc',
+        editedMarcFileName,
+        [dataFromField001, dataForField500, dataForField507, dataForField920],
+        [instanceHrid, updateDataForField500, updateDataForField507, updateDataForField920]
+      );
+    });
 
     // create mapping profile for update
     cy.visit(SettingsMenu.mappingProfilePath);
@@ -209,6 +208,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile(editedMarcFileName, fileNameForUpdate);
     JobProfiles.searchJobProfileForImport(jobProfileUpdate.profileName);
     JobProfiles.runImportFile();

diff --git a/cypress/e2e/data-import/e2e/filter-and-delete-import-logs-on-view-all.cy.js b/cypress/e2e/data-import/e2e/filter-and-delete-import-logs-on-view-all.cy.js
@@ -63,6 +63,7 @@ describe('ui-data-import', () => {
 
           // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
           DataImport.verifyUploadState();
+          cy.reload();
           DataImport.uploadFile('oneMarcAuthority.mrc', nameMarcFileForCreate);
           // need to wait until file will be uploaded in loop
           cy.wait(8000);

diff --git a/cypress/e2e/data-import/e2e/match-on-holdings-856-u.cy.js b/cypress/e2e/data-import/e2e/match-on-holdings-856-u.cy.js
@@ -155,6 +155,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile('marcFileForC17025.mrc', nameForCreateMarcFile);
     JobProfiles.searchJobProfileForImport(createInstanceAndEHoldingsJobProfile.profileName);
     JobProfiles.runImportFile();
@@ -171,6 +172,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile('marcFileForC17025.mrc', nameForUpdateCreateMarcFile);
       JobProfiles.searchJobProfileForImport(updateEHoldingsJobProfile.profileName);
       JobProfiles.runImportFile();

diff --git a/cypress/e2e/data-import/e2e/match-on-instance-identifier-scen1.cy.js b/cypress/e2e/data-import/e2e/match-on-instance-identifier-scen1.cy.js
@@ -104,6 +104,7 @@ describe('ui-data-import', () => {
     { tags: [TestTypes.criticalPath, DevTeams.folijet] }, () => {
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile('marcFileForMatchOnIdentifierForCreate.mrc', fileNameForCreateInstance);
       JobProfiles.searchJobProfileForImport(jobProfileToRun);
       JobProfiles.runImportFile();
@@ -143,6 +144,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile('marcFileForMatchOnIdentifierForUpdate_1.mrc', fileNameForUpdateInstance);
       JobProfiles.searchJobProfileForImport(jobProfile.profileName);
       JobProfiles.runImportFile();

diff --git a/cypress/e2e/data-import/e2e/match-on-instance-identifier-scen2.cy.js b/cypress/e2e/data-import/e2e/match-on-instance-identifier-scen2.cy.js
@@ -107,6 +107,7 @@ describe('ui-data-import', () => {
   it('C347829 MODDICORE-231 "Match on Instance identifier match meets both the Identifier type and Data requirements" Scenario 2 (folijet)', { tags: [TestTypes.criticalPath, DevTeams.folijet] }, () => {
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile(filePathForCreateInstance, fileNameForCreateInstance);
     JobProfiles.searchJobProfileForImport(jobProfileToRun);
     JobProfiles.runImportFile();
@@ -145,6 +146,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile(filePathForUpdateInstance, fileNameForUpdateInstance);
     JobProfiles.searchJobProfileForImport(jobProfile.profileName);
     JobProfiles.runImportFile();

diff --git a/cypress/e2e/data-import/e2e/match-on-pol-and-update-instance.cy.js b/cypress/e2e/data-import/e2e/match-on-pol-and-update-instance.cy.js
@@ -227,6 +227,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile('marcFileForC350944.mrc', nameMarcFileForCreate);
       JobProfiles.searchJobProfileForImport(jobProfileToRun);
       JobProfiles.runImportFile();
@@ -256,6 +257,7 @@ describe('ui-data-import', () => {
       DataImport.checkIsLandingPageOpened();
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.uploadFile(editedMarcFileName, marcFileName);
       JobProfiles.searchJobProfileForImport(jobProfile.profileName);
       JobProfiles.runImportFile();

diff --git a/cypress/e2e/data-import/e2e/match-on-pol-and-update-items.cy.js b/cypress/e2e/data-import/e2e/match-on-pol-and-update-items.cy.js
@@ -343,6 +343,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.checkIsLandingPageOpened();
       DataImport.uploadFile(editedMarcFileName);
       JobProfiles.searchJobProfileForImport(specialJobProfile.profileName);

diff --git a/cypress/e2e/data-import/e2e/match-on-vrn-and-update-items.cy.js b/cypress/e2e/data-import/e2e/match-on-vrn-and-update-items.cy.js
@@ -240,6 +240,7 @@ describe('ui-data-import', () => {
       cy.visit(TopMenu.dataImportPath);
       // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
       DataImport.verifyUploadState();
+      cy.reload();
       DataImport.checkIsLandingPageOpened();
       DataImport.uploadFile(editedMarcFileName);
       JobProfiles.searchJobProfileForImport(jobProfilesData.name);

diff --git a/cypress/e2e/data-import/e2e/mrc-import-file-for-create-items.cy.js b/cypress/e2e/data-import/e2e/mrc-import-file-for-create-items.cy.js
@@ -130,6 +130,7 @@ describe('ui-data-import', () => {
     cy.visit(TopMenu.dataImportPath);
     // TODO delete function after fix https://issues.folio.org/browse/MODDATAIMP-691
     DataImport.verifyUploadState();
+    cy.reload();
     DataImport.uploadFile('oneMarcBib.mrc', fileName);
     JobProfiles.searchJobProfileForImport(specialJobProfile.profileName);
     JobProfiles.runImportFile();