Fat 16799 (#4287)

* derived test Spitfire team * changed test type * changed test type * fixed C11112 * changed cy.visit for tests in shiftLeft * changed cy.visit to navigation * fixed Smoke tests * fixed CriticalPath tests * added waiters
folio-org · Oct 2, 2024 · 3679cf0 · 3679cf0
1 parent 7cde3cc
commit 3679cf0
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 18 deletions.
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
@@ -399,6 +399,7 @@ describe('Data Import', () => {
         collectionOfMatchProfiles.forEach((profile) => {
           MatchProfiles.createMatchProfile(profile.matchProfile);
           MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+          cy.wait(3000);
         });
 
         // create job profile

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
@@ -270,6 +270,7 @@ describe('Data Import', () => {
         MatchOnVRN.waitJSONSchemasLoad();
         matchProfiles.forEach((match) => {
           MatchOnVRN.createMatchProfileForVRN(match);
+          cy.wait(3000);
         });
 
         // create job profiles

diff --git a/cypress/e2e/data-import/e2e/mrc-import-file-for-update-items.cy.js b/cypress/e2e/data-import/e2e/mrc-import-file-for-update-items.cy.js
@@ -441,6 +441,7 @@ describe('Data Import', () => {
         collectionOfMatchProfiles.forEach((profile) => {
           MatchProfiles.createMatchProfile(profile.matchProfile);
           MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+          cy.wait(3000);
         });
 
         // create Job profile

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
@@ -1,10 +1,11 @@
-import { DEFAULT_JOB_PROFILE_NAMES } from '../../../support/constants';
+import { APPLICATION_NAMES, DEFAULT_JOB_PROFILE_NAMES } from '../../../support/constants';
 import { Permissions } from '../../../support/dictionary';
 import DataImport from '../../../support/fragments/data_import/dataImport';
 import JobProfiles from '../../../support/fragments/data_import/job_profiles/jobProfiles';
 import Logs from '../../../support/fragments/data_import/logs/logs';
 import LogsViewAll from '../../../support/fragments/data_import/logs/logsViewAll';
 import TopMenu from '../../../support/fragments/topMenu';
+import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
 import Users from '../../../support/fragments/users/users';
 import getRandomPostfix from '../../../support/utils/stringTools';
 
@@ -18,7 +19,10 @@ describe('Data Import', () => {
       cy.createTempUser([Permissions.moduleDataImportEnabled.gui]).then((userProperties) => {
         userId = userProperties.userId;
 
-        cy.login(userProperties.username, userProperties.password);
+        cy.login(userProperties.username, userProperties.password, {
+          path: TopMenu.dataImportPath,
+          waiter: DataImport.waitLoading,
+        });
       });
     });
 
@@ -45,7 +49,6 @@ describe('Data Import', () => {
             quantityOfFiles: '15',
           },
         ].forEach((upload) => {
-          cy.visit(TopMenu.dataImportPath);
           DataImport.verifyUploadState();
           DataImport.uploadBunchOfFiles(filePathForUpload, upload.quantityOfFiles, upload.fileName);
           JobProfiles.search(jobProfileToRun);
@@ -60,6 +63,7 @@ describe('Data Import', () => {
           // TODO need to wait until files are filtered
           cy.wait(2000);
           LogsViewAll.verifyQuantityOfLogs(upload.quantityOfFiles);
+          TopMenuNavigation.navigateToApp(APPLICATION_NAMES.DATA_IMPORT);
         });
       },
     );

diff --git a/...g-marc-bib-files/import-with-2-submatches-for-update-instance-holdings-item-via-vrn.cy.js b/...g-marc-bib-files/import-with-2-submatches-for-update-instance-holdings-item-via-vrn.cy.js
@@ -357,6 +357,7 @@ describe('Data Import', () => {
         collectionOfMatchProfiles.forEach((profile) => {
           MatchProfiles.createMatchProfile(profile.matchProfile);
           MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+          cy.wait(3000);
         });
 
         // create job profile

diff --git a/cypress/e2e/data-import/importing-marc-bib-files/match-on-location.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/match-on-location.cy.js
@@ -366,6 +366,7 @@ describe('Data Import', () => {
       collectionOfMatchProfiles.forEach((profile) => {
         MatchProfiles.createMatchProfile(profile.matchProfile);
         MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+        cy.wait(3000);
       });
 
       // create Field mapping profiles

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
@@ -7,8 +7,15 @@ import InventoryInstance from '../../../support/fragments/inventory/inventoryIns
 import InventoryInstances from '../../../support/fragments/inventory/inventoryInstances';
 import InventoryViewSource from '../../../support/fragments/inventory/inventoryViewSource';
 import MarcFieldProtection from '../../../support/fragments/settings/dataImport/marcFieldProtection';
+import SettingsDataImport, {
+  SETTINGS_TABS,
+} from '../../../support/fragments/settings/dataImport/settingsDataImport';
 import Z3950TargetProfiles from '../../../support/fragments/settings/inventory/integrations/z39.50TargetProfiles';
-import SettingsMenu from '../../../support/fragments/settingsMenu';
+import SettingsInventory, {
+  INVENTORY_SETTINGS_TABS,
+} from '../../../support/fragments/settings/inventory/settingsInventory';
+import SettingsPane from '../../../support/fragments/settings/settingsPane';
+import TopMenu from '../../../support/fragments/topMenu';
 import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
 import Users from '../../../support/fragments/users/users';
 
@@ -84,8 +91,10 @@ describe('Data Import', () => {
       ]).then((userProperties) => {
         user = userProperties;
 
-        cy.login(user.username, user.password);
-        cy.visit(SettingsMenu.marcFieldProtectionPath);
+        cy.login(user.username, user.password, {
+          path: TopMenu.settingsPath,
+          waiter: SettingsPane.waitLoading,
+        });
       });
     });
 
@@ -102,11 +111,14 @@ describe('Data Import', () => {
       'C359189 Check that protected fields in incoming records are not deleted during import: Scenario 2 (folijet)',
       { tags: ['criticalPathFlaky', 'folijet'] },
       () => {
+        SettingsDataImport.goToSettingsDataImport();
+        SettingsDataImport.selectSettingsTab(SETTINGS_TABS.MARC_FIELD_PROTECTION);
         MarcFieldProtection.verifyListOfExistingSettingsIsDisplayed();
         MarcFieldProtection.create(protectedFieldData);
         MarcFieldProtection.verifyFieldProtectionIsCreated('NcD');
 
-        cy.visit(SettingsMenu.targetProfilesPath);
+        SettingsInventory.goToSettingsInventory();
+        SettingsInventory.selectSettingsTab(INVENTORY_SETTINGS_TABS.TARGET_PROFILES);
         Z3950TargetProfiles.openTargetProfile();
         Z3950TargetProfiles.editOclcWorldCat(
           OCLCAuthentication,

diff --git a/...2e/data-import/importing-marc-bib-files/single-record-import-with-running-large-job.cy.js b/...2e/data-import/importing-marc-bib-files/single-record-import-with-running-large-job.cy.js
@@ -4,7 +4,6 @@ import { APPLICATION_NAMES, DEFAULT_JOB_PROFILE_NAMES } from '../../../support/c
 import { Permissions } from '../../../support/dictionary';
 import DataImport from '../../../support/fragments/data_import/dataImport';
 import JobProfiles from '../../../support/fragments/data_import/job_profiles/jobProfiles';
-import FileDetails from '../../../support/fragments/data_import/logs/fileDetails';
 import Logs from '../../../support/fragments/data_import/logs/logs';
 import InventoryInstance from '../../../support/fragments/inventory/inventoryInstance';
 import InventoryInstances from '../../../support/fragments/inventory/inventoryInstances';
@@ -106,7 +105,6 @@ describe('Data Import', () => {
         );
 
         TopMenuNavigation.navigateToApp(APPLICATION_NAMES.DATA_IMPORT);
-        FileDetails.close();
         Logs.checkFileIsRunning(fileName);
       },
     );

diff --git a/.../importing-marc-bib-files/test-any-versus-all-for-marc-indicators-in-match-profiles.cy.js b/.../importing-marc-bib-files/test-any-versus-all-for-marc-indicators-in-match-profiles.cy.js
@@ -305,6 +305,7 @@ describe('Data Import', () => {
         collectionOfMatchProfiles.forEach((profile) => {
           MatchProfiles.createMatchProfile(profile.matchProfile);
           MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+          cy.wait(3000);
         });
 
         // create mapping profiles for update

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
@@ -382,6 +382,7 @@ describe('Data Import', () => {
             collectionOfMatchProfiles.forEach((profile) => {
               MatchProfiles.createMatchProfile(profile.matchProfile);
               MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+              cy.wait(3000);
             });
 
             // create mapping profiles

diff --git a/.../e2e/data-import/log-details/import-summary-table-with-create-modify-update-actions.cy.js b/.../e2e/data-import/log-details/import-summary-table-with-create-modify-update-actions.cy.js
@@ -45,7 +45,6 @@ import NewMatchProfile from '../../../support/fragments/settings/dataImport/matc
 import SettingsDataImport, {
   SETTINGS_TABS,
 } from '../../../support/fragments/settings/dataImport/settingsDataImport';
-import SettingsMenu from '../../../support/fragments/settingsMenu';
 import TopMenu from '../../../support/fragments/topMenu';
 import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
 import Users from '../../../support/fragments/users/users';
@@ -124,10 +123,10 @@ describe('Data Import', () => {
       name: `C430257 mapping profile ${getRandomPostfix()}`,
       holdingsTransformation: EXPORT_TRANSFORMATION_NAMES.HOLDINGS_HRID,
       holdingsMarcField: '901',
-      subfieldForHoldings: '$h',
+      subfieldForHoldings: 'h',
       itemTransformation: EXPORT_TRANSFORMATION_NAMES.ITEM_HRID,
       itemMarcField: '902',
-      subfieldForItem: '$i',
+      subfieldForItem: 'i',
     };
     const jobProfileNameForExport = `C430257 job profile.${getRandomPostfix()}`;
     // profiles for updating instance, holdings, item
@@ -360,11 +359,14 @@ describe('Data Import', () => {
           `${collectionOfProfilesForCreate[2].mappingProfile.pernanentLocationUI} >`,
         );
         InventoryInstance.openItemByBarcode('No barcode');
+        ItemRecordView.closeDetailView();
 
-        cy.visit(SettingsMenu.exportMappingProfilePath);
+        TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS);
+        ExportFieldMappingProfiles.goToFieldMappingProfilesTab();
         ExportFieldMappingProfiles.createMappingProfile(exportMappingProfile);
         cy.wait(10000);
-        cy.visit(SettingsMenu.exportJobProfilePath);
+        ExportJobProfiles.goToJobProfilesTab();
+        cy.wait(1500);
         ExportJobProfiles.createJobProfile(jobProfileNameForExport, exportMappingProfile.name);
 
         // download .csv file

diff --git a/...log-details/import-summary-table-with-updated-actions-for-instance-holding-and-item.cy.js b/...log-details/import-summary-table-with-updated-actions-for-instance-holding-and-item.cy.js
@@ -424,6 +424,7 @@ describe('Data Import', () => {
         collectionOfMatchProfiles.forEach((profile) => {
           MatchProfiles.createMatchProfile(profile.matchProfile);
           MatchProfiles.checkMatchProfilePresented(profile.matchProfile.profileName);
+          cy.wait(3000);
         });
 
         // create job profile

diff --git a/...window-for-isri-in-inventory-instance-details-menu-for-single-target-profile-update.cy.js b/...window-for-isri-in-inventory-instance-details-menu-for-single-target-profile-update.cy.js
@@ -8,7 +8,10 @@ import InventorySearchAndFilter from '../../../support/fragments/inventory/inven
 import ReImportModal from '../../../support/fragments/inventory/reImportModal';
 import ViewTargetProfile from '../../../support/fragments/settings/inventory/integrations/viewTargetProfile';
 import Z3950TargetProfiles from '../../../support/fragments/settings/inventory/integrations/z39.50TargetProfiles';
-import SettingsMenu from '../../../support/fragments/settingsMenu';
+import SettingsInventory, {
+  INVENTORY_SETTINGS_TABS,
+} from '../../../support/fragments/settings/inventory/settingsInventory';
+import SettingsPane from '../../../support/fragments/settings/settingsPane';
 import TopMenu from '../../../support/fragments/topMenu';
 import Users from '../../../support/fragments/users/users';
 import InteractorsTools from '../../../support/utils/interactorsTools';
@@ -45,8 +48,12 @@ describe('Inventory', () => {
         instanceId = response[0].instance.id;
       });
       Z3950TargetProfiles.changeOclcWorldCatValueViaApi(OCLCAuthentication);
-      cy.loginAsAdmin();
-      cy.visit(SettingsMenu.targetProfilesPath);
+      cy.loginAsAdmin({
+        path: TopMenu.settingsPath,
+        waiter: SettingsPane.waitLoading,
+      });
+      SettingsInventory.goToSettingsInventory();
+      SettingsInventory.selectSettingsTab(INVENTORY_SETTINGS_TABS.TARGET_PROFILES);
       Z3950TargetProfiles.openTargetProfile();
       ViewTargetProfile.verifyTargetProfileForm(
         targetProfile.name,

diff --git a/cypress/support/fragments/data_import/dataImport.js b/cypress/support/fragments/data_import/dataImport.js
@@ -5,6 +5,7 @@ import {
   Checkbox,
   Modal,
   MultiColumnListCell,
+  MultiColumnList,
   NavListItem,
   Pane,
   PaneHeader,
@@ -606,7 +607,7 @@ export default {
     );
   },
 
-  checkMultiColumnListRowsCount: (count) => cy.expect(jobLogsList.has({ rowCount: count })),
+  checkMultiColumnListRowsCount: (count) => cy.expect(MultiColumnList().has({ rowCount: count })),
 
   checkIsLandingPageOpened: () => {
     cy.expect(sectionPaneJobsTitle.find(orChooseFilesButton).exists());