added waiter (#3600)

* added waiter * fixed ECS tests * fixed tests
folio-org · May 9, 2024 · 35a1b4c · 35a1b4c
1 parent c0e0bd1
commit 35a1b4c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 20 deletions.
diff --git a/...ortia/inventory/instance/behavior-of-view-holdings-option-on-member-shared-instance.cy.js b/...ortia/inventory/instance/behavior-of-view-holdings-option-on-member-shared-instance.cy.js
@@ -39,7 +39,7 @@ describe('Inventory', () => {
             testData.instanceId = response[0].instance.id;
 
             InventoryInstance.shareInstanceViaApi(
-              testData.response[0].instance.id,
+              testData.instanceId,
               testData.consortiaId,
               Affiliations.College,
               Affiliations.Consortia,
@@ -51,7 +51,7 @@ describe('Inventory', () => {
             Locations.createViaApi(collegeLocationData).then((location) => {
               testData.collegeLocation = location;
               InventoryHoldings.createHoldingRecordViaApi({
-                instanceId: testData.instanceIds[0],
+                instanceId: testData.instanceId,
                 permanentLocationId: testData.collegeLocation.id,
               }).then((holding) => {
                 testData.holding = holding;
@@ -90,7 +90,6 @@ describe('Inventory', () => {
       InventoryHoldings.deleteHoldingRecordViaApi(testData.holding.id);
       Locations.deleteViaApi(testData.collegeLocation);
       InventoryInstance.deleteInstanceViaApi(testData.instanceId);
-      InventoryInstance.deleteInstanceViaApi(testData.instanceId);
     });
 
     it(

diff --git a/...ss/e2e/consortia/inventory/instance/header-shared-instance-edit-page-central-tenant.cy.js b/...ss/e2e/consortia/inventory/instance/header-shared-instance-edit-page-central-tenant.cy.js
@@ -31,6 +31,11 @@ describe('Inventory', () => {
       cy.createTempUser([Permissions.uiInventoryViewCreateEditInstances.gui]).then(
         (userProperties) => {
           testData.user = userProperties;
+
+          cy.login(testData.user.username, testData.user.password, {
+            path: TopMenu.inventoryPath,
+            waiter: InventoryInstances.waitContentLoading,
+          });
         },
       );
     });
@@ -48,19 +53,17 @@ describe('Inventory', () => {
       'C404355 (CONSORTIA) Verify the header of a shared Instance on edit page for the Central tenant (consortia) (folijet)',
       { tags: ['extendedPathECS', 'folijet'] },
       () => {
-        cy.login(testData.user.username, testData.user.password, {
-          path: TopMenu.inventoryPath,
-          waiter: InventoryInstances.waitContentLoading,
-        });
-
+        cy.wait(5000);
         InventoryInstances.searchByTitle(testData.instance.instanceTitle);
         InventoryInstances.selectInstance();
         InventoryInstance.waitLoading();
 
         InstanceRecordView.edit();
         InstanceRecordEdit.waitLoading();
 
-        InstanceRecordEdit.checkInstanceHeader(` Edit shared instance • ${testData.instance.instanceTitle}`);
+        InstanceRecordEdit.checkInstanceHeader(
+          ` Edit shared instance • ${testData.instance.instanceTitle}`,
+        );
       },
     );
   });

diff --git a/...stance/user-can-see-name-of-locations-from-first-member-when-he-is-on-second-member.cy.js b/...stance/user-can-see-name-of-locations-from-first-member-when-he-is-on-second-member.cy.js
@@ -109,6 +109,7 @@ describe('Inventory', () => {
       'C423392 (CONSORTIA) User can see the the name of locations from Member tenant when he is on the second Member tenant (consortia) (folijet)',
       { tags: ['criticalPathECS', 'folijet'] },
       () => {
+        cy.wait(5000);
         InventoryInstances.searchByTitle(testData.instanceTitle);
         InventoryInstances.selectInstance();
         InventoryInstance.verifyConsortiaHoldingsAccordion();

diff --git a/...-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js b/...-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js
@@ -61,6 +61,7 @@ describe('Data Import', () => {
           physicalUnitPrice: '"20"',
           quantityPhysical: '"1"',
           currency: 'USD',
+          materialType: MATERIAL_TYPE_NAMES.BOOK,
           locationName: `"${LOCATION_NAMES.ANNEX}"`,
           locationQuantityPhysical: '"1"',
         },
@@ -84,7 +85,7 @@ describe('Data Import', () => {
         mappingProfile: {
           typeValue: FOLIO_RECORD_TYPE.ITEM,
           name: `C380474 Create simple item for open order ${getRandomPostfix()}`,
-          materialType: `"${MATERIAL_TYPE_NAMES.ELECTRONIC_RESOURCE}"`,
+          materialType: `"${MATERIAL_TYPE_NAMES.BOOK}"`,
           permanentLoanType: LOAN_TYPE_NAMES.CAN_CIRCULATE,
           status: ITEM_STATUS_NAMES.AVAILABLE,
         },

diff --git a/...ing-marc-bib-files/mrc-import-create-open-order-pe-mix-with-instance-holdings-items.cy.js b/...ing-marc-bib-files/mrc-import-create-open-order-pe-mix-with-instance-holdings-items.cy.js
@@ -36,7 +36,7 @@ import TopMenu from '../../../support/fragments/topMenu';
 import Users from '../../../support/fragments/users/users';
 import getRandomPostfix from '../../../support/utils/stringTools';
 
-describe.skip('Data Import', () => {
+describe('Data Import', () => {
   describe('Importing MARC Bib files', () => {
     let user;
     let instanceHrid;
@@ -59,7 +59,7 @@ describe.skip('Data Import', () => {
           physicalUnitPrice: '"20"',
           quantityPhysical: '"1"',
           currency: 'USD',
-          electronicUnitPrice: '25',
+          electronicUnitPrice: '"25"',
           quantityElectronic: '"1"',
           locationName: `"${LOCATION_NAMES.ANNEX}"`,
           locationQuantityPhysical: '"1"',
@@ -137,7 +137,6 @@ describe.skip('Data Import', () => {
       });
     });
 
-    // test is skiped because of https://issues.folio.org/browse/MODORDERS-884
     it(
       'C380446 Import to create open orders: P/E mix with Instances, Holdings, Items (folijet)',
       { tags: ['smoke', 'folijet'] },

diff --git a/cypress/support/constants.js b/cypress/support/constants.js
@@ -221,7 +221,7 @@ export const RECEIVING_WORKFLOW_NAMES = {
 };
 
 export const ACQUISITION_METHOD_NAMES = {
-  APPROVAL_PLAN: 'Approval plan',
+  APPROVAL_PLAN: 'Approval Plan',
   DDA: 'Demand driven acquisitions (DDA)',
   DEPOSITORY: 'Depository',
   EBA: 'Evidence based acquisitions (EBA)',

diff --git a/cypress/support/fragments/inventory/inventorySearchAndFilter.js b/cypress/support/fragments/inventory/inventorySearchAndFilter.js
@@ -95,6 +95,7 @@ const searchInstanceByHRID = (id) => {
     TextArea({ id: 'input-inventory-search' }).fillIn(id),
     searchButton.click(),
   ]);
+  cy.wait(1500);
 };
 
 const searchHoldingsByHRID = (hrid) => {
@@ -1049,6 +1050,7 @@ export default {
       stuffSupressAccordion.clickHeader(),
       stuffSupressAccordion.find(Checkbox({ id: 'clickable-filter-staffSuppress-true' })).click(),
     ]);
+    cy.wait(1500);
   },
 
   clearSharedFilter() {

diff --git a/cypress/support/fragments/inventory/search/browseContributors.js b/cypress/support/fragments/inventory/search/browseContributors.js
@@ -67,7 +67,14 @@ const nameTypeClear = typeSelect.find(Button({ icon: 'times-circle-solid' }));
 const actionsButton = Button('Actions');
 const rowContributorName = (ContributorName, contributorNameType) => MultiColumnListRow(`${ContributorName}${contributorNameType}1`);
 
+const searchRecordByName = (recordName) => {
+  cy.do(recordSearch.fillIn(recordName));
+  cy.expect(recordSearch.has({ value: recordName }));
+  cy.do(searchButton.click());
+};
+
 export default {
+  searchRecordByName,
   defaultInstanceAWithContributor,
   defaultInstanceZWithContributor,
   getInstancesWithContributor(titles = ['_a_', '_z_']) {
@@ -191,12 +198,8 @@ export default {
   },
 
   browse(contributorName) {
-    this.searchRecordByName(contributorName);
-  },
-  searchRecordByName(recordName) {
-    cy.do(recordSearch.fillIn(recordName));
-    cy.expect(recordSearch.has({ value: recordName }));
-    cy.do(searchButton.click());
+    cy.wait(1500);
+    searchRecordByName(contributorName);
   },
 
   verifySearchTerm(contributorName) {