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

…into FAT-17285-C594483
folio-org · Jan 28, 2025 · d7038d5 · d7038d5
2 parents eba34e6 + eb55b33
commit d7038d5
Show file tree

Hide file tree

Showing 41 changed files with 803 additions and 70 deletions.
diff --git a/cypress/e2e/bulk-edit/csv/bulk-edit-csv-drag-and-drop.cy.js b/cypress/e2e/bulk-edit/csv/bulk-edit-csv-drag-and-drop.cy.js
@@ -53,7 +53,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.waitFileUploading();
 
         BulkEditSearchPane.verifyMatchedResults(testData.user.username);
-        BulkEditSearchPane.verifyPaneRecordsCount(1);
+        BulkEditSearchPane.verifyPaneRecordsCount('1 user');
         BulkEditSearchPane.isDragAndDropAreaDisabled(true);
 
         BulkEditSearchPane.selectRecordIdentifier('User Barcodes');

diff --git a/cypress/e2e/bulk-edit/csv/bulk-edit-csv-verify-cancel-users-matched.cy.js b/cypress/e2e/bulk-edit/csv/bulk-edit-csv-verify-cancel-users-matched.cy.js
@@ -53,7 +53,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.checkForUploading(userUUIDsFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyErrorLabel(userUUIDsFileName, 1, 1);
-        BulkEditSearchPane.verifyPaneRecordsCount(1);
+        BulkEditSearchPane.verifyPaneRecordsCount('1 user');
         BulkEditSearchPane.verifyMatchedResults(user.username);
         BulkEditSearchPane.verifyNonMatchedResults(invalidUserUUID);
 

diff --git a/...s/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-url-relationship.cy.js b/...s/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access-url-relationship.cy.js
@@ -94,14 +94,16 @@ describe('bulk-edit', () => {
         BulkEditActions.verifyOptionsDropdown();
         BulkEditActions.isSelectActionAbsent();
         BulkEditActions.selectOption('URL Relationship');
-        let possibleActions = ['Clear field', 'Find', 'Replace with'];
+        let possibleActions = ['Clear field', 'Find (full field search)', 'Replace with'];
         BulkEditActions.verifyPossibleActions(possibleActions);
         BulkEditActions.selectSecondAction('Clear field');
         BulkEditActions.addNewBulkEditFilterString();
         BulkEditActions.verifyNewBulkEditRow();
         BulkEditActions.verifyOptionAbsentInNewRow('URL Relationship');
         BulkEditActions.deleteRow(1);
-        BulkEditActions.findValue('URL Relationship');
+        BulkEditActions.selectOption('URL Relationship');
+        BulkEditActions.selectSecondAction('Find (full field search)');
+        BulkEditActions.verifyActionSelected('Find (full field search)');
         possibleActions = ['Replace with', 'Remove'];
         BulkEditActions.verifyPossibleActions(possibleActions);
         BulkEditActions.selectSecondAction('Remove');

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-holdings-electronic-access.cy.js
@@ -109,8 +109,7 @@ describe('bulk-edit', () => {
         );
         BulkEditSearchPane.verifyElectronicAccessElementByIndex(4, electronicAccess[0].publicNote);
         BulkEditActions.openInAppStartBulkEditFrom();
-        BulkEditActions.electronicAccessReplaceWith(
-          'URL Relationship',
+        BulkEditActions.urlRelationshipReplaceWith(
           electronicAccessRelationshipName.RESOURCE,
           electronicAccessRelationshipName.VERSION_OF_RESOURCE,
         );

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-instances-remove-all-add-note.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-instances-remove-all-add-note.cy.js
@@ -196,8 +196,8 @@ describe('bulk-edit', () => {
           `${notes.exhibitionsNote} (staff only)`,
         );
 
-        BulkEditSearchPane.verifyErrorLabelInErrorAccordion(instanceUUIDsFileName, 2, 2, 3);
-        BulkEditSearchPane.verifyNonMatchedResults(marcInstance.instanceId);
+        BulkEditSearchPane.verifyErrorLabel(3);
+        BulkEditSearchPane.verifyNonMatchedResults(marcInstance.instanceId, `${reasonForError} `);
         BulkEditSearchPane.verifyReasonForError(reasonForError);
 
         BulkEditActions.openActions();

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-instances-verify-note-types.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-instances-verify-note-types.cy.js
@@ -153,7 +153,7 @@ describe('bulk-edit', () => {
 
         const instanceNoteColumnNames = Object.values(
           BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_INSTANCES,
-        ).slice(22);
+        ).slice(23);
 
         BulkEditSearchPane.verifyInstanceNoteColumns(instanceNoteColumnNames);
         BulkEditSearchPane.changeShowColumnCheckboxIfNotYet(
@@ -261,7 +261,7 @@ describe('bulk-edit', () => {
         BulkEditActions.commitChanges();
         BulkEditSearchPane.waitFileUploading();
         BulkEditActions.verifySuccessBanner(1);
-        BulkEditSearchPane.verifyPaneRecordsChangedCount(1);
+        BulkEditSearchPane.verifyPaneRecordsChangedCount('1 instance');
         BulkEditSearchPane.verifyExactChangesUnderColumnsByIdentifierInChangesAccordion(
           instance.hrid,
           BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_INSTANCES.ADMINISTRATIVE_NOTE,

diff --git a/...it-in-app-instances-verify-preview-of-records-matched-valid-and-invalid-identifiers.cy.js b/...it-in-app-instances-verify-preview-of-records-matched-valid-and-invalid-identifiers.cy.js
@@ -101,7 +101,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.uploadFile(instanceUUIDsFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyPaneTitleFileName(instanceUUIDsFileName);
-        BulkEditSearchPane.verifyPaneRecordsCount(`${numberOfRecords}`);
+        BulkEditSearchPane.verifyPaneRecordsCount(`${numberOfRecords} instance`);
         BulkEditSearchPane.verifyFileNameHeadLine(instanceUUIDsFileName);
 
         createdInstanceHrids.forEach((instanceHrid, index) => {
@@ -112,11 +112,11 @@ describe('bulk-edit', () => {
           );
         });
 
-        BulkEditSearchPane.verifyErrorLabel(
-          instanceUUIDsFileName,
-          numberOfRecords,
-          numberOfRecords,
-        );
+        BulkEditSearchPane.verifyErrorLabel(10);
+
+        invalidInstanceIds.forEach((invalidInstanceId) => {
+          BulkEditSearchPane.verifyNonMatchedResults(invalidInstanceId);
+        });
 
         createdInstanceHrids.forEach((instanceHrid) => {
           BulkEditSearchPane.verifyExactChangesUnderColumnsByIdentifierInResultsAccordion(
@@ -146,12 +146,6 @@ describe('bulk-edit', () => {
           );
         });
 
-        BulkEditSearchPane.verifyNonMatchedResults();
-
-        invalidInstanceIds.forEach((invalidInstanceId) => {
-          BulkEditSearchPane.verifyReasonForErrorByIdentifier(invalidInstanceId, 'No match found ');
-        });
-
         BulkEditSearchPane.verifyActionsAfterConductedInAppUploading(true, true);
         BulkEditSearchPane.verifyInstanceActionShowColumns();
         BulkEditSearchPane.uncheckShowColumnCheckbox(

diff --git a/...ulk-edit/in-app/bulk-edit-in-app-instances-verify-suppress-from-discovery-set-false.cy.js b/...ulk-edit/in-app/bulk-edit-in-app-instances-verify-suppress-from-discovery-set-false.cy.js
@@ -270,7 +270,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.uploadFile(instanceUUIDsFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyPaneTitleFileName(instanceUUIDsFileName);
-        BulkEditSearchPane.verifyPaneRecordsCount('6');
+        BulkEditSearchPane.verifyPaneRecordsCount('6 instance');
         BulkEditSearchPane.verifyFileNameHeadLine(instanceUUIDsFileName);
 
         createdInstanceHrids.forEach((instanceHrid) => {
@@ -281,7 +281,7 @@ describe('bulk-edit', () => {
           );
         });
 
-        BulkEditSearchPane.verifyErrorLabel(instanceUUIDsFileName, 6, 5);
+        BulkEditSearchPane.verifyErrorLabel(5);
         BulkEditActions.openActions();
         BulkEditSearchPane.changeShowColumnCheckboxIfNotYet(
           BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_INSTANCES.SUPPRESS_FROM_DISCOVERY,

diff --git a/...bulk-edit/in-app/bulk-edit-in-app-instances-verify-suppress-from-discovery-set-true.cy.js b/...bulk-edit/in-app/bulk-edit-in-app-instances-verify-suppress-from-discovery-set-true.cy.js
@@ -262,7 +262,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.uploadFile(instanceUUIDsFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyPaneTitleFileName(instanceUUIDsFileName);
-        BulkEditSearchPane.verifyPaneRecordsCount('6');
+        BulkEditSearchPane.verifyPaneRecordsCount('6 instance');
         BulkEditSearchPane.verifyFileNameHeadLine(instanceUUIDsFileName);
 
         createdInstanceHrids.forEach((instanceHrid) => {
@@ -273,7 +273,7 @@ describe('bulk-edit', () => {
           );
         });
 
-        BulkEditSearchPane.verifyErrorLabel(instanceUUIDsFileName, 6, 5);
+        BulkEditSearchPane.verifyErrorLabel(5);
         BulkEditActions.openActions();
         BulkEditSearchPane.changeShowColumnCheckboxIfNotYet(
           BULK_EDIT_TABLE_COLUMN_HEADERS.INVENTORY_INSTANCES.SUPPRESS_FROM_DISCOVERY,

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-items-change-note-type.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-items-change-note-type.cy.js
@@ -238,7 +238,7 @@ describe('bulk-edit', () => {
         BulkEditActions.commitChanges();
         BulkEditSearchPane.waitFileUploading();
         BulkEditActions.verifySuccessBanner(1);
-        BulkEditSearchPane.verifyPaneRecordsChangedCount(1);
+        BulkEditSearchPane.verifyPaneRecordsChangedCount('1 item');
 
         updatedNotesHeaderValueSets.forEach((updatedNoteHeaderValue) => {
           BulkEditSearchPane.verifyExactChangesUnderColumnsByIdentifierInChangesAccordion(

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-option-is-not-available.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-option-is-not-available.cy.js
@@ -64,7 +64,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.waitFileUploading();
 
         BulkEditSearchPane.verifyErrorLabel(invalidHoldingUUIDsFileName, 0, 1);
-        BulkEditSearchPane.verifyPaneRecordsCount(0);
+        BulkEditSearchPane.verifyPaneRecordsCount('0 holding');
         BulkEditSearchPane.verifyNonMatchedResults();
         BulkEditActions.openActions();
         BulkEditActions.downloadMatchedRecordsAbsent();

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-permanent-temporary-location-at-once.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-permanent-temporary-location-at-once.cy.js
@@ -90,7 +90,7 @@ describe('bulk-edit', () => {
         // Download matched records
         BulkEditActions.downloadMatchedResults();
         BulkEditSearchPane.verifyMatchedResults(item.firstBarcode);
-        BulkEditSearchPane.verifyPaneRecordsCount(1);
+        BulkEditSearchPane.verifyPaneRecordsCount('1 item');
         BulkEditActions.openInAppStartBulkEditFrom();
         BulkEditActions.verifyRowIcons();
         // Select "Temporary item location" from "Options" dropdown and "Replace with" option from "Select option" dropdown;

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-cancel.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-cancel.cy.js
@@ -58,7 +58,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.checkForUploading(usernamesFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyErrorLabel(usernamesFileName, 1, 1);
-        BulkEditSearchPane.verifyPaneRecordsCount(1);
+        BulkEditSearchPane.verifyPaneRecordsCount('1 user');
         BulkEditSearchPane.verifyMatchedResults(user.username);
 
         // Click "Actions" menu

diff --git a/...ss/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-errors-accordion-correct-identifier.cy.js b/...ss/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-errors-accordion-correct-identifier.cy.js
@@ -128,7 +128,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.uploadFile(instanceHRIDFileName);
         BulkEditSearchPane.checkForUploading(instanceHRIDFileName);
         BulkEditSearchPane.waitFileUploading();
-        BulkEditSearchPane.verifyPaneRecordsCount(2);
+        BulkEditSearchPane.verifyPaneRecordsCount('2 holding');
 
         BulkEditActions.downloadMatchedResults();
         BulkEditFiles.verifyMatchedResultFileContent(

diff --git a/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-request.cy.js b/cypress/e2e/bulk-edit/in-app/bulk-edit-in-app-verify-request.cy.js
@@ -55,7 +55,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.waitFileUploading();
         //  Check the result of uploading the .csv file with Items barcodes
         BulkEditSearchPane.verifyMatchedResults(item.itemBarcode);
-        BulkEditSearchPane.verifyPaneRecordsCount(1);
+        BulkEditSearchPane.verifyPaneRecordsCount('1 item');
         //  Click "Actions" menu => Select "Start Bulk edit" option
         BulkEditActions.openActions();
         BulkEditActions.openInAppStartBulkEditFrom();

diff --git a/cypress/e2e/bulk-edit/logs/in-app/bulk-edit-logs-in-app-instances-hrids.cy.js b/cypress/e2e/bulk-edit/logs/in-app/bulk-edit-logs-in-app-instances-hrids.cy.js
@@ -136,7 +136,12 @@ describe('bulk-edit', () => {
           ]);
           BulkEditActions.commitChanges();
           BulkEditActions.verifySuccessBanner(0);
-          BulkEditSearchPane.verifyErrorLabelAfterChanges(instanceHRIDFileName, 0, 2);
+          BulkEditSearchPane.verifyErrorLabel(2);
+
+          [hridValues.folioHrid, hridValues.marcHrid].forEach((hrid) => {
+            BulkEditSearchPane.verifyErrorByIdentifier(hrid, 'No change in value required');
+          });
+
           BulkEditActions.openActions();
           BulkEditActions.downloadErrors();
           ExportFile.verifyFileIncludes(errorsFromCommittingFileName, [

diff --git a/cypress/e2e/bulk-edit/logs/in-app/bulk-edit-logs-in-app-instances-uuids.cy.js b/cypress/e2e/bulk-edit/logs/in-app/bulk-edit-logs-in-app-instances-uuids.cy.js
@@ -124,7 +124,7 @@ describe('bulk-edit', () => {
             `${folioItem.instanceId},false,true,`,
             `${marcInstances[0].instanceId},false,true,`,
             `${unsuppressedFolioItem.instanceId},false,false,`,
-            `${marcInstances[1].instanceId},false,,`,
+            `${marcInstances[1].instanceId},false,false,`,
           ]);
           BulkEditActions.openStartBulkEditInstanceForm();
           BulkEditActions.verifyModifyLandingPageBeforeModifying();
@@ -152,11 +152,13 @@ describe('bulk-edit', () => {
             unsuppressedFolioItem.instanceId,
             marcInstances[1].instanceId,
           );
-          BulkEditSearchPane.verifyNonMatchedResults(
-            folioItem.instanceId,
-            marcInstances[0].instanceId,
-          );
-          BulkEditSearchPane.verifyErrorLabelAfterChanges(instanceUUIDsFileName, 2, 2);
+
+          BulkEditSearchPane.verifyErrorLabel(2);
+
+          [folioItem.instanceId, marcInstances[0].instanceId].forEach((instanceId) => {
+            BulkEditSearchPane.verifyErrorByIdentifier(instanceId, 'No change in value required');
+          });
+
           BulkEditActions.openActions();
           BulkEditActions.downloadChangedCSV();
           BulkEditActions.downloadErrors();
@@ -187,7 +189,7 @@ describe('bulk-edit', () => {
             `${folioItem.instanceId},false,true,`,
             `${marcInstances[0].instanceId},false,true,`,
             `${unsuppressedFolioItem.instanceId},false,false,`,
-            `${marcInstances[1].instanceId},false,,`,
+            `${marcInstances[1].instanceId},false,false,`,
           ]);
 
           BulkEditLogs.downloadFileWithProposedChanges();

diff --git a/cypress/e2e/bulk-edit/permissions/bulk-edit-invalid-users-identifiers.cy.js b/cypress/e2e/bulk-edit/permissions/bulk-edit-invalid-users-identifiers.cy.js
@@ -52,7 +52,7 @@ describe('bulk-edit', () => {
         BulkEditSearchPane.uploadFile(userUUIDsFileName);
         BulkEditSearchPane.waitFileUploading();
         BulkEditSearchPane.verifyErrorLabel(userUUIDsFileName, 0, 1);
-        BulkEditSearchPane.verifyPaneRecordsCount(0);
+        BulkEditSearchPane.verifyPaneRecordsCount('0 user');
         BulkEditSearchPane.verifyNonMatchedResults();
 
         // Navigate to the "Export manager" app