fixed tests (#7184)

TetianaParanich · web-flow · commit b5577e26ecde · 2026-05-27T17:08:49.000+03:00
diff --git a/cypress/e2e/consortia/data-import/importing-marcBib-files/json-log-of-updated-srs-and-instance-for-shared-folio-source-updated-via-DI-on-member.cy.js b/cypress/e2e/consortia/data-import/importing-marcBib-files/json-log-of-updated-srs-and-instance-for-shared-folio-source-updated-via-DI-on-member.cy.js
diff --git a/cypress/e2e/consortia/data-import/importing-marcBib-files/json-log-of-updated-srs-and-instanse-for-shared-source-folio-instance-updated-via-DI-on-member.cy.js b/cypress/e2e/consortia/data-import/importing-marcBib-files/json-log-of-updated-srs-and-instanse-for-shared-source-folio-instance-updated-via-DI-on-member.cy.js
@@ -61,7 +61,7 @@ describe('Data Import', () => {
         action: ACTION_NAMES_IN_ACTION_PROFILE.UPDATE,
       };
       const matchProfile = {
-        profileName: `C417042 001-to-Hrid match for update${getRandomPostfix()}`,
+        profileName: `C417044 001-to-Hrid match for update${getRandomPostfix()}`,
         incomingRecordFields: {
           field: '001',
         },
diff --git a/cypress/e2e/consortia/inventory/instance/adding-shadow-child-instance-to-local-instance-on-member.cy.js b/cypress/e2e/consortia/inventory/instance/adding-shadow-child-instance-to-local-instance-on-member.cy.js
@@ -1,5 +1,5 @@
 import uuid from 'uuid';
-import { ITEM_STATUS_NAMES } from '../../../../support/constants';
+import { ITEM_STATUS_NAMES, LOAN_TYPE_NAMES, LOCATION_NAMES } from '../../../../support/constants';
 import Affiliations, { tenantNames } from '../../../../support/dictionary/affiliations';
 import Permissions from '../../../../support/dictionary/permissions';
 import InstanceRecordEdit from '../../../../support/fragments/inventory/instanceRecordEdit';
@@ -41,10 +41,10 @@ describe('Inventory', () => {
           cy.getHoldingTypes({ limit: 1 }).then((res) => {
             testData.shadowHoldings.holdingTypeId = res[0].id;
           });
-          cy.getLocations({ limit: 1 }).then((res) => {
+          cy.getLocations({ query: `name="${LOCATION_NAMES.ANNEX_UI}"` }).then((res) => {
             testData.shadowHoldings.locationId = res.id;
           });
-          cy.getLoanTypes({ limit: 1 }).then((res) => {
+          cy.getLoanTypes({ query: `name="${LOAN_TYPE_NAMES.CAN_CIRCULATE}"` }).then((res) => {
             testData.shadowItem.loanTypeId = res[0].id;
           });
           cy.getBookMaterialType().then((res) => {
diff --git a/cypress/e2e/consortia/inventory/instance/adding-shadow-parent-instance-to-local-instance-on-member.cy.js b/cypress/e2e/consortia/inventory/instance/adding-shadow-parent-instance-to-local-instance-on-member.cy.js
@@ -1,5 +1,5 @@
 import uuid from 'uuid';
-import { ITEM_STATUS_NAMES } from '../../../../support/constants';
+import { ITEM_STATUS_NAMES, LOCATION_NAMES, LOAN_TYPE_NAMES } from '../../../../support/constants';
 import Affiliations, { tenantNames } from '../../../../support/dictionary/affiliations';
 import Permissions from '../../../../support/dictionary/permissions';
 import InstanceRecordEdit from '../../../../support/fragments/inventory/instanceRecordEdit';
@@ -41,10 +41,10 @@ describe('Inventory', () => {
           cy.getHoldingTypes({ limit: 1 }).then((res) => {
             testData.shadowHoldings.holdingTypeId = res[0].id;
           });
-          cy.getLocations({ limit: 1 }).then((res) => {
+          cy.getLocations({ query: `name="${LOCATION_NAMES.ANNEX_UI}"` }).then((res) => {
             testData.shadowHoldings.locationId = res.id;
           });
-          cy.getLoanTypes({ limit: 1 }).then((res) => {
+          cy.getLoanTypes({ query: `name="${LOAN_TYPE_NAMES.CAN_CIRCULATE}"` }).then((res) => {
             testData.shadowItem.loanTypeId = res[0].id;
           });
           cy.getBookMaterialType().then((res) => {
diff --git a/cypress/e2e/finance/funds/error-message-when-transfer-exceeds-expenditure-limit.cy.js b/cypress/e2e/finance/funds/error-message-when-transfer-exceeds-expenditure-limit.cy.js
@@ -83,7 +83,6 @@ describe('Finance', () => {
         const AddTransferModal = BudgetDetails.openAddTransferModal();
         AddTransferModal.verifyFromFieldValue('');
         AddTransferModal.verifyToFieldValue(fundA.name);
-
         AddTransferModal.fillTransferDetails({
           fromFund: fundB.name,
           amount: '200',
diff --git a/cypress/e2e/inventory/version-history/instance/version-history-after-editing-instance-via-quickmarc.cy.js b/cypress/e2e/inventory/version-history/instance/version-history-after-editing-instance-via-quickmarc.cy.js
@@ -78,7 +78,7 @@ describe('Inventory', () => {
             index: 0,
             firstName: testData.user.firstName,
             lastName: testData.user.lastName,
-            changes: ['Index title (Edited)', 'Title (Edited)', 'Status updated date (Removed)'],
+            changes: ['Index title (Edited)', 'Title (Edited)'],
           });
         },
       );
diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js
@@ -263,14 +263,13 @@ describe('Invoices', { retries: { runMode: 1 } }, () => {
   after(() => {
     cy.getAdminToken().then(() => {
       Users.deleteViaApi(testData.user.userId);
-      Approvals.setApprovePayValueViaApi(false);
       Organizations.deleteOrganizationViaApi(testData.organization.id);
     });
   });
 
   it(
     'C388526 Approve and pay invoice created in current FY for previous FY when related order line was created in current FY (thunderjet) (TaaS)',
-    { tags: ['criticalPath', 'thunderjet', 'C388526'] },
+    { tags: ['criticalPath', 'thunderjet', 'C388526', 'nonParallel'] },
     () => {
       Orders.searchByParameter('PO number', testData.order.poNumber);
       Orders.selectFromResultsList(testData.order.poNumber);
diff --git a/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js b/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js
@@ -10,6 +10,7 @@ import OrderLines from '../../support/fragments/orders/orderLines';
 import Orders from '../../support/fragments/orders/orders';
 import NewOrganization from '../../support/fragments/organizations/newOrganization';
 import Organizations from '../../support/fragments/organizations/organizations';
+import Approvals from '../../support/fragments/settings/invoices/approvals';
 import NewLocation from '../../support/fragments/settings/tenant/locations/newLocation';
 import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints';
 import TopMenu from '../../support/fragments/topMenu';
@@ -69,6 +70,7 @@ describe('Invoices', () => {
 
   before(() => {
     cy.getAdminToken();
+    Approvals.setApprovePayValueViaApi(false);
     FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => {
       firstFiscalYear.id = firstFiscalYearResponse.id;
       firstLedger.fiscalYearOneId = firstFiscalYear.id;
@@ -78,9 +80,7 @@ describe('Invoices', () => {
         firstFund.ledgerId = firstLedger.id;
         Funds.createViaApi(firstFund).then((firstFundResponse) => {
           firstFund.id = firstFundResponse.fund.id;
-          cy.waitForAuthRefresh(() => {
-            cy.loginAsAdmin({ path: TopMenu.fundPath, waiter: Funds.waitLoading });
-          }, 20_000);
+          cy.loginAsAdmin({ path: TopMenu.fundPath, waiter: Funds.waitLoading });
           FinanceHelp.searchByName(firstFund.name);
           Funds.selectFund(firstFund.name);
           Funds.addBudget(allocatedQuantity);
@@ -153,12 +153,11 @@ describe('Invoices', () => {
         permissions.uiInvoicesPayInvoicesInDifferentFiscalYear.gui,
       ]).then((userProperties) => {
         user = userProperties;
-        cy.waitForAuthRefresh(() => {
-          cy.login(userProperties.username, userProperties.password, {
-            path: TopMenu.invoicesPath,
-            waiter: Invoices.waitLoading,
-          });
-        }, 20_000);
+
+        cy.login(userProperties.username, userProperties.password, {
+          path: TopMenu.invoicesPath,
+          waiter: Invoices.waitLoading,
+        });
       });
     });
   });
diff --git a/cypress/e2e/orders/manage-user-assignments-in-routing-list-from-orders.cy.js b/cypress/e2e/orders/manage-user-assignments-in-routing-list-from-orders.cy.js
@@ -133,7 +133,6 @@ describe('Orders', () => {
       Orders.searchByParameter('PO number', testData.orderNumber);
       Orders.selectFromResultsList(testData.orderNumber);
       OrderLines.selectPOLInOrder();
-      OrderLineDetails.openRoutingListsAccordion();
       OrderLineDetails.openRoutingList(routingList);
       RoutingListDetails.editRoutingList();
       RoutingListEditForm.addUserToRoutingList();
diff --git a/cypress/e2e/orders/users-added-to-routing-list-from-pol-are-synchronized-with-users-added-via-receiving-title.cy.js b/cypress/e2e/orders/users-added-to-routing-list-from-pol-are-synchronized-with-users-added-via-receiving-title.cy.js
@@ -124,7 +124,6 @@ describe('Orders', () => {
       Orders.searchByParameter('PO number', testData.orderNumber);
       Orders.selectFromResultsList(testData.orderNumber);
       OrderLines.selectPOLInOrder();
-      OrderLineDetails.openRoutingListsAccordion();
       OrderLineDetails.openRoutingList(routingList);
       RoutingListDetails.editRoutingList();
       RoutingListEditForm.addUserToRoutingList();
diff --git a/cypress/e2e/organizations/version-history-view.cy.js b/cypress/e2e/organizations/version-history-view.cy.js
@@ -3,6 +3,7 @@ import Permissions from '../../support/dictionary/permissions';
 import Agreements from '../../support/fragments/agreements/agreements';
 import NewAgreement from '../../support/fragments/agreements/newAgreement';
 import VersionHistorySection from '../../support/fragments/inventory/versionHistorySection';
+import OrganizationVersionHistorySection from '../../support/fragments/organizations/versionHistorySection';
 import { NewOrganization, Organizations } from '../../support/fragments/organizations';
 import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter';
 import TopMenu from '../../support/fragments/topMenu';
@@ -108,7 +109,7 @@ describe('Organizations', () => {
       OrganizationsSearchAndFilter.searchByParameters('Name', organization.name);
       Organizations.selectOrganization(organization.name);
       Organizations.openVersionHistory();
-      Organizations.selectVersionHistoryCard(preUpdated);
+      OrganizationVersionHistorySection.selectVersionHistoryCard(preUpdated);
       VersionHistorySection.verifyVersionHistoryCardWithTime(
         1,
         preUpdated,
@@ -117,7 +118,7 @@ describe('Organizations', () => {
         true,
         false,
       );
-      Organizations.selectVersionHistoryCard(afterUpdated);
+      OrganizationVersionHistorySection.selectVersionHistoryCard(afterUpdated);
       VersionHistorySection.verifyVersionHistoryCardWithTime(
         0,
         afterUpdated,
diff --git a/cypress/e2e/settings/data-import/acquisitions-unit-causes-invoices-to-import-with-errors.cy.js b/cypress/e2e/settings/data-import/acquisitions-unit-causes-invoices-to-import-with-errors.cy.js
@@ -90,8 +90,14 @@ describe('Data Import', () => {
       cy.loginAsAdmin();
       cy.visit(SettingsMenu.acquisitionUnitsPath);
       AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name);
-      AcquisitionUnits.delete(defaultAcquisitionUnit.name);
       cy.getAdminToken().then(() => {
+        AcquisitionUnits.getAcquisitionUnitViaApi({
+          query: `"name"="${defaultAcquisitionUnit.name}"`,
+        }).then((response) => {
+          if (response.acquisitionsUnits && response.acquisitionsUnits.length > 0) {
+            AcquisitionUnits.deleteAcquisitionUnitViaApi(response.acquisitionsUnits[0].id);
+          }
+        });
         SettingsJobProfiles.deleteJobProfileByNameViaApi(jobProfile.profileName);
         SettingsActionProfiles.deleteActionProfileByNameViaApi(actionProfile.name);
         SettingsFieldMappingProfiles.deleteMappingProfileByNameViaApi(mappingProfile.name);
diff --git a/cypress/e2e/settings/data-import/check-return-to-default-in-suppress-from-discovery.cy.js b/cypress/e2e/settings/data-import/check-return-to-default-in-suppress-from-discovery.cy.js
@@ -16,6 +16,10 @@ describe('Data Import', () => {
       profileName: '',
       user: {},
     };
+    // for Trillium env with cyrillic 'c'
+    // const suppressFromDiscoveryValue = 'Select сheckbox field mapping';
+    // for Cyrpress env
+    const suppressFromDiscoveryValue = 'Select checkbox field mapping';
 
     before('Create user', () => {
       cy.createTempUser([Permissions.settingsDataImportEnabled.gui]).then((userProperties) => {
@@ -69,7 +73,7 @@ describe('Data Import', () => {
         // Change the value in "Suppress from discovery" dropdown back to "Select checkbox field mapping" option
         // Change the value in "Electronic Access" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
-          adminData: { suppressFromDiscovery: 'Select checkbox field mapping' },
+          adminData: { suppressFromDiscovery: suppressFromDiscoveryValue },
           electronicAccess: { value: 'Select action' },
         });
 
@@ -97,7 +101,7 @@ describe('Data Import', () => {
         // Change the value in "Suppress from discovery" dropdown back to "Select checkbox field mapping" option
         // Change the value in "Electronic Access" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
-          adminData: { suppressFromDiscovery: 'Select checkbox field mapping' },
+          adminData: { suppressFromDiscovery: suppressFromDiscoveryValue },
           electronicAccess: { value: 'Select action' },
         });
 
@@ -141,7 +145,7 @@ describe('Data Import', () => {
         // Change the value in "Suppress from discovery" dropdown back to "Select checkbox field mapping" option
         // Change the value in "Electronic Access" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
-          adminData: { suppressFromDiscovery: 'Select checkbox field mapping' },
+          adminData: { suppressFromDiscovery: suppressFromDiscoveryValue },
           electronicAccess: { value: 'Select action' },
         });
 
@@ -169,7 +173,7 @@ describe('Data Import', () => {
         // Change the value in "Suppress from discovery" dropdown back to "Select checkbox field mapping" option
         // Change the value in "Electronic Access" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
-          adminData: { suppressFromDiscovery: 'Select checkbox field mapping' },
+          adminData: { suppressFromDiscovery: suppressFromDiscoveryValue },
           electronicAccess: { value: 'Select action' },
         });
 
@@ -216,7 +220,7 @@ describe('Data Import', () => {
         // Change the value in "Statistical codes" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
           adminData: {
-            suppressFromDiscovery: 'Select checkbox field mapping',
+            suppressFromDiscovery: suppressFromDiscoveryValue,
             statisticalCodes: 'Select action',
           },
         });
@@ -246,7 +250,7 @@ describe('Data Import', () => {
         // Change the value in "Statistical codes" dropdown back to "Select action" option
         FieldMappingProfileEditForm.fillMappingProfileFields({
           adminData: {
-            suppressFromDiscovery: 'Select checkbox field mapping',
+            suppressFromDiscovery: suppressFromDiscoveryValue,
             statisticalCodes: 'Select action',
           },
         });
diff --git a/cypress/support/fragments/settings/dataImport/fieldMappingProfile/fieldMappingProfileEditForm.js b/cypress/support/fragments/settings/dataImport/fieldMappingProfile/fieldMappingProfileEditForm.js
@@ -186,6 +186,9 @@ const existingRecordTypes = {
 };
 
 const suppressFromDiscoveryOptions = {
+  // for Trillium env with cyrillic 'c'
+  // 'Select сheckbox field mapping': '',
+  // for Cyrpress env
   'Select checkbox field mapping': '',
   'Mark for all affected records': 'ALL_TRUE',
   'Unmark for all affected records': 'ALL_FALSE',
