Poppy folijet fix (#3393)

* added waiters * fixed tests
folio-org · Mar 28, 2024 · 06c2759 · 06c2759
1 parent 3dffac6
commit 06c2759
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 22 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
@@ -76,11 +76,14 @@ describe('data-import', () => {
         DataImport.getLogsHrIdsFromUI(numberOfLogsToDelete).then((logsHrIdsToBeDeleted) => {
           // verify that user can cancel deletion of logs
           DataImport.selectAllLogs();
+          cy.wait(2000);
           DataImport.verifyAllLogsCheckedStatus({ logsCount: numberOfLogsPerPage, checked: true });
           DataImport.verifyLogsPaneSubtitleExist(numberOfLogsPerPage);
           DataImport.openDeleteImportLogsModal();
           DataImport.cancelDeleteImportLogs();
+          cy.wait(2000);
           DataImport.verifyAllLogsCheckedStatus({ logsCount: numberOfLogsPerPage, checked: false });
+          cy.wait(2000);
           DataImport.verifyLogsPaneSubtitleAbsent();
           DataImport.verifyDeleteLogsButtonDisabled();
 

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
@@ -31,15 +31,18 @@ describe('data-import', () => {
         firstUser = userProperties;
 
         const fileName = `C358136 fileName${getRandomPostfix()}.mrc`;
-        cy.login(firstUser.username, firstUser.password);
+        cy.login(firstUser.username, firstUser.password, {
+          path: TopMenu.dataImportPath,
+          waiter: DataImport.waitLoading,
+        });
+
         DataImport.verifyUploadState();
         DataImport.waitLoading();
         DataImport.uploadFile('oneMarcBib.mrc', fileName);
         JobProfiles.waitFileIsUploaded();
         JobProfiles.search('Default - Create instance and SRS MARC Bib');
         JobProfiles.runImportFile();
         JobProfiles.waitFileIsImported(fileName);
-        cy.logout();
       });
 
       cy.createTempUser([

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
@@ -266,15 +266,15 @@ describe('data-import', () => {
     });
 
     const openOrder = (number) => {
-      Orders.resetFilters();
+      Orders.clearSearchField();
       Orders.searchByParameter('PO number', number);
       Orders.selectFromResultsList(number);
       Orders.openOrder();
     };
 
     const checkReceivedPiece = (number, title) => {
       cy.visit(TopMenu.ordersPath);
-      Orders.resetFilters();
+      Orders.clearSearchField();
       Orders.searchByParameter('PO number', number);
       Orders.selectFromResultsList(number);
       OrderDetails.openPolDetails(title);
@@ -309,6 +309,8 @@ describe('data-import', () => {
 
           cy.wait(2000);
           Orders.checkIsOrderCreated(firstOrderNumber);
+          Orders.resetFilters();
+          cy.wait(2000);
           // open the first PO with POL
           openOrder(firstOrderNumber);
           Orders.selectStatusInSearch(ORDER_STATUSES.OPEN);

diff --git a/cypress/e2e/data-import/importing-marc-bib-files/import-a-bunch-of-marc-files-at-once.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/import-a-bunch-of-marc-files-at-once.cy.js
@@ -43,6 +43,7 @@ describe('data-import', () => {
 
           Logs.openViewAllLogs();
           LogsViewAll.viewAllIsOpened();
+          cy.wait(20000);
           LogsViewAll.selectOption('Keyword (ID, File name)');
           LogsViewAll.searchWithTerm(upload.fileName);
           LogsViewAll.verifyQuantityOfLogs(upload.quantityOfFiles);

diff --git a/...ib-files/mapping-for-the-856-field-maintains-relationship-between-url-and-link-test.cy.js b/...ib-files/mapping-for-the-856-field-maintains-relationship-between-url-and-link-test.cy.js
@@ -93,6 +93,11 @@ describe('data-import', () => {
     };
 
     before('login', () => {
+      cy.getAdminToken();
+      NewInstanceStatusType.createViaApi().then((initialInstanceStatusType) => {
+        testData.instanceStatusTypeId = initialInstanceStatusType.body.id;
+      });
+
       cy.createTempUser([
         Permissions.moduleDataImportEnabled.gui,
         Permissions.settingsDataImportEnabled.gui,
@@ -101,9 +106,6 @@ describe('data-import', () => {
       ]).then((userProperties) => {
         user = userProperties;
 
-        NewInstanceStatusType.createViaApi().then((initialInstanceStatusType) => {
-          testData.instanceStatusTypeId = initialInstanceStatusType.body.id;
-        });
         cy.login(user.username, user.password, {
           path: SettingsMenu.mappingProfilePath,
           waiter: FieldMappingProfiles.waitLoading,

diff --git a/...ort/importing-marc-bib-files/protected-fields-in-incoming-records-not-deleted-scen2.cy.js b/...ort/importing-marc-bib-files/protected-fields-in-incoming-records-not-deleted-scen2.cy.js
@@ -85,8 +85,6 @@ describe('data-import', () => {
         user = userProperties;
 
         cy.login(user.username, user.password);
-
-        Z3950TargetProfiles.changeOclcWorldCatToDefaultViaApi();
       });
     });
 

diff --git a/cypress/e2e/data-import/importing-marc-bib-files/test-remove-field-mapping-option.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/test-remove-field-mapping-option.cy.js
@@ -435,13 +435,10 @@ describe('data-import', () => {
 
             cy.visit(TopMenu.inventoryPath);
             InventorySearchAndFilter.searchInstanceByHRID(initialInstanceHrId);
+            InventoryInstance.openHoldingView();
             HoldingsRecordView.checkTemporaryLocation('-');
             HoldingsRecordView.checkDigitizationPolicy('-');
             HoldingsRecordView.close();
-            InventoryInstance.openHoldingsAccordion(
-              collectionOfMappingAndActionProfilesForCreate[1].mappingProfile
-                .permanentLocationInHoldingsAccordion,
-            );
             InventoryInstance.openItemByBarcode(itemBarcode);
             ItemRecordView.checkAccessionNumber('-');
             ItemRecordView.verifyNumberOfPieces('-');

diff --git a/...es/error-displayed-when-import-used-job-profile-that-does-not-support-marc-holdings.cy.js b/...es/error-displayed-when-import-used-job-profile-that-does-not-support-marc-holdings.cy.js
@@ -41,7 +41,6 @@ describe('data-import', () => {
       InventoryInstance.getAssignedHRID().then((initialInstanceHrId) => {
         instanceHrid = initialInstanceHrId;
       });
-      cy.logout();
 
       cy.createTempUser([Permissions.moduleDataImportEnabled.gui]).then((userProperties) => {
         user = userProperties;

diff --git a/...les/import-to-create-marc-holdings-records-when-incoming-records-have-999-ff-fields.cy.js b/...les/import-to-create-marc-holdings-records-when-incoming-records-have-999-ff-fields.cy.js
@@ -38,7 +38,6 @@ describe('data-import', () => {
       InventoryInstance.getAssignedHRID().then((initialInstanceHrId) => {
         instanceHrid = initialInstanceHrId;
       });
-      cy.logout();
 
       cy.createTempUser([
         Permissions.inventoryAll.gui,

diff --git a/...r-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js b/...r-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js
@@ -28,7 +28,7 @@ describe('data-import', () => {
   describe('Permissions', () => {
     let user;
     const filePath = 'marcBibFileForC377023.mrc';
-    const marcFileName = `C377023 autotestFileName ${getRandomPostfix()}`;
+    const marcFileName = `C377023 autotestFileName${getRandomPostfix()}.mrc`;
     const title = 'ROALD DAHL : TELLER OF THE UNEXPECTED : A BIOGRAPHY.';
 
     const mappingProfile = {
@@ -112,7 +112,6 @@ describe('data-import', () => {
       JobProfiles.runImportFile();
       JobProfiles.waitFileIsImported(marcFileName);
       Logs.checkStatusOfJobProfile(JOB_STATUS_NAMES.COMPLETED);
-      cy.logout();
 
       cy.createTempUser([Permissions.moduleDataImportEnabled.gui]).then((userProperties) => {
         user = userProperties;

diff --git a/cypress/e2e/data-import/permissions/data-import-permissions.cy.js b/cypress/e2e/data-import/permissions/data-import-permissions.cy.js
@@ -23,14 +23,14 @@ describe('data-import', () => {
         user = userProperties;
 
         cy.login(user.username, user.password);
+        cy.visit(TopMenu.dataImportPath);
         DataImport.verifyUploadState();
         DataImport.waitLoading();
         DataImport.uploadFile('oneMarcBib.mrc', fileName);
         JobProfiles.waitFileIsUploaded();
         JobProfiles.search('Default - Create instance and SRS MARC Bib');
         JobProfiles.runImportFile();
         JobProfiles.waitFileIsImported(fileName);
-        // DataImport.uploadFileViaApi('oneMarcBib.mrc', fileName);
       });
     });
 

diff --git a/cypress/e2e/data-import/permissions/user-with-limited-permissions-can-import-file.cy.js b/cypress/e2e/data-import/permissions/user-with-limited-permissions-can-import-file.cy.js
@@ -146,7 +146,6 @@ describe('data-import', () => {
         NewJobProfile.saveAndClose();
         JobProfiles.checkJobProfilePresented(jobProfile.profileName);
 
-        cy.logout();
         cy.login(secondUser.username, secondUser.password, {
           path: SettingsMenu.mappingProfilePath,
           waiter: FieldMappingProfiles.waitLoading,

diff --git a/cypress/e2e/inventory/cataloging/create-instance-holdings-and-item.cy.js b/cypress/e2e/inventory/cataloging/create-instance-holdings-and-item.cy.js
@@ -31,6 +31,7 @@ describe('inventory', () => {
 
     after('Delete test data', () => {
       cy.getAdminToken().then(() => {
+        cy.wait(5000);
         InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(testData.barcode);
         Users.deleteViaApi(testData.user.userId);
       });

diff --git a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-existing-title.cy.js b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-existing-title.cy.js
@@ -47,6 +47,7 @@ describe('inventory', () => {
     after('delete test data', () => {
       cy.getAdminToken().then(() => {
         Users.deleteViaApi(user.userId);
+        cy.wait(5000);
         InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(testData.barcode);
       });
     });

diff --git a/...e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js b/...e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js
@@ -69,7 +69,6 @@ describe('inventory', () => {
         // Change the Call number -> Click "Save & Close" button
         HoldingsRecordEdit.fillCallNumber(testData.callNumber);
         HoldingsRecordEdit.saveAndClose({ holdingSaved: true });
-        HoldingsRecordView.close();
         InventoryInstance.checkIsHoldingsCreated([
           `${testData.location.name} >  ${testData.callNumber}`,
         ]);

diff --git a/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js b/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js
@@ -37,6 +37,7 @@ describe('inventory', () => {
 
     afterEach(() => {
       cy.getAdminToken().then(() => {
+        cy.wait(5000);
         cy.getInstance({ limit: 1, expandAll: true, query: `"title"=="${instanceTitle}"` }).then(
           (instance) => {
             cy.deleteHoldingRecordViaApi(instance.holdings[0].id);
@@ -49,7 +50,7 @@ describe('inventory', () => {
     });
 
     it(
-      'C1294: Create a Holdings record as another user than the one that created the Instance (folijet)',
+      'C1294 Create a Holdings record as another user than the one that created the Instance (folijet)',
       { tags: ['smoke', 'folijet'] },
       () => {
         const InventoryNewInstance = InventoryInstances.addNewInventory();

diff --git a/cypress/support/fragments/orders/orders.js b/cypress/support/fragments/orders/orders.js
@@ -76,7 +76,9 @@ export default {
   waitLoading() {
     cy.expect([ordersFiltersPane.exists(), ordersResultsPane.exists()]);
   },
-
+  clearSearchField() {
+    cy.get('#input-record-search').clear();
+  },
   waitSettingsPageLoading() {
     cy.expect([
       Pane({ id: 'settings-nav-pane' }).exists(),