Merge branch 'master' into UITEST-121

folio-org · Oct 22, 2024 · d7b8ff1 · d7b8ff1
2 parents 706b81f + fce80d2
commit d7b8ff1
Show file tree

Hide file tree

Showing 16 changed files with 621 additions and 73 deletions.
diff --git a/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-barcodes-no-matches-preview.cy.js b/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-barcodes-no-matches-preview.cy.js
@@ -0,0 +1,64 @@
+import permissions from '../../../support/dictionary/permissions';
+import FileManager from '../../../support/utils/fileManager';
+import getRandomPostfix from '../../../support/utils/stringTools';
+import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane';
+import Users from '../../../support/fragments/users/users';
+import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-actions';
+import TopMenu from '../../../support/fragments/topMenu';
+
+let user;
+const invalidUserBarcodesFileName = `invalidUserBarcodes_${getRandomPostfix()}.csv`;
+
+describe(
+  'bulk-edit',
+  {
+    retries: {
+      runMode: 1,
+    },
+  },
+  () => {
+    describe('csv approach', () => {
+      beforeEach('create test data', () => {
+        cy.createTempUser([
+          permissions.bulkEditCsvView.gui,
+          permissions.bulkEditCsvEdit.gui,
+          permissions.uiUsersView.gui,
+        ]).then((userProperties) => {
+          user = userProperties;
+
+          cy.login(user.username, user.password, {
+            path: TopMenu.bulkEditPath,
+            waiter: BulkEditSearchPane.waitLoading,
+          });
+
+          FileManager.createFile(
+            `cypress/fixtures/${invalidUserBarcodesFileName}`,
+            getRandomPostfix(),
+          );
+        });
+      });
+
+      afterEach('delete test data', () => {
+        cy.getAdminToken();
+        Users.deleteViaApi(user.userId);
+        FileManager.deleteFile(`cypress/fixtures/${invalidUserBarcodesFileName}`);
+      });
+
+      it(
+        'C360556 Populating preview of matched records in case no matches (firebird)',
+        { tags: ['smoke', 'firebird', 'shiftLeft', 'C360556'] },
+        () => {
+          BulkEditSearchPane.checkUsersRadio();
+          BulkEditSearchPane.selectRecordIdentifier('User Barcodes');
+          BulkEditSearchPane.uploadFile(invalidUserBarcodesFileName);
+          BulkEditSearchPane.waitFileUploading();
+          BulkEditSearchPane.matchedAccordionIsAbsent();
+          BulkEditSearchPane.verifyErrorLabel(invalidUserBarcodesFileName, 0, 1);
+
+          BulkEditActions.openActions();
+          BulkEditActions.verifyUsersActionDropdownItemsInCaseOfError();
+        },
+      );
+    });
+  },
+);
diff --git a/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-barcodes-preview.cy.js b/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-barcodes-preview.cy.js
@@ -3,82 +3,66 @@ import FileManager from '../../../support/utils/fileManager';
 import getRandomPostfix from '../../../support/utils/stringTools';
 import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane';
 import Users from '../../../support/fragments/users/users';
-import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-actions';
-import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
-import { APPLICATION_NAMES } from '../../../support/constants';
+import TopMenu from '../../../support/fragments/topMenu';
 
 let user;
 const userBarcodesFileName = `userBarcodes_${getRandomPostfix()}.csv`;
-const invalidUserBarcodesFileName = `invalidUserBarcodes_${getRandomPostfix()}.csv`;
 
-describe('bulk-edit', () => {
-  describe('csv approach', () => {
-    before('create test data', () => {
-      cy.createTempUser([
-        permissions.bulkEditCsvView.gui,
-        permissions.bulkEditCsvEdit.gui,
-        permissions.uiUsersView.gui,
-      ]).then((userProperties) => {
-        user = userProperties;
+describe(
+  'bulk-edit',
+  {
+    retries: {
+      runMode: 1,
+    },
+  },
+  () => {
+    describe('csv approach', () => {
+      beforeEach('create test data', () => {
+        cy.clearLocalStorage();
+        cy.createTempUser([
+          permissions.bulkEditCsvView.gui,
+          permissions.bulkEditCsvEdit.gui,
+          permissions.uiUsersView.gui,
+        ]).then((userProperties) => {
+          user = userProperties;
 
-        cy.login(user.username, user.password);
-        TopMenuNavigation.navigateToApp(APPLICATION_NAMES.BULK_EDIT);
-        BulkEditSearchPane.waitLoading();
+          cy.login(user.username, user.password, {
+            path: TopMenu.bulkEditPath,
+            waiter: BulkEditSearchPane.waitLoading,
+          });
 
-        FileManager.createFile(`cypress/fixtures/${userBarcodesFileName}`, user.barcode);
-        FileManager.createFile(
-          `cypress/fixtures/${invalidUserBarcodesFileName}`,
-          getRandomPostfix(),
-        );
+          FileManager.createFile(`cypress/fixtures/${userBarcodesFileName}`, user.barcode);
+        });
       });
-    });
-
-    beforeEach('reload bulk-edit page', () => {
-      TopMenuNavigation.navigateToApp(APPLICATION_NAMES.BULK_EDIT);
-      BulkEditSearchPane.checkUsersRadio();
-      BulkEditSearchPane.selectRecordIdentifier('User Barcodes');
-    });
-
-    after('delete test data', () => {
-      cy.getAdminToken();
-      Users.deleteViaApi(user.userId);
-      FileManager.deleteFile(`cypress/fixtures/${userBarcodesFileName}`);
-      FileManager.deleteFile(`cypress/fixtures/${invalidUserBarcodesFileName}`);
-    });
-
-    it(
-      'C347872 Populating preview of matched records (firebird)',
-      { tags: ['smoke', 'firebird', 'shiftLeft', 'C347872'] },
-      () => {
-        BulkEditSearchPane.uploadFile(userBarcodesFileName);
-        BulkEditSearchPane.waitFileUploading();
-        BulkEditSearchPane.verifyUserBarcodesResultAccordion();
-        BulkEditSearchPane.verifyMatchedResults(user.barcode);
 
-        BulkEditSearchPane.verifyActionsAfterConductedCSVUploading(false);
-        BulkEditSearchPane.verifyUsersActionShowColumns();
+      afterEach('delete test data', () => {
+        cy.getAdminToken();
+        Users.deleteViaApi(user.userId);
+        FileManager.deleteFile(`cypress/fixtures/${userBarcodesFileName}`);
+      });
 
-        BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Last name');
-        BulkEditSearchPane.changeShowColumnCheckbox('Last name');
-        BulkEditSearchPane.verifyResultColumnTitlesDoNotInclude('Last name');
+      it(
+        'C347872 Populating preview of matched records (firebird)',
+        { tags: ['smoke', 'firebird', 'shiftLeft', 'C347872'] },
+        () => {
+          BulkEditSearchPane.checkUsersRadio();
+          BulkEditSearchPane.selectRecordIdentifier('User Barcodes');
+          BulkEditSearchPane.uploadFile(userBarcodesFileName);
+          BulkEditSearchPane.waitFileUploading();
+          BulkEditSearchPane.verifyUserBarcodesResultAccordion();
+          BulkEditSearchPane.verifyMatchedResults(user.barcode);
 
-        BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Email');
-        BulkEditSearchPane.verifyResultColumnTitles('Email');
-      },
-    );
+          BulkEditSearchPane.verifyActionsAfterConductedCSVUploading(false);
+          BulkEditSearchPane.verifyUsersActionShowColumns();
 
-    it(
-      'C360556 Populating preview of matched records in case no matches (firebird)',
-      { tags: ['smoke', 'firebird', 'shiftLeft', 'C360556'] },
-      () => {
-        BulkEditSearchPane.uploadFile(invalidUserBarcodesFileName);
-        BulkEditSearchPane.waitFileUploading();
-        BulkEditSearchPane.matchedAccordionIsAbsent();
-        BulkEditSearchPane.verifyErrorLabel(invalidUserBarcodesFileName, 0, 1);
+          BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Last name');
+          BulkEditSearchPane.changeShowColumnCheckbox('Last name');
+          BulkEditSearchPane.verifyResultColumnTitlesDoNotInclude('Last name');
 
-        BulkEditActions.openActions();
-        BulkEditActions.verifyUsersActionDropdownItemsInCaseOfError();
-      },
-    );
-  });
-});
+          BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Email');
+          BulkEditSearchPane.verifyResultColumnTitles('Email');
+        },
+      );
+    });
+  },
+);
diff --git a/cypress/e2e/finance/fiscalYears/rollover-fiscal-year.cy.js b/cypress/e2e/finance/fiscalYears/rollover-fiscal-year.cy.js
@@ -267,7 +267,9 @@ describe('ui-finance: Fiscal Year Rollover', () => {
       'Encumbrance',
       `${firstFund.name} (${firstFund.code})`,
     );
-    cy.visit(TopMenu.fundPath);
+    Funds.closeTransactionDetails();
+    Funds.closeMenu();
+    Funds.closeMenu();
     FinanceHelp.searchByName(secondFund.name);
     Funds.selectFund(secondFund.name);
     Funds.selectPlannedBudgetDetails();