Merge branch 'master' of https://github.com/folio-org/stripes-testing

folio-org · Jan 16, 2025 · 5648702 · 5648702
2 parents af74c7f + 404550f
commit 5648702
Show file tree

Hide file tree

Showing 69 changed files with 2,467 additions and 360 deletions.
diff --git a/DockerfileCypressAmd b/DockerfileCypressAmd
@@ -0,0 +1,10 @@
+ARG NODE_VERSION='18.20.3'
+ARG YARN_VERSION='1.22.19'
+ARG CHROME_VERSION='124.0.6367.60-1'
+ARG CYPRESS_VERSION='12.0.0'
+
+FROM cypress/factory:3.5.4@sha256:2061ca973a454a5d0630e214abf396592b730fcb63eb0054e2a02edc3be6fb7a
+
+WORKDIR /opt/app
+RUN npm install --save-dev cypress
+RUN apt-get update; apt install -y curl python-is-python3 pkg-config build-essential
diff --git a/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-created-updated-dates.cy.js b/cypress/e2e/bulk-edit/csv/bulk-edit-csv-user-created-updated-dates.cy.js
@@ -16,7 +16,7 @@ const userUUIDsFileName = `userUUIDs_${getRandomPostfix()}.csv`;
 const editedFileName = `edited-records-${getRandomPostfix()}.csv`;
 const matchedRecordsFileName = `*-Matched-Records-${userUUIDsFileName}`;
 const changedRecordsFileName = `*-Changed-Records-${userUUIDsFileName}`;
-const previewOfProposedChangesFileName = `*-Updates-Preview-${userUUIDsFileName}`;
+const previewOfProposedChangesFileName = `*-Updates-Preview-CSV-${userUUIDsFileName}`;
 const updatedRecordsFileName = `*-Changed-Records*-${userUUIDsFileName}`;
 const today = DateTools.getFormattedDate({ date: new Date() }, 'YYYY-MM-DD');
 
@@ -30,6 +30,7 @@ describe(
   () => {
     describe('csv approach', () => {
       beforeEach('create test data', () => {
+        cy.clearLocalStorage();
         cy.createTempUser([
           permissions.bulkEditLogsView.gui,
           permissions.bulkEditCsvEdit.gui,
@@ -39,7 +40,7 @@ describe(
           cy.wait(3000);
 
           cy.login(user.username, user.password);
-          cy.wait(5000);
+          cy.wait(10000);
           TopMenuNavigation.navigateToApp(APPLICATION_NAMES.BULK_EDIT);
           BulkEditSearchPane.waitLoading();
 

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-item-notes-remove-all-add-same-type.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-item-notes-remove-all-add-same-type.cy.js
@@ -1,7 +1,7 @@
 import permissions from '../../../support/dictionary/permissions';
 import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-actions';
 import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane';
-import ExportFile from '../../../support/fragments/data-export/exportFile';
+import BulkEditFiles from '../../../support/fragments/bulk-edit/bulk-edit-files';
 import InventoryInstances from '../../../support/fragments/inventory/inventoryInstances';
 import InventorySearchAndFilter from '../../../support/fragments/inventory/inventorySearchAndFilter';
 import ItemRecordView from '../../../support/fragments/inventory/item/itemRecordView';
@@ -10,7 +10,11 @@ import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
 import Users from '../../../support/fragments/users/users';
 import FileManager from '../../../support/utils/fileManager';
 import getRandomPostfix from '../../../support/utils/stringTools';
-import { ITEM_NOTES, MATERIAL_TYPE_IDS } from '../../../support/constants';
+import {
+  BULK_EDIT_TABLE_COLUMN_HEADERS,
+  ITEM_NOTES,
+  MATERIAL_TYPE_IDS,
+} from '../../../support/constants';
 
 let user;
 
@@ -99,11 +103,30 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyMatchedResults(item.barcode);
         BulkEditActions.downloadMatchedResults();
-        ExportFile.verifyFileIncludes(matchedRecordsFileName, [
-          `,${notes.admin},dvd,`,
-          `,${notes.copy},${notes.electronicBookplate}`,
-          `,${notes.checkIn},${notes.checkOut},`,
-        ]);
+        BulkEditFiles.verifyHeaderValueInRowByIdentifier(
+          matchedRecordsFileName,
+          BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BARCODE,
+          item.barcode,
+          [
+            {
+              header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ADMINISTRATIVE_NOTE,
+              value: notes.admin,
+            },
+            { header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.COPY_NOTE, value: notes.copy },
+            {
+              header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ELECTRONIC_BOOKPLATE_NOTE,
+              value: notes.electronicBookplate,
+            },
+            {
+              header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_IN_NOTE,
+              value: notes.checkIn,
+            },
+            {
+              header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_OUT_NOTE,
+              value: notes.checkOut,
+            },
+          ],
+        );
         BulkEditSearchPane.changeShowColumnCheckboxIfNotYet(
           'Administrative note',
           'Copy note',
@@ -128,11 +151,37 @@ describe('bulk-edit', () => {
           notes.electronicBookplate,
         ]);
         BulkEditActions.downloadPreview();
-        ExportFile.verifyFileIncludes(previewFileName, [
-          ',,dvd,',
-          `,${notes.action},,,`,
-          'Available,,,',
-        ]);
+
+        const editedHeaderValues = [
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ADMINISTRATIVE_NOTE,
+            value: '',
+          },
+          { header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.COPY_NOTE, value: '' },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ELECTRONIC_BOOKPLATE_NOTE,
+            value: notes.electronicBookplate,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_IN_NOTE,
+            value: '',
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_OUT_NOTE,
+            value: '',
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ACTION_NOTE,
+            value: notes.action,
+          },
+        ];
+
+        BulkEditFiles.verifyHeaderValueInRowByIdentifier(
+          previewFileName,
+          BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BARCODE,
+          item.barcode,
+          editedHeaderValues,
+        );
         BulkEditActions.commitChanges();
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyExactChangesUnderColumns('Administrative note', '');
@@ -146,11 +195,13 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.verifyExactChangesUnderColumns('Check out note', '');
         BulkEditActions.openActions();
         BulkEditActions.downloadChangedCSV();
-        ExportFile.verifyFileIncludes(changedRecordsFileName, [
-          ',,dvd,',
-          `,${notes.action},,,`,
-          'Available,,,',
-        ]);
+
+        BulkEditFiles.verifyHeaderValueInRowByIdentifier(
+          changedRecordsFileName,
+          BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BARCODE,
+          item.barcode,
+          editedHeaderValues,
+        );
 
         TopMenuNavigation.navigateToApp('Inventory');
         InventorySearchAndFilter.switchToItem();

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-items-staff-only-for-added-notes.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-items-staff-only-for-added-notes.cy.js
@@ -9,8 +9,14 @@ import FileManager from '../../../support/utils/fileManager';
 import getRandomPostfix from '../../../support/utils/stringTools';
 import ExportFile from '../../../support/fragments/data-export/exportFile';
 import ItemRecordView from '../../../support/fragments/inventory/item/itemRecordView';
-import { APPLICATION_NAMES, ITEM_NOTES, MATERIAL_TYPE_IDS } from '../../../support/constants';
+import {
+  APPLICATION_NAMES,
+  BULK_EDIT_TABLE_COLUMN_HEADERS,
+  ITEM_NOTES,
+  MATERIAL_TYPE_IDS,
+} from '../../../support/constants';
 import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
+import BulkEditFiles from '../../../support/fragments/bulk-edit/bulk-edit-files';
 
 let user;
 const item = {
@@ -163,12 +169,11 @@ describe('bulk-edit', () => {
         BulkEditActions.confirmChanges();
         BulkEditActions.verifyAreYouSureForm(1, item.itemBarcode);
         BulkEditSearchPane.verifyExactChangesUnderColumns('Administrative note', notes.admin);
-        // TODO: uncomment after MODBULKOPS-204
-        // BulkEditSearchPane.verifyExactChangesUnderColumns(
-        //   'Check out note',
-        //   `${notes.checkOut} (staff only)`,
-        // );
-        // BulkEditSearchPane.verifyExactChangesUnderColumns('Check in note', notes.checkIn);
+        BulkEditSearchPane.verifyExactChangesUnderColumns(
+          'Check out note',
+          `${notes.checkOut} (staff only)`,
+        );
+        BulkEditSearchPane.verifyExactChangesUnderColumns('Check in note', notes.checkIn);
         BulkEditSearchPane.verifyExactChangesUnderColumns('Action note', notes.action);
         BulkEditSearchPane.verifyExactChangesUnderColumns(
           'Binding note',
@@ -198,12 +203,11 @@ describe('bulk-edit', () => {
         BulkEditActions.confirmChanges();
         BulkEditActions.verifyAreYouSureForm(1, item.itemBarcode);
         BulkEditSearchPane.verifyExactChangesUnderColumns('Administrative note', notes.admin);
-        // TODO: uncomment after MODBULKOPS-204
-        // BulkEditSearchPane.verifyExactChangesUnderColumns(
-        //   'Check out note',
-        //   `${notes.checkOut} (staff only)`,
-        // );
-        // BulkEditSearchPane.verifyExactChangesUnderColumns('Check in note', notes.checkIn);
+        BulkEditSearchPane.verifyExactChangesUnderColumns(
+          'Check out note',
+          `${notes.checkOut} (staff only)`,
+        );
+        BulkEditSearchPane.verifyExactChangesUnderColumns('Check in note', notes.checkIn);
         BulkEditSearchPane.verifyExactChangesUnderColumns('Action note', notes.action);
         BulkEditSearchPane.verifyExactChangesUnderColumns(
           'Binding note',
@@ -221,21 +225,66 @@ describe('bulk-edit', () => {
           `${notes.reproduction} (staff only)`,
         );
         BulkEditActions.downloadPreview();
-        ExportFile.verifyFileIncludes(previewFileName, [
-          `${notes.action},${notes.binding} (staff only),${notes.copy} (staff only),,${notes.note} (staff only),${notes.provenance},${notes.reproduction} (staff only)`,
-          `Available,${notes.checkIn},${notes.checkOut} (staff only),`,
-          `,${notes.admin},dvd,`,
-        ]);
+
+        const addedNoteHeaderValues = [
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ADMINISTRATIVE_NOTE,
+            value: notes.admin,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.PROVENANCE_NOTE,
+            value: notes.provenance,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.REPRODUCTION_NOTE,
+            value: `${notes.reproduction} (staff only)`,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.NOTE,
+            value: `${notes.note} (staff only)`,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ACTION_NOTE,
+            value: notes.action,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BINDING_NOTE,
+            value: `${notes.binding} (staff only)`,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.COPY_NOTE,
+            value: `${notes.copy} (staff only)`,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.ELECTRONIC_BOOKPLATE_NOTE,
+            value: '',
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_IN_NOTE,
+            value: notes.checkIn,
+          },
+          {
+            header: BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.CHECK_OUT_NOTE,
+            value: `${notes.checkOut} (staff only)`,
+          },
+        ];
+        BulkEditFiles.verifyHeaderValueInRowByIdentifier(
+          previewFileName,
+          BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BARCODE,
+          item.itemBarcode,
+          addedNoteHeaderValues,
+        );
         BulkEditActions.commitChanges();
         BulkEditSearchPane.waitFileUploading();
         BulkEditActions.openActions();
         BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Check out note', 'Check in note');
         BulkEditActions.downloadChangedCSV();
-        ExportFile.verifyFileIncludes(changedRecordsFileName, [
-          `${notes.action},${notes.binding} (staff only),${notes.copy} (staff only),,${notes.note} (staff only),${notes.provenance},${notes.reproduction} (staff only)`,
-          `Available,${notes.checkIn},${notes.checkOut} (staff only),`,
-          `,${notes.admin},dvd,`,
-        ]);
+        BulkEditFiles.verifyHeaderValueInRowByIdentifier(
+          changedRecordsFileName,
+          BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_ITEMS.BARCODE,
+          item.itemBarcode,
+          addedNoteHeaderValues,
+        );
         BulkEditSearchPane.verifyExactChangesUnderColumns('Administrative note', notes.admin);
         BulkEditSearchPane.verifyExactChangesUnderColumns(
           'Check out note',

diff --git a/.../consortia/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-clear-field.cy.js b/.../consortia/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-clear-field.cy.js
@@ -69,22 +69,16 @@ describe('Bulk-edit', () => {
         ]).then((userProperties) => {
           user = userProperties;
 
-          cy.assignAffiliationToUser(Affiliations.College, user.userId);
-          cy.setTenant(Affiliations.College);
-          cy.assignPermissionsToExistingUser(user.userId, [
-            permissions.bulkEditEdit.gui,
-            permissions.uiInventoryViewCreateEditHoldings.gui,
-          ]);
-
-          cy.resetTenant();
-          cy.assignAffiliationToUser(Affiliations.University, user.userId);
-          cy.setTenant(Affiliations.University);
-          cy.assignPermissionsToExistingUser(user.userId, [
-            permissions.bulkEditEdit.gui,
-            permissions.uiInventoryViewCreateEditHoldings.gui,
-          ]);
-
-          cy.resetTenant();
+          [Affiliations.College, Affiliations.University].forEach((affiliation) => {
+            cy.assignAffiliationToUser(affiliation, user.userId);
+            cy.setTenant(affiliation);
+            cy.assignPermissionsToExistingUser(user.userId, [
+              permissions.bulkEditEdit.gui,
+              permissions.uiInventoryViewCreateEditHoldings.gui,
+            ]);
+            cy.resetTenant();
+          });
+
           cy.getInstanceTypes({ limit: 1 }).then((instanceTypeData) => {
             instanceTypeId = instanceTypeData[0].id;
           });