Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/folio-org/stripes-testing
Browse files Browse the repository at this point in the history
…into FAT-13526
  • Loading branch information
TetianaParanich committed May 23, 2024
2 parents 426230d + 0484de1 commit 643df3b
Show file tree
Hide file tree
Showing 243 changed files with 9,463 additions and 6,150 deletions.
7 changes: 4 additions & 3 deletions cypress/e2e/bulk-edit/bulk-edit-landing-page.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import BulkEditSearchPane, {
holdingsIdentifiers,
} from '../../support/fragments/bulk-edit/bulk-edit-search-pane';
import Users from '../../support/fragments/users/users';
import BulkEditLogs from '../../support/fragments/bulk-edit/bulk-edit-logs';

let user;

Expand Down Expand Up @@ -49,7 +50,7 @@ describe('bulk-edit', () => {
BulkEditSearchPane.verifySpecificTabHighlighted('Identifier');

// verify panes
BulkEditSearchPane.verifyRecordTypesSortedAlphabetically(false);
BulkEditSearchPane.verifyRecordTypesSortedAlphabetically();
BulkEditSearchPane.verifyPanesBeforeImport();
BulkEditSearchPane.verifyBulkEditPaneItems();
BulkEditSearchPane.verifySetCriteriaPaneItems();
Expand Down Expand Up @@ -83,8 +84,8 @@ describe('bulk-edit', () => {
BulkEditSearchPane.openLogsSearch();
BulkEditSearchPane.verifySetCriteriaPaneSpecificTabs('Identifier', 'Logs', 'Query');
BulkEditSearchPane.verifySpecificTabHighlighted('Logs');
BulkEditSearchPane.verifyLogsPane();
BulkEditSearchPane.verifyRecordTypesSortedAlphabetically();
BulkEditLogs.verifyLogsPane();
BulkEditLogs.verifyRecordTypesSortedAlphabetically();
},
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-acti
import Users from '../../../support/fragments/users/users';
import ExportFile from '../../../support/fragments/data-export/exportFile';
import DateTools from '../../../support/utils/dateTools';
import BulkEditLogs from '../../../support/fragments/bulk-edit/bulk-edit-logs';

let user;
let updatedDate;
Expand Down Expand Up @@ -122,25 +123,25 @@ describe('bulk-edit', () => {
);

BulkEditSearchPane.openLogsSearch();
BulkEditSearchPane.verifyLogsPane();
BulkEditSearchPane.checkUsersCheckbox();
BulkEditLogs.verifyLogsPane();
BulkEditLogs.checkUsersCheckbox();

BulkEditSearchPane.clickActionsRunBy(user.username);
BulkEditSearchPane.verifyLogsRowActionWhenCompleted();
BulkEditSearchPane.downloadFileUsedToTrigger();
BulkEditLogs.clickActionsRunBy(user.username);
BulkEditLogs.verifyLogsRowActionWhenCompleted();
BulkEditLogs.downloadFileUsedToTrigger();
ExportFile.verifyFileIncludes(userUUIDsFileName, [user.userId]);

BulkEditSearchPane.downloadFileWithMatchingRecords();
BulkEditLogs.downloadFileWithMatchingRecords();
ExportFile.verifyFileIncludes(matchedRecordsFileName, ['Date of birth', userColumns]);

BulkEditSearchPane.downloadFileWithProposedChanges();
BulkEditLogs.downloadFileWithProposedChanges();
ExportFile.verifyFileIncludes(previewOfProposedChangesFileName, [
'Date of birth',
userColumns,
newName,
]);

BulkEditSearchPane.downloadFileWithUpdatedRecords();
BulkEditLogs.downloadFileWithUpdatedRecords();
ExportFile.verifyFileIncludes(updatedRecordsFileName, [
'Date Of Birth',
userColumns,
Expand Down
17 changes: 9 additions & 8 deletions cypress/e2e/bulk-edit/csv/bulk-edit-csv-users-address-type.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Users from '../../../support/fragments/users/users';
import UsersSearchPane from '../../../support/fragments/users/usersSearchPane';
import UserEdit from '../../../support/fragments/users/userEdit';
import ExportFile from '../../../support/fragments/data-export/exportFile';
import BulkEditLogs from '../../../support/fragments/bulk-edit/bulk-edit-logs';

let user;
let addressTypeId;
Expand Down Expand Up @@ -101,21 +102,21 @@ describe('bulk-edit', () => {
BulkEditActions.downloadMatchedRecordsAbsent();

BulkEditSearchPane.openLogsSearch();
BulkEditSearchPane.verifyLogsPane();
BulkEditSearchPane.checkUsersCheckbox();
BulkEditSearchPane.clickActionsRunBy(user.username);
BulkEditSearchPane.verifyLogsRowActionWhenCompleted();
BulkEditLogs.verifyLogsPane();
BulkEditLogs.checkUsersCheckbox();
BulkEditLogs.clickActionsRunBy(user.username);
BulkEditLogs.verifyLogsRowActionWhenCompleted();

BulkEditSearchPane.downloadFileUsedToTrigger();
BulkEditLogs.downloadFileUsedToTrigger();
ExportFile.verifyFileIncludes(userBarcodesFileName, [user.barcode]);

BulkEditSearchPane.downloadFileWithMatchingRecords();
BulkEditLogs.downloadFileWithMatchingRecords();
ExportFile.verifyFileIncludes(matchedRecordsFileName, [user.barcode]);

BulkEditSearchPane.downloadFileWithProposedChanges();
BulkEditLogs.downloadFileWithProposedChanges();
ExportFile.verifyFileIncludes(previewOfProposedChangesFileName, [newFirstName]);

BulkEditSearchPane.downloadFileWithUpdatedRecords();
BulkEditLogs.downloadFileWithUpdatedRecords();
ExportFile.verifyFileIncludes(updatedRecordsFileName, [newFirstName]);

cy.visit(TopMenu.usersPath);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-actions';
import Users from '../../../support/fragments/users/users';
import BulkEditLogs from '../../../support/fragments/bulk-edit/bulk-edit-logs';

let user;
const userBarcodesFileName = `userBarcodes_${getRandomPostfix()}.csv`;
Expand Down Expand Up @@ -65,10 +66,10 @@ describe('bulk-edit', () => {
BulkEditActions.verifyDownloadChangedRecordsAbsent();

BulkEditSearchPane.openLogsSearch();
BulkEditSearchPane.verifyLogsPane();
BulkEditSearchPane.checkUsersCheckbox();
BulkEditSearchPane.clickActionsRunBy(user.username);
BulkEditSearchPane.verifyLogsRowActionWhenNoChangesApplied();
BulkEditLogs.verifyLogsPane();
BulkEditLogs.checkUsersCheckbox();
BulkEditLogs.clickActionsRunBy(user.username);
BulkEditLogs.verifyLogsRowActionWhenNoChangesApplied();
},
);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-s
import BulkEditActions from '../../../support/fragments/bulk-edit/bulk-edit-actions';
import getRandomPostfix from '../../../support/utils/stringTools';
import FileManager from '../../../support/utils/fileManager';
import BulkEditLogs from '../../../support/fragments/bulk-edit/bulk-edit-logs';

let user;
const invalidUserUUID = `invalidUserUUID_${uuid()}`;
Expand Down Expand Up @@ -94,7 +95,7 @@ describe('bulk-edit', () => {
// BulkEditSearchPane.verifyNonMatchedResults(invalidUserUUID);

BulkEditSearchPane.openLogsSearch();
BulkEditSearchPane.verifyLogsPane();
BulkEditLogs.verifyLogsPane();
BulkEditSearchPane.openIdentifierSearch();
// BulkEditSearchPane.verifyErrorLabel(userUUIDsFileName, 1, 1);
BulkEditSearchPane.verifyMatchedResults(user.username);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
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 InventoryInstances from '../../../support/fragments/inventory/inventoryInstances';
import InventorySearchAndFilter from '../../../support/fragments/inventory/inventorySearchAndFilter';
import ItemRecordView from '../../../support/fragments/inventory/item/itemRecordView';
import TopMenu from '../../../support/fragments/topMenu';
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 { HOLDING_NOTES } from '../../../support/constants';
import HoldingsRecordView from '../../../support/fragments/inventory/holdingsRecordView';

let user;
const notes = {
actionNote: 'Holding note',
actionNoteStaffOnly: 'Holding note Staff only',
};

const item = {
barcode: getRandomPostfix(),
instanceName: `instance-${getRandomPostfix()}`,
};
const holdingUUIDsFileName = `validHoldingUUIDs_${getRandomPostfix()}.csv`;
const matchedRecordsFileName = `*-Matched-Records-${holdingUUIDsFileName}`;
const previewFileName = `*-Updates-Preview-${holdingUUIDsFileName}`;
const changedRecordsFileName = `*-Changed-Records-${holdingUUIDsFileName}`;

describe('bulk-edit', () => {
describe('in-app approach', () => {
before('create test data', () => {
cy.createTempUser([
permissions.bulkEditView.gui,
permissions.bulkEditEdit.gui,
permissions.inventoryAll.gui,
]).then((userProperties) => {
user = userProperties;
cy.login(user.username, user.password, {
path: TopMenu.bulkEditPath,
waiter: BulkEditSearchPane.waitLoading,
});
item.instanceId = InventoryInstances.createInstanceViaApi(item.instanceName, item.barcode);
cy.getHoldings({
limit: 1,
query: `"instanceId"="${item.instanceId}"`,
}).then((holdings) => {
item.holdingHRID = holdings[0].hrid;
item.holdingsUUID = holdings[0].id;
FileManager.createFile(`cypress/fixtures/${holdingUUIDsFileName}`, holdings[0].id);
cy.updateHoldingRecord(holdings[0].id, {
...holdings[0],
notes: [
{
holdingsNoteTypeId: HOLDING_NOTES.ACTION_NOTE,
note: notes.actionNote,
staffOnly: false,
},
{
holdingsNoteTypeId: HOLDING_NOTES.ACTION_NOTE,
note: notes.actionNoteStaffOnly,
staffOnly: true,
},
],
});
});
});
});

after('delete test data', () => {
InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(item.barcode);
Users.deleteViaApi(user.userId);
FileManager.deleteFile(`cypress/fixtures/${holdingUUIDsFileName}`);
FileManager.deleteFileFromDownloadsByMask(
matchedRecordsFileName,
previewFileName,
changedRecordsFileName,
);
});

it(
'C422004 Verify Bulk Edit actions for Holdings notes - preserve the "Staff only" flag when change note type within the group (firebird)',
{ tags: ['criticalPath', 'firebird'] },
() => {
BulkEditSearchPane.verifyDragNDropRecordTypeIdentifierArea('Holdings', 'Holdings UUIDs');
BulkEditSearchPane.uploadFile(holdingUUIDsFileName);
BulkEditSearchPane.waitFileUploading();
BulkEditSearchPane.verifyMatchedResults(item.holdingHRID);

BulkEditActions.downloadMatchedResults();
BulkEditSearchPane.changeShowColumnCheckboxIfNotYet('Action note', 'Note');
BulkEditActions.openInAppStartBulkEditFrom();
ExportFile.verifyFileIncludes(matchedRecordsFileName, [item.holdingsUUID]);
BulkEditActions.verifyHoldingsOptions();
BulkEditActions.changeNoteType('Action note', 'Note');

BulkEditActions.confirmChanges();
BulkEditActions.verifyChangesInAreYouSureForm('Note', [
`${notes.actionNote} | ${notes.actionNoteStaffOnly} (staff only)`,
]);
BulkEditActions.downloadPreview();
ExportFile.verifyFileIncludes(previewFileName, [
`Note;${notes.actionNote};false|Note;${notes.actionNoteStaffOnly};true,`,
]);
BulkEditActions.commitChanges();
BulkEditSearchPane.waitFileUploading();
BulkEditSearchPane.verifyChangesUnderColumns(
'Note',
`${notes.actionNote} | ${notes.actionNoteStaffOnly} (staff only)`,
);
BulkEditSearchPane.verifyExactChangesUnderColumns('Action note', '');
BulkEditActions.openActions();
BulkEditActions.downloadChangedCSV();
ExportFile.verifyFileIncludes(changedRecordsFileName, [
`Note;${notes.actionNote};false|Note;${notes.actionNoteStaffOnly};true,`,
]);

TopMenuNavigation.navigateToApp('Inventory');
InventorySearchAndFilter.switchToHoldings();
InventorySearchAndFilter.searchHoldingsByHRID(item.holdingHRID);
InventorySearchAndFilter.selectViewHoldings();
HoldingsRecordView.checkHoldingsNoteByRow([notes.actionNote, 'No']);
HoldingsRecordView.checkHoldingsNoteByRow([notes.actionNoteStaffOnly, 'Yes'], 1);
ItemRecordView.verifyTextAbsent('Action note');
},
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Users from '../../../support/fragments/users/users';
import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import HoldingsRecordView from '../../../support/fragments/inventory/holdingsRecordView';
import { HOLDING_NOTES } from '../../../support/constants';

let user;
const notes = {
Expand Down Expand Up @@ -51,14 +52,12 @@ describe('bulk-edit', () => {
administrativeNotes: [notes.admin],
notes: [
{
// Action note
holdingsNoteTypeId: 'd6510242-5ec3-42ed-b593-3585d2e48fd6',
holdingsNoteTypeId: HOLDING_NOTES.ACTION_NOTE,
note: notes.action,
staffOnly: false,
},
{
// Electronic bookplate note
holdingsNoteTypeId: '88914775-f677-4759-b57b-1a33b90b24e0',
holdingsNoteTypeId: HOLDING_NOTES.ELECTRONIC_BOOKPLATE_NOTE,
note: notes.elbook,
staffOnly: false,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Users from '../../../support/fragments/users/users';
import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import HoldingsRecordView from '../../../support/fragments/inventory/holdingsRecordView';
import { HOLDING_NOTES } from '../../../support/constants';

let user;

Expand Down Expand Up @@ -53,14 +54,12 @@ describe('bulk-edit', () => {
administrativeNotes: [notes.admin],
notes: [
{
// Binding
holdingsNoteTypeId: 'e19eabab-a85c-4aef-a7b2-33bd9acef24e',
holdingsNoteTypeId: HOLDING_NOTES.BINDING_NOTE,
note: notes.binding,
staffOnly: false,
},
{
// Provenance
holdingsNoteTypeId: 'db9b4787-95f0-4e78-becf-26748ce6bdeb',
holdingsNoteTypeId: HOLDING_NOTES.PROVENANCE_NOTE,
note: notes.provenance,
staffOnly: false,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import TopMenu from '../../../support/fragments/topMenu';
import Users from '../../../support/fragments/users/users';
import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import { LOCATION_IDS } from '../../../support/constants';

let user;
const holdingHRIDsFileName = `holdingHRIDs-${getRandomPostfix()}.csv`;
Expand Down Expand Up @@ -39,8 +40,7 @@ describe('bulk-edit', () => {
item.holdingHRID = holdings[0].hrid;
cy.updateHoldingRecord(holdings[0].id, {
...holdings[0],
// Popular Reading Collection
temporaryLocationId: 'b241764c-1466-4e1d-a028-1a3684a5da87',
temporaryLocationId: LOCATION_IDS.POPULAR_READING_COLLECTION,
sourceId: null,
});
FileManager.createFile(`cypress/fixtures/${holdingHRIDsFileName}`, holdings[0].hrid);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Users from '../../../support/fragments/users/users';
import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
import { LOCATION_IDS } from '../../../support/constants';

let user;
const validHoldingHRIDsFileName = `validHoldingHRIDs_${getRandomPostfix()}.csv`;
Expand Down Expand Up @@ -58,8 +59,7 @@ describe('bulk-edit', () => {
item.holdingHRID = holdings[0].hrid;
cy.updateHoldingRecord(holdings[0].id, {
...holdings[0],
// Popular Reading Collection
permanentLocationId: 'b241764c-1466-4e1d-a028-1a3684a5da87',
permanentLocationId: LOCATION_IDS.POPULAR_READING_COLLECTION,
// Updating holdings with special characters
callNumber: 'number;special&characters',
callNumberPrefix: 'number-prefix;special&characters',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import TopMenu from '../../../support/fragments/topMenu';
import Users from '../../../support/fragments/users/users';
import FileManager from '../../../support/utils/fileManager';
import getRandomPostfix from '../../../support/utils/stringTools';
import { LOCATION_IDS } from '../../../support/constants';

let user;
let holdingHRID;
Expand Down Expand Up @@ -38,8 +39,7 @@ describe('bulk-edit', () => {
holdingHRID = holdings[0].hrid;
cy.updateHoldingRecord(holdings[0].id, {
...holdings[0],
// Popular Reading Collection
permanentLocationId: 'b241764c-1466-4e1d-a028-1a3684a5da87',
permanentLocationId: LOCATION_IDS.POPULAR_READING_COLLECTION,
});
FileManager.createFile(`cypress/fixtures/${validHoldingUUIDsFileName}`, holdings[0].id);
});
Expand Down

0 comments on commit 643df3b

Please sign in to comment.