From 1f52fc754787d1df04cc77b71e9b3fba2c43a8a5 Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Mon, 29 Dec 2025 19:52:21 +0200 Subject: [PATCH 1/6] added C543860 --- ...or-linked-to-instance-subject-source.cy.js | 10 ++-- ...dy-existed-folio-subject-source-name.cy.js | 48 +++++++++++++++++++ .../inventory/instances/subjectSources.js | 19 +++++++- 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-folio-subject-source-name.cy.js diff --git a/cypress/e2e/inventory/settings/subjects/delete-action-in-settings-inventory-create-edit-delete-subject-sources-permission-for-linked-to-instance-subject-source.cy.js b/cypress/e2e/inventory/settings/subjects/delete-action-in-settings-inventory-create-edit-delete-subject-sources-permission-for-linked-to-instance-subject-source.cy.js index f583ea3952..a8344f1f70 100644 --- a/cypress/e2e/inventory/settings/subjects/delete-action-in-settings-inventory-create-edit-delete-subject-sources-permission-for-linked-to-instance-subject-source.cy.js +++ b/cypress/e2e/inventory/settings/subjects/delete-action-in-settings-inventory-create-edit-delete-subject-sources-permission-for-linked-to-instance-subject-source.cy.js @@ -1,15 +1,15 @@ +import { APPLICATION_NAMES } from '../../../../support/constants'; import { Permissions } from '../../../../support/dictionary'; -import Users from '../../../../support/fragments/users/users'; -import getRandomPostfix from '../../../../support/utils/stringTools'; +import InventoryInstance from '../../../../support/fragments/inventory/inventoryInstance'; import SubjectSources, { ACTION_BUTTONS, } from '../../../../support/fragments/settings/inventory/instances/subjectSources'; -import InventoryInstance from '../../../../support/fragments/inventory/inventoryInstance'; -import { APPLICATION_NAMES } from '../../../../support/constants'; -import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; import SettingsInventory, { INVENTORY_SETTINGS_TABS, } from '../../../../support/fragments/settings/inventory/settingsInventory'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; +import Users from '../../../../support/fragments/users/users'; +import getRandomPostfix from '../../../../support/utils/stringTools'; describe('Inventory', () => { describe('Settings', () => { diff --git a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-folio-subject-source-name.cy.js b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-folio-subject-source-name.cy.js new file mode 100644 index 0000000000..6ec0d94445 --- /dev/null +++ b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-folio-subject-source-name.cy.js @@ -0,0 +1,48 @@ +import { APPLICATION_NAMES } from '../../../../support/constants'; +import { Permissions } from '../../../../support/dictionary'; +import SubjectSources from '../../../../support/fragments/settings/inventory/instances/subjectSources'; +import SettingsInventory, { + INVENTORY_SETTINGS_TABS, +} from '../../../../support/fragments/settings/inventory/settingsInventory'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; +import Users from '../../../../support/fragments/users/users'; + +describe('Inventory', () => { + describe('Settings', () => { + describe('Subjects', () => { + const testData = { + user: {}, + subjectSourceName: 'Canadian Subject Headings', + errorMessage: 'Error saving data. Name must be unique.', + }; + + before('Create test data and login', () => { + cy.createTempUser([Permissions.uiSettingsSubjectSourceCreateEditDelete.gui]).then( + (userProperties) => { + testData.user = userProperties; + + cy.login(testData.user.username, testData.user.password); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS); + SettingsInventory.goToSettingsInventory(); + SettingsInventory.selectSettingsTab(INVENTORY_SETTINGS_TABS.SUBJECT_SOURCES); + SubjectSources.waitLoading(); + }, + ); + }); + + after('Delete test data', () => { + cy.getAdminToken(); + Users.deleteViaApi(testData.user.userId); + }); + + it( + "C543860 Check that Subject source can't be created with already existed folio subject source name (folijet)", + { tags: ['extendedPath', 'folijet', 'C543860'] }, + () => { + SubjectSources.create(testData.subjectSourceName); + SubjectSources.validateNameFieldWithError(testData.errorMessage); + }, + ); + }); + }); +}); diff --git a/cypress/support/fragments/settings/inventory/instances/subjectSources.js b/cypress/support/fragments/settings/inventory/instances/subjectSources.js index f3e32bdbb0..777261ae83 100644 --- a/cypress/support/fragments/settings/inventory/instances/subjectSources.js +++ b/cypress/support/fragments/settings/inventory/instances/subjectSources.js @@ -1,11 +1,12 @@ +import { including } from '@interactors/html'; import { Button, EditableListRow, - including, Modal, MultiColumnListCell, MultiColumnListHeader, Pane, + TextField, } from '../../../../../../interactors'; import { REQUEST_METHOD } from '../../../../constants'; import DateTools from '../../../../utils/dateTools'; @@ -13,6 +14,10 @@ import DeleteCancelReason from '../../../consortium-manager/modal/delete-cancel- const rootPane = Pane('Subject sources'); const modalWithErrorMessage = Modal('Cannot delete Subject source'); +const newButton = Button('+ New'); +const saveButton = Button('Save'); +const cancelButton = Button('Cancel'); +const nameField = TextField({ name: 'items[0].name' }); const COLUMN_INDEX = { NAME: 0, @@ -139,6 +144,9 @@ export default { }), ); }, + create(value, rowIndex = 0) { + cy.do([newButton.click(), TextField({ name: `items[${rowIndex}].name` }).fillIn(value)]); + }, confirmDeletionOfSubjectSource(name) { DeleteCancelReason.waitLoadingDeleteModal('Subject source', name); @@ -156,4 +164,13 @@ export default { cy.do(Button('Okay').click()); cy.expect(modalWithErrorMessage.absent()); }, + + validateNameFieldWithError(message) { + cy.expect([ + nameField.has({ error: message }), + cancelButton.has({ disabled: false }), + saveButton.has({ disabled: true }), + ]); + cy.wait(1000); + }, }; From 137a2bb1220012731ace9629dc4d538a9366f9bf Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Mon, 29 Dec 2025 20:02:56 +0200 Subject: [PATCH 2/6] added C543861 --- ...dy-existed-local-subject-source-name.cy.js | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-local-subject-source-name.cy.js diff --git a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-local-subject-source-name.cy.js b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-local-subject-source-name.cy.js new file mode 100644 index 0000000000..79a671f7af --- /dev/null +++ b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-created-with-already-existed-local-subject-source-name.cy.js @@ -0,0 +1,61 @@ +import { APPLICATION_NAMES } from '../../../../support/constants'; +import { Permissions } from '../../../../support/dictionary'; +import SubjectSources from '../../../../support/fragments/settings/inventory/instances/subjectSources'; +import SettingsInventory, { + INVENTORY_SETTINGS_TABS, +} from '../../../../support/fragments/settings/inventory/settingsInventory'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; +import Users from '../../../../support/fragments/users/users'; +import getRandomPostfix from '../../../../support/utils/stringTools'; + +describe('Inventory', () => { + describe('Settings', () => { + describe('Subjects', () => { + const testData = { + user: {}, + errorMessage: 'Error saving data. Name must be unique.', + }; + const localSubjectSource = { + name: `C543861 autotestSubjectSourceName${getRandomPostfix()}`, + source: 'local', + }; + + before('Create test data and login', () => { + cy.getAdminToken(); + SubjectSources.createViaApi({ + source: localSubjectSource.source, + name: localSubjectSource.name, + }).then((response) => { + localSubjectSource.id = response.body.id; + }); + + cy.createTempUser([Permissions.uiSettingsSubjectSourceCreateEditDelete.gui]).then( + (userProperties) => { + testData.user = userProperties; + + cy.login(testData.user.username, testData.user.password); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS); + SettingsInventory.goToSettingsInventory(); + SettingsInventory.selectSettingsTab(INVENTORY_SETTINGS_TABS.SUBJECT_SOURCES); + SubjectSources.waitLoading(); + }, + ); + }); + + after('Delete test data', () => { + cy.getAdminToken(); + Users.deleteViaApi(testData.user.userId); + SubjectSources.deleteViaApi(localSubjectSource.id); + }); + + it( + "C543861 Check that Subject source can't be created with already existed local subject source name (folijet)", + { tags: ['extendedPath', 'folijet', 'C543861'] }, + () => { + SubjectSources.create(localSubjectSource.name); + SubjectSources.validateNameFieldWithError(testData.errorMessage); + }, + ); + }); + }); +}); From 5a9bf54e752ecd719398514f6c53ce29f7bb77d8 Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Mon, 29 Dec 2025 22:53:07 +0200 Subject: [PATCH 3/6] added C543864 --- ...-already-existed-subject-source-name.cy.js | 75 +++++++++++++++++++ .../inventory/instances/subjectSources.js | 33 +++++++- 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js diff --git a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js new file mode 100644 index 0000000000..19d2087c79 --- /dev/null +++ b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js @@ -0,0 +1,75 @@ +import { APPLICATION_NAMES } from '../../../../support/constants'; +import { Permissions } from '../../../../support/dictionary'; +import SubjectSources from '../../../../support/fragments/settings/inventory/instances/subjectSources'; +import SettingsInventory, { + INVENTORY_SETTINGS_TABS, +} from '../../../../support/fragments/settings/inventory/settingsInventory'; +import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; +// import Users from '../../../../support/fragments/users/users'; +import getRandomPostfix from '../../../../support/utils/stringTools'; + +describe('Inventory', () => { + describe('Settings', () => { + describe('Subjects', () => { + const testData = { + user: {}, + errorMessage: 'Error saving data. Name must be unique.', + }; + const firstLocalSubjectSource = { + name: `C543864 autotestSubjectSourceName${getRandomPostfix()}`, + source: 'local', + }; + const secondLocalSubjectSource = { + name: `C543864 autotestSubjectSourceName${getRandomPostfix()}`, + source: 'local', + }; + + before('Create test data and login', () => { + cy.getAdminToken(); + SubjectSources.createViaApi({ + source: firstLocalSubjectSource.source, + name: firstLocalSubjectSource.name, + }).then((response) => { + firstLocalSubjectSource.id = response.body.id; + }); + SubjectSources.createViaApi({ + source: secondLocalSubjectSource.source, + name: secondLocalSubjectSource.name, + }).then((response) => { + secondLocalSubjectSource.id = response.body.id; + }); + + cy.createTempUser([Permissions.uiSettingsSubjectSourceCreateEditDelete.gui]).then( + (userProperties) => { + testData.user = userProperties; + + cy.login(testData.user.username, testData.user.password); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS); + SettingsInventory.goToSettingsInventory(); + SettingsInventory.selectSettingsTab(INVENTORY_SETTINGS_TABS.SUBJECT_SOURCES); + SubjectSources.waitLoading(); + }, + ); + }); + + // after('Delete test data', () => { + // cy.getAdminToken(); + // Users.deleteViaApi(testData.user.userId); + // SubjectSources.deleteViaApi(localSubjectSource.id); + // }); + + it( + "C543864 Check that Subject source can't be edited with already existed subject source name (folijet)", + { tags: ['extendedPath', 'folijet', 'C543864'] }, + () => { + SubjectSources.editSubjectSourceName( + firstLocalSubjectSource.name, + secondLocalSubjectSource.name, + ); + SubjectSources.validateButtonsState({ cancel: 'enabled', save: 'disabled' }); + SubjectSources.validateNameFieldWithError(testData.errorMessage); + }, + ); + }); + }); +}); diff --git a/cypress/support/fragments/settings/inventory/instances/subjectSources.js b/cypress/support/fragments/settings/inventory/instances/subjectSources.js index 777261ae83..ab45a7e775 100644 --- a/cypress/support/fragments/settings/inventory/instances/subjectSources.js +++ b/cypress/support/fragments/settings/inventory/instances/subjectSources.js @@ -17,7 +17,7 @@ const modalWithErrorMessage = Modal('Cannot delete Subject source'); const newButton = Button('+ New'); const saveButton = Button('Save'); const cancelButton = Button('Cancel'); -const nameField = TextField({ name: 'items[0].name' }); +// const nameField = TextField({ name: 'items[0].name' }); const COLUMN_INDEX = { NAME: 0, @@ -144,10 +144,37 @@ export default { }), ); }, + create(value, rowIndex = 0) { cy.do([newButton.click(), TextField({ name: `items[${rowIndex}].name` }).fillIn(value)]); }, + editSubjectSourceName(oldValue, newValue) { + const actionsCell = MultiColumnListCell({ columnIndex: COLUMN_INDEX.ACTIONS }); + const rowSelector = MultiColumnListCell({ content: oldValue }); + cy.do( + rowSelector.perform((element) => { + const rowIndex = getRowIndex(element); + const row = EditableListRow({ index: rowIndex }); + + cy.do([ + row + .find(actionsCell) + .find(Button({ icon: ACTION_BUTTONS.EDIT })) + .click(), + TextField({ name: `items[${rowIndex}].name` }).fillIn(newValue), + ]); + }), + ); + }, + + validateButtonsState({ cancel = 'enabled', save = 'enabled' } = {}) { + const cancelButtonState = cancel === 'enabled' ? { disabled: false } : { disabled: true }; + const saveButtonState = save === 'enabled' ? { disabled: false } : { disabled: true }; + + cy.expect([saveButton.has(saveButtonState), cancelButton.has(cancelButtonState)]); + }, + confirmDeletionOfSubjectSource(name) { DeleteCancelReason.waitLoadingDeleteModal('Subject source', name); DeleteCancelReason.clickDelete(); @@ -165,9 +192,9 @@ export default { cy.expect(modalWithErrorMessage.absent()); }, - validateNameFieldWithError(message) { + validateNameFieldWithError(message, indexRow = 0) { cy.expect([ - nameField.has({ error: message }), + TextField({ name: `items[${indexRow}].name` }).has({ error: message }), cancelButton.has({ disabled: false }), saveButton.has({ disabled: true }), ]); From 2ac34ef31920b2ceced2f9f6f5ee88d24dbe1bfa Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Fri, 9 Jan 2026 13:29:11 +0200 Subject: [PATCH 4/6] fixed test --- ...-edited-with-already-existed-subject-source-name.cy.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js index 19d2087c79..89709dea17 100644 --- a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js +++ b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js @@ -26,6 +26,9 @@ describe('Inventory', () => { before('Create test data and login', () => { cy.getAdminToken(); + cy.getAdminUserDetails().then((admin) => { + testData.adminUser = admin.username; + }); SubjectSources.createViaApi({ source: firstLocalSubjectSource.source, name: firstLocalSubjectSource.name, @@ -62,6 +65,11 @@ describe('Inventory', () => { "C543864 Check that Subject source can't be edited with already existed subject source name (folijet)", { tags: ['extendedPath', 'folijet', 'C543864'] }, () => { + SubjectSources.verifySubjectSourceExists( + firstLocalSubjectSource.name, + firstLocalSubjectSource.source, + testData.adminUser, + ); SubjectSources.editSubjectSourceName( firstLocalSubjectSource.name, secondLocalSubjectSource.name, From ac0ea583a178e60ce3550bf00b4e6a958d7183eb Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Tue, 17 Feb 2026 10:37:15 +0200 Subject: [PATCH 5/6] added C543864 --- ...-already-existed-subject-source-name.cy.js | 24 +++++++++++-------- .../inventory/instances/subjectSources.js | 22 ++++++++++++----- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js index 89709dea17..cfe6840201 100644 --- a/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js +++ b/cypress/e2e/settings/inventory/subjects/subject-source-can-not-be-edited-with-already-existed-subject-source-name.cy.js @@ -5,7 +5,7 @@ import SettingsInventory, { INVENTORY_SETTINGS_TABS, } from '../../../../support/fragments/settings/inventory/settingsInventory'; import TopMenuNavigation from '../../../../support/fragments/topMenuNavigation'; -// import Users from '../../../../support/fragments/users/users'; +import Users from '../../../../support/fragments/users/users'; import getRandomPostfix from '../../../../support/utils/stringTools'; describe('Inventory', () => { @@ -27,7 +27,7 @@ describe('Inventory', () => { before('Create test data and login', () => { cy.getAdminToken(); cy.getAdminUserDetails().then((admin) => { - testData.adminUser = admin.username; + testData.adminUser = admin; }); SubjectSources.createViaApi({ source: firstLocalSubjectSource.source, @@ -55,11 +55,12 @@ describe('Inventory', () => { ); }); - // after('Delete test data', () => { - // cy.getAdminToken(); - // Users.deleteViaApi(testData.user.userId); - // SubjectSources.deleteViaApi(localSubjectSource.id); - // }); + after('Delete test data', () => { + cy.getAdminToken(); + Users.deleteViaApi(testData.user.userId); + SubjectSources.deleteViaApi(firstLocalSubjectSource.id); + SubjectSources.deleteViaApi(secondLocalSubjectSource.id); + }); it( "C543864 Check that Subject source can't be edited with already existed subject source name (folijet)", @@ -68,14 +69,17 @@ describe('Inventory', () => { SubjectSources.verifySubjectSourceExists( firstLocalSubjectSource.name, firstLocalSubjectSource.source, - testData.adminUser, + `${testData.adminUser.personal.lastName}, ${testData.adminUser.personal.firstName}`, + { actions: ['edit', 'trash'] }, ); SubjectSources.editSubjectSourceName( firstLocalSubjectSource.name, secondLocalSubjectSource.name, ); - SubjectSources.validateButtonsState({ cancel: 'enabled', save: 'disabled' }); - SubjectSources.validateNameFieldWithError(testData.errorMessage); + SubjectSources.validateNameFieldWithError( + testData.errorMessage, + secondLocalSubjectSource.name, + ); }, ); }); diff --git a/cypress/support/fragments/settings/inventory/instances/subjectSources.js b/cypress/support/fragments/settings/inventory/instances/subjectSources.js index ab45a7e775..f900e33d05 100644 --- a/cypress/support/fragments/settings/inventory/instances/subjectSources.js +++ b/cypress/support/fragments/settings/inventory/instances/subjectSources.js @@ -192,12 +192,22 @@ export default { cy.expect(modalWithErrorMessage.absent()); }, - validateNameFieldWithError(message, indexRow = 0) { - cy.expect([ - TextField({ name: `items[${indexRow}].name` }).has({ error: message }), - cancelButton.has({ disabled: false }), - saveButton.has({ disabled: true }), - ]); + validateNameFieldWithError(message) { + cy.get('#controlled-vocab-pane') + .find('input[name*="items["][name*="].name"]') + .should('exist') + .then(($inputs) => { + const nameAttr = $inputs.first().attr('name'); + const indexMatch = nameAttr.match(/items\[(\d+)\]\.name/); + if (indexMatch) { + const rowIndex = parseInt(indexMatch[1], 10); + cy.expect([ + TextField({ name: `items[${rowIndex}].name` }).has({ error: message }), + cancelButton.has({ disabled: false }), + saveButton.has({ disabled: true }), + ]); + } + }); cy.wait(1000); }, }; From 8728093b484b51b06daf12510e3e64d5cb9df487 Mon Sep 17 00:00:00 2001 From: Tetiana_Paranich Date: Tue, 17 Feb 2026 12:49:43 +0200 Subject: [PATCH 6/6] fixed tests --- ...ions-for-FY-when-user-assigned-to-AU.cy.js | 106 +++---- ...er-is-NOT-assigned-to-AU-only-delete.cy.js | 127 ++++---- ...OT-assigned-to-AU-only-edit-and-view.cy.js | 114 ++++--- ...user-is-NOT-assigned-to-AU-only-view.cy.js | 113 ++++--- ...r-FY-when-user-is-NOT-assigned-to-AU.cy.js | 112 ++++--- ...mport-file-for-create-invoice-record.cy.js | 2 +- .../e2e/edi-import-large-invoice-file.cy.js | 2 +- ...extention-txt-imports-without-errors.cy.js | 2 +- ...roblems-completes-and-displays-error.cy.js | 2 +- ...scription-is-incorrectly-constructed.cy.js | 2 +- ...-column-when-importing-edifact-files.cy.js | 2 +- ...import-of-orders-with-pending-status.cy.js | 2 +- ...lectronic-resource-with-no-inventory.cy.js | 2 +- ...-orders-other-with-instance-holdings.cy.js | 2 +- ...source-with-instances-holdings-items.cy.js | 2 +- ...orting-ebook-orders-with-open-status.cy.js | 2 +- ...ders-multiple-marc-subfield-mappings.cy.js | 2 +- ...ding-order-with-receipt-not-required.cy.js | 2 +- ...tiple-product-id-tepes-mapped-case-1.cy.js | 2 +- ...-discarded-error-actions-for-invoice.cy.js | 2 +- ...th-created-action-for-invoice-record.cy.js | 2 +- ...orting-of-orders-with-pending-status.cy.js | 2 +- ...orter-not-member-of-aquisitions-unit.cy.js | 2 +- ...son-error-screen-for-imported-orders.cy.js | 2 +- ...creen-for-successful-imported-orders.cy.js | 2 +- ...-details-for-no-action-order-records.cy.js | 2 +- ...tiple-product-id-types-mapped-case-2.cy.js | 2 +- ...iles-import-and-view-logs-permission.cy.js | 2 +- ...ition-methods-in-order-field-mapping.cy.js | 2 +- .../e2e/export-manager/check-view-jobs.cy.js | 74 ++--- ...b-type-filter-has-valid-options-list.cy.js | 127 ++++++-- ...method-does-not-reset-search-results.cy.js | 7 +- .../job-for-order-with-acquisition-unit.cy.js | 195 +++++++----- .../create-default-integration-for-sftp.cy.js | 2 +- ...isplaying-in-new-scheduling-settings.cy.js | 5 +- .../downloading-the-exact-edi-file.cy.js | 5 +- ...daily-scheduling-for-new-integration.cy.js | 5 +- .../trying-to-open-an-order-with-2-pol.cy.js | 5 +- .../e2e/finance/check-available-balance.cy.js | 2 +- ...approve-invoice-from-previous-budget.cy.js | 2 +- ...vailable-balance-for-negative-amount.cy.js | 2 +- ...playing-settings-for-common-rollover.cy.js | 2 +- ...isplaying-settings-for-test-rollover.cy.js | 2 +- ...get-summary-and-encumbrances-updated.cy.js | 2 +- ...-rollovers-within-three-fiscal-years.cy.js | 2 +- .../encumbrances-are-rolled-over.cy.js | 2 +- ...ecute-rollover-not-active-allocation.cy.js | 2 +- ...more-than-one-preview-for-one-ledger.cy.js | 2 +- ...s-updating-to-active-during-rollover.cy.js | 4 +- ...-based-on-remaining-for-paid-invoice.cy.js | 2 +- ...alance-as-transfer-active-allocation.cy.js | 2 +- ...ce-as-transfer-not-active-allocation.cy.js | 2 +- ...for-same-fy-can-be-started-only-once.cy.js | 2 +- ...line-contains-two-fund-distributions.cy.js | 2 +- .../test-rollover-is-blocked.cy.js | 2 +- .../test-rollover-when-pol-has-2-funds.cy.js | 2 +- ...within-3-fy-when-polcontains-2-funds.cy.js | 2 +- ...orrectly-after-fund-name-was-changed.cy.js | 2 +- .../fiscalYears/fiscalYears-create.cy.js | 2 +- .../fiscalYears/fiscalYears-viewDetails.cy.js | 2 +- ...ance-as-allocation-not-active-option.cy.js | 2 +- .../rollover-cash-balance-as-allocation.cy.js | 2 +- ...over-cash-balance-as-none-allocation.cy.js | 2 +- .../fiscalYears/search-and-filter.cy.js | 2 +- ...n-rollover-are-executed-successfully.cy.js | 2 +- ...ayed-when-create-or-view-fiscal-year.cy.js | 2 +- .../funds/add-allocation-to-budget.cy.js | 2 +- .../funds/add-donor-information-to-fund.cy.js | 6 +- .../funds/add-expense-class-to-budget.cy.js | 2 +- .../funds/add-transfer-to-budget.cy.js | 2 +- ...lable-balance-can-be-negative-number.cy.js | 2 +- ...an-not-be-made-negative-number-by-PO.cy.js | 2 +- .../funds/create-encumbrance-from-order.cy.js | 2 +- ...allocation-result-in-negative-amount.cy.js | 95 ------ .../funds/filter-status-field-in-fund.cy.js | 2 +- .../funds/filter-transer-from-in-fund.cy.js | 2 +- .../e2e/finance/funds/funds.addBudget.cy.js | 2 +- cypress/e2e/finance/funds/funds.create.cy.js | 2 +- .../finance/funds/funds.deleteBudget.cy.js | 34 +-- cypress/e2e/finance/funds/funds.search.cy.js | 2 +- .../moving-allocation-between-funds.cy.js | 2 +- .../multiple-budgets-for-same-fund.cy.js | 2 +- .../not-able-to-create-planned-budget.cy.js | 2 +- .../funds/remove-donor-from-fund.cy.js | 2 +- ...uisition-unit-restrictions-for-funds.cy.js | 2 +- .../transfer-allocation-between-funds.cy.js | 8 +- ...expense-class-info-on-budget-details.cy.js | 2 +- .../e2e/finance/funds/warning-message.cy.js | 2 +- .../finance/groups/add-funds-to-group.cy.js | 2 +- .../groups/add-multiple-funds-to-group.cy.js | 2 +- cypress/e2e/finance/groups/create-group.cy.js | 2 +- ...y-default-when-viewing-group-records.cy.js | 2 +- .../finance/groups/search-and-filter.cy.js | 2 +- ...port-ledger-w-different-fund-content.cy.js | 2 +- ...xpense-class-active-without-rollover.cy.js | 2 +- ...one-without-rollover-with-ex-classes.cy.js | 2 +- ...xpense-classes-none-without-rollover.cy.js | 2 +- .../expense-classes-none.cy.js | 4 +- .../export-settings-active-status.cy.js | 2 +- ...ettings-all-statuses-with-ex-classes.cy.js | 2 +- ...ses-without-rollover-with-ex-classes.cy.js | 2 +- .../export-settings-all-statuses.cy.js | 2 +- ...atus-with-rollover-and-2-exp-classes.cy.js | 2 +- ...-without-rollover-with-2-exp-classes.cy.js | 2 +- .../export-settings-inactive-status.cy.js | 2 +- ...ngs-no-fiscal-year-each-class-status.cy.js | 2 +- ...alculation-after-allocation-movement.cy.js | 2 +- .../e2e/finance/ledgers/ledgers.create.cy.js | 2 +- .../e2e/finance/ledgers/ledgers.search.cy.js | 2 +- .../finance/name-columns-is-hyperlink.cy.js | 4 +- ...s-not-displayed-in-financial-summary.cy.js | 2 +- .../transactions/moving-allocation.cy.js | 2 +- ...-transfer-amount-included-in-summary.cy.js | 2 +- ...-from-budget-with-insufficient-funds.cy.js | 2 +- .../transactions/unrelease-encumbrance.cy.js | 2 +- cypress/e2e/fse/ui/organizations-ui.cy.js | 4 +- ...nd-with-items-view-on-bound-holdings.cy.js | 2 +- .../create-instance-holdings-and-item.cy.js | 2 +- .../add-item-to-an-existing-title.cy.js | 2 +- ...e-of-instance-which-has-source-folio.cy.js | 2 +- ...item-moved-from-one-shelf-to-another.cy.js | 2 +- .../update-effective-location-for-item.cy.js | 2 +- .../fast-add/create-fast-add-record.cy.js | 4 +- ...-holdings-edit-page-from-another-app.cy.js | 2 +- ...g-statistical-code-on-holding-screen.cy.js | 2 +- .../create-holdings-as-different-user.cy.js | 2 +- ...ty-statistical-code-on-holdings-page.cy.js | 2 +- ...ot-available-on-non-consortia-tenant.cy.js | 2 +- .../instance/assign-preceding-title.cy.js | 2 +- .../check-classification-types-list.cy.js | 2 +- .../create-instance-with-duplicate.cy.js | 2 +- ...atus-term-validate-matching-settings.cy.js | 4 +- ...ata-test-assigning-nature-of-content.cy.js | 10 +- .../multiple-items-in-holding-record.cy.js | 2 +- ...n-search-item-having-barcode-w-slash.cy.js | 2 +- ...al-codes-field-on-item-create-screen.cy.js | 2 +- .../delete-an-item-without-dependencies.cy.js | 2 +- ...permanent-validate-matching-settings.cy.js | 2 +- ...temporary-validate-matching-settings.cy.js | 2 +- .../item/loan-data-and-availability.cy.js | 2 +- ...temporary-validate-matching-settings.cy.js | 2 +- ...rial-type-validate-matching-settings.cy.js | 2 +- ...gned-with-the-corresponding-data-row.cy.js | 2 +- .../moving-item-between-holdings.cy.js | 2 +- .../create-edit-delete-material-types.cy.js | 2 +- .../create-edit-mode-for-isri-profiles.cy.js | 2 +- .../verifyWidgetOnHRIDSettingsPage.cy.js | 2 +- .../settings/view-mode-of-isri-profiles.cy.js | 2 +- .../inventory/tags/tags-functionality.cy.js | 2 +- ...ibution-change-when-FY-was-undefined.cy.js | 2 +- ...oice-line-from-pol-w-inactive-budget.cy.js | 2 +- ...ent-amount-to-invoice-line-in-dollar.cy.js | 2 +- ...nt-amount-to-invoice-line-in-percent.cy.js | 2 +- ...-in-current-FY-for-previous-FY-order.cy.js | 2 +- ...us-FYwhen-POL-created-in-previous-FY.cy.js | 2 +- ...nvoice-in-current-FY-for-previous-FY.cy.js | 2 +- ...-amount-to-invoice-line-not-prorated.cy.js | 2 +- ...with-currency-different-from-default.cy.js | 2 +- ...oice-with-more-than-50-invoice-lines.cy.js | 2 +- ...pprove-and-pay-more-than-one-invoice.cy.js | 2 +- ...ous-FY-and-pay-invoice-in-current FY.cy.js | 2 +- .../approve-invoice-is-disabled.cy.js | 2 +- ...when-balance-is-close-to-encumbrance.cy.js | 2 +- .../approve-invoice-with-payment-credit.cy.js | 222 ++++++-------- cypress/e2e/invoices/approve-invoice.cy.js | 2 +- ...attach-file-to-approved-paid-invoice.cy.js | 4 +- ...rent-fy-and-paid-against-previous-fy.cy.js | 2 +- .../cancelling-approved-invoices.cy.js | 2 +- ...ncelling-invoice-creation-from-order.cy.js | 2 +- .../change-fund-before-approve-invoice.cy.js | 2 +- .../copy-icon-present-invoice-pane.cy.js | 2 +- ...creating-invoice-from-purchase-order.cy.js | 2 +- ...ription-info-and-dates-after-approve.cy.js | 2 +- cypress/e2e/invoices/filter-invoices.cy.js | 2 +- .../fiscal-year-is-not-displayed.cy.js | 2 +- ...-not-etitable-if-invoice-is-approved.cy.js | 2 +- ...not-etitable-if-invoice-is-cancelled.cy.js | 2 +- ...r-is-not-etitable-if-invoice-is-paid.cy.js | 2 +- ...ar-specifies-expecse-class-selection.cy.js | 2 +- ...e-remain-the-same-after-cancelling-1.cy.js | 2 +- ...e-remain-the-same-after-cancelling-2.cy.js | 2 +- ...e-remain-the-same-after-cancelling-3.cy.js | 2 +- ...e-remain-the-same-after-cancelling-4.cy.js | 2 +- ...nce-remain-the-same-after-cancelling.cy.js | 2 +- ...ent-from-related-pol-can-be-approved.cy.js | 2 +- .../invoices-create-credit-invoice.cy.js | 2 +- ...voices-manually-create-line-from-pol.cy.js | 2 +- .../invoices-manually-create-line.cy.js | 2 +- .../invoices/invoices-manually-create.cy.js | 2 +- .../invoices-test-pol-search-plugin.cy.js | 2 +- ...s-displayed-when-create-invoice-line.cy.js | 2 +- ...ers-displayed-when-edit-invoice-line.cy.js | 2 +- .../pay-invoice-for-previous-fy.cy.js | 6 +- ...nvoice-with-multiple-expense-classes.cy.js | 2 +- cypress/e2e/invoices/pay-invoice.cy.js | 42 ++- ...-encumbrance-checkbox-is-not-checked.cy.js | 2 +- ...oice-number-from-invoice-line-column.cy.js | 2 +- .../save-invoice-FY-after-fund-change.cy.js | 2 +- ...-year-after-fund-distribution-change.cy.js | 2 +- ...-fiscal-year-after-adding-adjustment.cy.js | 2 +- cypress/e2e/invoices/search-invoices.cy.js | 2 +- ...present-in-actions-if-no-permissions.cy.js | 2 +- .../test-acquisition-unit-for-invoices.cy.js | 2 +- ...ccordion-labels-and-logic-on-invoice.cy.js | 2 +- ...on-invoice-lines-with-multiple-funds.cy.js | 2 +- ...e-to-pay-previously-approved-invoice.cy.js | 2 +- .../e2e/invoices/vendor-code-displays.cy.js | 2 +- .../vendor-invoice-number-is-hyperlink.cy.js | 4 +- cypress/e2e/notes/item-notes.cy.js | 51 ++-- ...add-cancel-po-and-display-indication.cy.js | 2 +- .../adding-donor-information-to-new-pol.cy.js | 4 +- ...o-POL-with-different-expense-classes.cy.js | 2 +- ...PO-line-has-related-approved-invoice.cy.js | 2 +- .../can-not-be-delete-pol-and-order.cy.js | 2 +- ...in-previous-and-current-fiscal-years.cy.js | 2 +- .../change-location-during-receiving.cy.js | 178 +++++------ ...der-format-from-pe-mix-to-electronic.cy.js | 2 +- ...ng-order-format-from-pe-mix-to-other.cy.js | 4 +- cypress/e2e/orders/check-duplicate-POL.cy.js | 2 +- cypress/e2e/orders/close-order.cy.js | 2 +- cypress/e2e/orders/connected-pol.cy.js | 2 +- ...opy-icon-present-on-po-and-pol-panes.cy.js | 2 +- ...on-of-total-fund-distribution-amount.cy.js | 2 +- .../create-one-time-order-with-pol.cy.js | 2 +- cypress/e2e/orders/create-ongoing-order.cy.js | 2 +- .../orders/create-order-line-for-PEMix.cy.js | 2 +- ...eate-order-withPol-different-formats.cy.js | 6 +- cypress/e2e/orders/create-order.cy.js | 2 +- cypress/e2e/orders/delete-fund-in-POL.cy.js | 2 +- ...elete-fund-in-pol-w-reviewed-invoice.cy.js | 2 +- ...ing-manually-assigned-donor-from-pol.cy.js | 2 +- cypress/e2e/orders/duplicate-order.cy.js | 2 +- .../orders/edifact-export-to-a-vendor.cy.js | 2 +- .../create-order-to-edifact-export.cy.js | 5 +- .../delete-order-by-user.cy.js | 5 +- ...rder-does-not-display-export-details.cy.js | 5 +- .../edit-account-number-in-po-line.cy.js | 2 +- cypress/e2e/orders/edit-an-existing-PO.cy.js | 2 +- .../edit-dates-for-ongoing-open-order.cy.js | 4 +- ...ase-cost-in-po-line-for-paid-invoice.cy.js | 2 +- ...edit-fund-when-invoice-are-cancelled.cy.js | 2 +- .../edit-fund-when-invoice-are-open.cy.js | 2 +- ...oice-has-multiple-fund-distributions.cy.js | 2 +- ...-when-invoice-paid-cancelled-C368477.cy.js | 2 +- ...-when-invoice-paid-cancelled-C368484.cy.js | 2 +- .../edit-fund-with-reviewed-invoice.cy.js | 2 +- ...th-2-product-ids-and-approve-invoice.cy.js | 2 +- .../e2e/orders/edit-pol-in-open-order.cy.js | 2 +- .../e2e/orders/edit-pol-renewal-note.cy.js | 2 +- cypress/e2e/orders/edit-pol.cy.js | 2 +- ...-more-than-one-fund-and-paid-invoice.cy.js | 2 +- ...ting-fund-and-increasing-cost-in-pol.cy.js | 2 +- ...tribution-and-decreasing-cost-in-pol.cy.js | 4 +- ...und-distribution-from-funds-and-back.cy.js | 2 +- ...eared-when-change-format-to-physical.cy.js | 2 +- ...ived-piece-when-order-closed-C375986.cy.js | 2 +- ...ing-received-piece-when-order-closed.cy.js | 2 +- ...ing-received-piece-with-paid-invoice.cy.js | 4 +- ...hanged-after-deleting-received-piece.cy.js | 2 +- ...cumbrance-released-when-order-closed.cy.js | 2 +- ...on-updates-when-fund-name-is-changed.cy.js | 2 +- ...-order-lines-automatic-export-active.cy.js | 2 +- ...er-lines-automatic-export-not-active.cy.js | 2 +- cypress/e2e/orders/export/export-orders.cy.js | 2 +- ...zation-type-present-in-exported-file.cy.js | 2 +- .../orders/export/pol-export-by-filters.cy.js | 2 +- ...enewal-note-present-in-exported-file.cy.js | 2 +- ...rder-with-electronic-resource-format.cy.js | 2 +- ...creation-for-order-with-other-format.cy.js | 2 +- ...order-with-pe-mix-format-eresource-i.cy.js | 2 +- ...rder-with-pe-mix-format-eresource-ih.cy.js | 2 +- ...der-with-pe-mix-format-eresource-ihi.cy.js | 2 +- ...er-with-pe-mix-format-eresource-none.cy.js | 2 +- ...-order-with-physical-resource-format.cy.js | 2 +- ...dependent-order-and-receipt-quantity.cy.js | 2 +- ...m-instance-record-for-existing-order.cy.js | 2 +- ...e-from-instance-record-for-new-order.cy.js | 2 +- ...-creation-order-from-instance-record.cy.js | 2 +- ...e-new-holdings-for-existing-location.cy.js | 178 +++++------ .../create-new-holdings.cy.js | 260 ++++++++-------- ...n-order-and-order-line-from-instance.cy.js | 2 +- ...e-order-and-order-line-from-instance.cy.js | 2 +- .../edit-instance-connection.cy.js | 2 +- ...ence-is-not-removed-when-created-pol.cy.js | 2 +- ...rence-is-not-removed-when-edited-pol.cy.js | 2 +- ...eference-is-removed-when-created-pol.cy.js | 2 +- ...reference-is-removed-when-edited-pol.cy.js | 2 +- ...-does-not-grant-delete-polpermission.cy.js | 2 +- ...der-from-instance-record-on-creation.cy.js | 2 +- .../item-status-changed-to-order-closed.cy.js | 2 +- ...-dd-in-order-line-allows-parentheses.cy.js | 2 +- ...n-not-be-saved-without-expense-class.cy.js | 2 +- ...n-not-be-saved-without-expense-class.cy.js | 2 +- .../open-order-from-pol-edit-form.cy.js | 2 +- ...-po-line-with-two-fund-distributions.cy.js | 2 +- ...pen-order-w-not-unique-po-line-title.cy.js | 2 +- ...der-when-ledger-has-separate-aq-unit.cy.js | 2 +- ...s-export-to-a-vendor-with-open-order.cy.js | 5 +- .../orders/orders-export-to-a-vendor.cy.js | 5 +- .../e2e/orders/orders.unreceivePiece.cy.js | 120 ++++---- .../orders/po-filters-with-cLose-order.cy.js | 2 +- cypress/e2e/orders/po-filters.cy.js | 2 +- cypress/e2e/orders/po-search.cy.js | 2 +- cypress/e2e/orders/pol-filters.cy.js | 4 +- cypress/e2e/orders/pol-search-am-filter.cy.js | 5 +- cypress/e2e/orders/pol-search.cy.js | 2 +- ...-claiming-interval-from-organization.cy.js | 2 +- ...from-organization-for-one-time-order.cy.js | 2 +- .../e2e/orders/receive-piece-from-order.cy.js | 150 +++++----- ...-number-applies-quick-receive-option.cy.js | 180 +++++------ .../copy-number-applies-receive-option.cy.js | 174 +++++------ .../copy-number-not-shown-in-receiving.cy.js | 2 +- ...isting-location-quick-receive-option.cy.js | 2 +- ...for-existing-location-receive-option.cy.js | 2 +- .../edit-item-in-receiving-app.cy.js | 2 +- ...ece-with-payment-not-required-status.cy.js | 2 +- .../receive-pieces-for-package-order.cy.js | 2 +- ...g-item-with-open-title-level-request.cy.js | 281 +++++++++--------- ...ceiving-pieces-from-order-for-PE-mix.cy.js | 2 +- .../serials-receiving.cy.js | 2 +- .../status-is-updated-from-n-order.cy.js | 2 +- .../update-barcode.cy.js | 2 +- ...n-pol-payment-status-set-to-canceled.cy.js | 2 +- ...ng-donor-from-polafter-removing-fund.cy.js | 4 +- .../renewal-date-are-not-requaired.cy.js | 2 +- ...enewal-field-prefilled-from-template.cy.js | 2 +- .../reopen-order-w-multiple-order-lines.cy.js | 4 +- .../reopen-order-with-changed-fund.cy.js | 2 +- ...ce-results-cleared-after-click-reset.cy.js | 2 +- .../search-order-w-special-symbols.cy.js | 2 +- ...w-validation-errors-remains-expanded.cy.js | 2 +- .../select-acquisition-method-from-POL.cy.js | 2 +- .../select-random-currancy-in-order.cy.js | 2 +- ...g-interval-in-pol-for-one-time-order.cy.js | 2 +- ...ng-interval-in-pol-for-ongoing-order.cy.js | 2 +- ...r-template-can-not-be-saved-wo-title.cy.js | 2 +- .../test-acquisition-unit-for-orders.cy.js | 2 +- ...order-with-changed-fund-distribution.cy.js | 2 +- ...unopen-order-with-receiving-workflow.cy.js | 8 +- ...umbrances-when-reopen-one-time-order.cy.js | 2 +- ...brances-when-reopen-unreceived-order.cy.js | 2 +- .../verify-orders-numbers-is-hyperlink.cy.js | 4 +- ...hout-changes-is-not-displayed-in-log.cy.js | 2 +- ...age-when-creating-non-existent-order.cy.js | 4 +- .../add-contact-to-organization.cy.js | 3 +- .../organizations/add-kosovo-country.cy.js | 9 +- .../add-note-to-contact-people-list.cy.js | 7 +- ...-in-not-a-vendor-organization-record.cy.js | 5 +- .../add-tags-to-organization.cy.js | 7 +- .../assign-categories-to-contact.cy.js | 3 +- .../assign-existing-contact.cy.js | 10 +- .../check-organizations-table-content.cy.js | 7 +- .../organizations/correct-page-title.cy.js | 22 +- .../create-a-donor-organization.cy.js | 12 +- ...and-add-privileged-donor-information.cy.js | 3 +- .../create-edit-autosuggested-fields.cy.js | 25 +- .../organizations/create-organization.cy.js | 4 +- .../organizations/delete-contact-person.cy.js | 5 +- .../delete-existing-organization-record.cy.js | 7 +- .../edit-contact-of-organization.cy.js | 5 +- .../edit-note-in-contact-people-list.cy.js | 3 +- .../e2e/organizations/edit-organization.cy.js | 6 +- .../organizations/filter-by-created-by.cy.js | 11 +- .../filter-by-date-updated.cy.js | 43 +-- .../organizations/filter-by-updated-by.cy.js | 116 ++++---- .../organizations/filter-organization.cy.js | 20 +- .../filter-organizations-by-status.cy.js | 30 +- .../filter-organizations-by-tags.cy.js | 4 +- .../organizations/integration-claiming.cy.js | 5 +- .../integration-day-field-validation.cy.js | 16 +- .../integration-organization.cy.js | 5 +- .../add-existing-interface.cy.js | 3 +- .../create-interface-to-organization.cy.js | 5 +- .../delete-interface-details.cy.js | 5 +- .../edit-interface-details.cy.js | 47 +-- .../edit-interface-type.cy.js | 5 +- .../verify-password-masking.cy.js | 5 +- .../view-interface-details.cy.js | 15 +- .../make-organization-a-vendor.cy.js | 7 +- ...e-organization-donor-and-vice-versa.cy.js} | 14 +- .../make-organization-not-a-vendor.cy.js | 7 +- ...gs-banking-information-enabled-flows.cy.js | 134 ++++----- .../pagination-and-bulk-selection.cy.js | 16 +- .../print-organization-details-pane.cy.js | 3 +- ...ileged-donor-contacts-not-in-lookups.cy.js | 5 +- .../save-and-keep-editing-when-creating.cy.js | 28 +- .../save-and-keep-editing-when-editing.cy.js | 16 +- .../search-alternate-organization-name.cy.js | 12 +- .../organizations/search-organization.cy.js | 8 +- .../e2e/organizations/search-pagination.cy.js | 13 +- .../settings/create-new-categories.cy.js | 22 +- ...ations-settings-account-types-manage.cy.js | 32 +- ...t-acquisition-unit-for-organizations.cy.js | 27 +- .../unassign-contact-from-organization.cy.js | 7 +- ...ly-view-privileged-donor-information.cy.js | 16 +- ...tion-when-create-organization-record.cy.js | 2 +- ...mation-when-edit-organization-record.cy.js | 12 +- .../user-integration-organization.cy.js | 5 +- .../organizations/version-history-view.cy.js | 51 ++-- .../organizations/view-existing-record.cy.js | 15 +- ...e-in-received-status-when-edit-piece.cy.js | 2 +- ...export-results-to-csv-from-receiving.cy.js | 4 +- .../create-acquisition-unit.cy.js | 2 +- .../edit-acquisition-unit.cy.js | 2 +- .../test-au-for-orders-invoices-funds.cy.js | 2 +- ...add-and-remove-tags-to-a-job-profile.cy.js | 2 +- .../attach-profiles-to-job-profile.cy.js | 2 +- .../settings/finance/delete-fund-types.cy.js | 2 +- .../finance/expense-classes-create.cy.js | 2 +- .../invoices/delete-batch-group.cy.js | 68 ++--- ...oices.settings.checkSystemBatchGroup.cy.js | 2 +- .../invoices.settings.createBatchGroup.cy.js | 2 +- .../orders/acquisition-method-create.cy.js | 2 +- .../e2e/settings/orders/adjust-instance.cy.js | 2 +- .../settings/orders/change-PO-number.cy.js | 4 +- .../orders/change-the-POL-limit.cy.js | 2 +- .../closing-purchase-order-reasons.cy.js | 2 +- .../orders/create-order-template.cy.js | 2 +- .../settings/orders/edit-order-template.cy.js | 2 +- .../settings/orders/increase-pol-limit.cy.js | 2 +- .../orders/order-template-categories.cy.js | 2 +- .../orders/preffix-suffix-create.cy.js | 2 +- ...acquisition-method-in-order-template.cy.js | 2 +- .../delete-organization-type.cy.js | 56 ++-- .../e2e/settings/tenant/delete-address.cy.js | 74 ++--- .../e2e/settings/tenant/delete-campus.cy.js | 2 +- .../settings/tenant/delete-institution.cy.js | 2 +- .../e2e/settings/tenant/delete-library.cy.js | 2 +- ...-fields-displays-on-create-user-page.cy.js | 2 +- .../bulk-edit/bulk-edit-search-pane.js | 2 +- .../support/fragments/invoices/invoices.js | 1 + .../fragments/invoices/settingsInvoices.js | 7 +- .../fragments/organizations/organizations.js | 239 +++------------ .../organizationsSearchAndFilter.js | 216 ++++++++++++++ .../acquisitionUnits/acquisitionUnits.js | 1 + .../settings/invoices/batchGroups.js | 2 + cypress/support/utils/dateTools.js | 24 +- 437 files changed, 2724 insertions(+), 2634 deletions(-) delete mode 100644 cypress/e2e/finance/funds/decrease-allocation-result-in-negative-amount.cy.js rename cypress/e2e/organizations/{making-organization-donor-and-vice-versa.cy.js => make-organization-donor-and-vice-versa.cy.js} (75%) create mode 100644 cypress/support/fragments/organizations/organizationsSearchAndFilter.js diff --git a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-assigned-to-AU.cy.js b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-assigned-to-AU.cy.js index 007e3f1a46..a0a7981e98 100644 --- a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-assigned-to-AU.cy.js +++ b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-assigned-to-AU.cy.js @@ -1,15 +1,22 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import FinanceHelp from '../../support/fragments/finance/financeHelper'; import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import DateTools from '../../support/utils/dateTools'; import getRandomPostfix from '../../support/utils/stringTools'; describe('Acquisition Units', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; + let user; + let membershipUserId; + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectUpdate: true, + protectCreate: true, + protectRead: true, + }; const firstFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; const secondFiscalYear = { name: `new_autotest_year_${getRandomPostfix()}`, @@ -17,77 +24,74 @@ describe('Acquisition Units', () => { periodBeginDate: DateTools.getThreePreviousDaysDateForFiscalYearOnUIEdit(), periodEndDate: DateTools.getTwoPreviousDaysDateForFiscalYearOnUIEdit(), }; - let user; before(() => { - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, - }); - cy.reload(); - AcquisitionUnits.waitLoading(); - }, 20_000); + cy.getAdminToken(); FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => { firstFiscalYear.id = firstFiscalYearResponse.id; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + FiscalYears.updateFiscalYearViaApi({ + ...firstFiscalYearResponse, + acqUnitIds: [acquisitionUnit.id], + }); + }); }); + cy.createTempUser([ - permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, - permissions.uiSettingsFinanceViewEditCreateDelete.gui, - permissions.uiFinanceViewEditDeleteLedger.gui, - permissions.uiFinanceViewEditDeleteGroups.gui, - permissions.uiFinanceViewEditDeleteFundBudget.gui, - permissions.uiFinanceViewEditDeleteFiscalYear.gui, - permissions.uiFinanceViewEditCreateLedger.gui, - permissions.uiFinanceCreateViewEditGroups.gui, - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiFinanceViewEditCreateFiscalYear.gui, - permissions.uiFinanceViewEditLedger.gui, - permissions.uiFinanceViewEditFundAndBudget.gui, - permissions.uiFinanceViewEditFiscalYear.gui, - permissions.uiFinanceViewLedger.gui, - permissions.uiFinanceViewGroups.gui, - permissions.uiFinanceViewFundAndBudget.gui, - permissions.uiFinanceViewFiscalYear.gui, - permissions.uiFinanceManuallyReleaseEncumbrance.gui, - permissions.uiFinanceManageAcquisitionUnits.gui, - permissions.uiFinanceExportFinanceRecords.gui, - permissions.uiFinanceExecuteFiscalYearRollover.gui, - permissions.uiFinanceCreateTransfers.gui, - permissions.uiFinanceCreateAllocations.gui, - permissions.uiFinanceFinanceViewGroup.gui, + Permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, + Permissions.uiSettingsFinanceViewEditCreateDelete.gui, + Permissions.uiFinanceViewEditDeleteLedger.gui, + Permissions.uiFinanceViewEditDeleteGroups.gui, + Permissions.uiFinanceViewEditDeleteFundBudget.gui, + Permissions.uiFinanceViewEditDeleteFiscalYear.gui, + Permissions.uiFinanceViewEditCreateLedger.gui, + Permissions.uiFinanceCreateViewEditGroups.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiFinanceViewEditCreateFiscalYear.gui, + Permissions.uiFinanceViewEditLedger.gui, + Permissions.uiFinanceViewEditFundAndBudget.gui, + Permissions.uiFinanceViewEditFiscalYear.gui, + Permissions.uiFinanceViewLedger.gui, + Permissions.uiFinanceViewGroups.gui, + Permissions.uiFinanceViewFundAndBudget.gui, + Permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiFinanceManuallyReleaseEncumbrance.gui, + Permissions.uiFinanceManageAcquisitionUnits.gui, + Permissions.uiFinanceExportFinanceRecords.gui, + Permissions.uiFinanceExecuteFiscalYearRollover.gui, + Permissions.uiFinanceCreateTransfers.gui, + Permissions.uiFinanceCreateAllocations.gui, + Permissions.uiFinanceFinanceViewGroup.gui, ]).then((userProperties) => { user = userProperties; - AcquisitionUnits.newAcquisitionUnit(); - AcquisitionUnits.fillInAUInfo(defaultAcquisitionUnit.name); - AcquisitionUnits.assignUser(user.username); + AcquisitionUnits.assignUserViaApi(userProperties.userId, acquisitionUnit.id).then((id) => { + membershipUserId = id; + }); + cy.login(userProperties.username, userProperties.password, { path: TopMenu.fiscalYearPath, waiter: FiscalYears.waitForFiscalYearDetailsLoading, }); - FinanceHelp.searchByAll(firstFiscalYear.name); - FiscalYears.selectFisacalYear(firstFiscalYear.name); - FiscalYears.editFiscalYearDetails(); - FiscalYears.assignAU(defaultAcquisitionUnit.name); - FiscalYears.closeThirdPane(); - FiscalYears.resetFilters(); }); }); after(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, + cy.getAdminToken(); + AcquisitionUnits.unAssignUserViaApi(membershipUserId); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); + FiscalYears.getFiscalYearIdByName(secondFiscalYear.name).then((id) => { + FiscalYears.deleteFiscalYearViaApi(id); }); - AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name); - AcquisitionUnits.delete(defaultAcquisitionUnit.name); Users.deleteViaApi(user.userId); }); it( 'C374168 Acquisition unit restrictions for "Fiscal year" records (View, Edit, Create, Delete options are active) when user is assigned to acquisition unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C374168'] }, () => { FinanceHelp.searchByAll(firstFiscalYear.name); FiscalYears.selectFisacalYear(firstFiscalYear.name); diff --git a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-delete.cy.js b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-delete.cy.js index 41cb0fe505..8a77aed508 100644 --- a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-delete.cy.js +++ b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-delete.cy.js @@ -1,17 +1,22 @@ -import permissions from '../../support/dictionary/permissions'; -import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; +import Permissions from '../../support/dictionary/permissions'; +import FinanceHelp from '../../support/fragments/finance/financeHelper'; import FiscalYearDetails from '../../support/fragments/finance/fiscalYears/fiscalYearDetails'; +import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import getRandomPostfix from '../../support/utils/stringTools'; import DateTools from '../../support/utils/dateTools'; import InteractorsTools from '../../support/utils/interactorsTools'; +import getRandomPostfix from '../../support/utils/stringTools'; describe('Acquisition Units', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; - const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectUpdate: false, + protectCreate: false, + }; + const fiscalYear = { ...FiscalYears.defaultUiFiscalYear }; const newFiscalYear = { name: `FYA2023_${getRandomPostfix()}`, code: DateTools.getRandomFiscalYearCode(2000, 9999), @@ -19,74 +24,61 @@ describe('Acquisition Units', () => { periodEndDate: DateTools.getDayAfterTomorrowDateForFiscalYear(), }; let user; - let createdFiscalYearId; before(() => { + cy.getAdminToken(); + FiscalYears.createViaApi(fiscalYear).then((fiscalYearResponse) => { + fiscalYear.id = fiscalYearResponse.id; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + FiscalYears.updateFiscalYearViaApi({ + ...fiscalYearResponse, + acqUnitIds: [acquisitionUnit.id], + }); + }); + }); + cy.createTempUser([ - permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, - permissions.uiSettingsFinanceViewEditCreateDelete.gui, - permissions.uiFinanceViewEditDeleteLedger.gui, - permissions.uiFinanceViewEditDeleteGroups.gui, - permissions.uiFinanceViewEditDeleteFundBudget.gui, - permissions.uiFinanceViewEditDeleteFiscalYear.gui, - permissions.uiFinanceViewEditCreateLedger.gui, - permissions.uiFinanceCreateViewEditGroups.gui, - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiFinanceViewEditCreateFiscalYear.gui, - permissions.uiFinanceViewEditLedger.gui, - permissions.uiFinanceViewEditFundAndBudget.gui, - permissions.uiFinanceViewEditFiscalYear.gui, - permissions.uiFinanceViewLedger.gui, - permissions.uiFinanceViewGroups.gui, - permissions.uiFinanceViewFundAndBudget.gui, - permissions.uiFinanceViewFiscalYear.gui, - permissions.uiFinanceManuallyReleaseEncumbrance.gui, - permissions.uiFinanceManageAcquisitionUnits.gui, - permissions.uiFinanceExportFinanceRecords.gui, - permissions.uiFinanceExecuteFiscalYearRollover.gui, - permissions.uiFinanceCreateTransfers.gui, - permissions.uiFinanceCreateAllocations.gui, + Permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, + Permissions.uiFinanceManageAcquisitionUnits.gui, + Permissions.uiSettingsFinanceViewEditCreateDelete.gui, + Permissions.uiFinanceViewEditDeleteLedger.gui, + Permissions.uiFinanceViewEditDeleteGroups.gui, + Permissions.uiFinanceViewEditDeleteFundBudget.gui, + Permissions.uiFinanceViewEditDeleteFiscalYear.gui, + Permissions.uiFinanceViewEditCreateLedger.gui, + Permissions.uiFinanceCreateViewEditGroups.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiFinanceViewEditCreateFiscalYear.gui, + Permissions.uiFinanceViewEditLedger.gui, + Permissions.uiFinanceViewEditFundAndBudget.gui, + Permissions.uiFinanceViewEditFiscalYear.gui, + Permissions.uiFinanceViewLedger.gui, + Permissions.uiFinanceViewGroups.gui, + Permissions.uiFinanceViewFundAndBudget.gui, + Permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiFinanceManuallyReleaseEncumbrance.gui, + Permissions.uiFinanceExportFinanceRecords.gui, + Permissions.uiFinanceExecuteFiscalYearRollover.gui, + Permissions.uiFinanceCreateTransfers.gui, + Permissions.uiFinanceCreateAllocations.gui, ]).then((userProperties) => { user = userProperties; - cy.getAdminUserDetails().then((adminUser) => { - defaultAcquisitionUnit.protectDelete = true; - defaultAcquisitionUnit.protectUpdate = false; - defaultAcquisitionUnit.protectCreate = false; - AcquisitionUnits.createAcquisitionUnitViaApi(defaultAcquisitionUnit) - .then((acqUnitResponse) => { - defaultAcquisitionUnit.id = acqUnitResponse.id; - return AcquisitionUnits.assignUserViaApi(adminUser.id, defaultAcquisitionUnit.id); - }) - .then(() => { - FiscalYears.createViaApi({ - ...defaultFiscalYear, - acqUnitIds: [defaultAcquisitionUnit.id], - }).then((firstFiscalYearResponse) => { - defaultFiscalYear.id = firstFiscalYearResponse.id; - }); - }) - .then(() => { - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.fiscalYearPath, - waiter: FiscalYears.waitForFiscalYearDetailsLoading, - }); - }); + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.fiscalYearPath, + waiter: FiscalYears.waitForFiscalYearDetailsLoading, }); }); }); after(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, - }); - FiscalYears.deleteFiscalYearViaApi(defaultFiscalYear.id); - if (createdFiscalYearId) { - FiscalYears.deleteFiscalYearViaApi(createdFiscalYearId); - } - AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name); - AcquisitionUnits.delete(defaultAcquisitionUnit.name); + cy.getAdminToken(); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); + FiscalYears.deleteFiscalYearViaApi(fiscalYear.id); + FiscalYears.deleteFiscalYearViaApi(newFiscalYear.id); Users.deleteViaApi(user.userId); }); @@ -94,9 +86,10 @@ describe('Acquisition Units', () => { 'C375080 Acquisition unit restrictions for "Fiscal year" records (only Delete option is active) when user is NOT assigned to acquisition unit (thunderjet)', { tags: ['criticalPath', 'thunderjet', 'C375080'] }, () => { - FiscalYears.selectFisacalYear(defaultFiscalYear.name); + FinanceHelp.searchByAll(fiscalYear.name); + FiscalYears.selectFisacalYear(fiscalYear.name); FiscalYearDetails.checkFiscalYearDetails({ - information: [{ key: 'Acquisition units', value: defaultAcquisitionUnit.name }], + information: [{ key: 'Acquisition units', value: acquisitionUnit.name }], }); FiscalYears.clickActionsButtonInFY(); FiscalYears.checkDeleteButtonIsDisabled(); @@ -108,13 +101,13 @@ describe('Acquisition Units', () => { InteractorsTools.checkCalloutMessage('Fiscal year has been saved'); FiscalYears.closeThirdPane(); FiscalYears.clickNewFY(); - FiscalYears.createFiscalYearWithAllFields(newFiscalYear, defaultAcquisitionUnit.name); + FiscalYears.createFiscalYearWithAllFields(newFiscalYear, acquisitionUnit.name); FiscalYears.clickSaveAndClose(); cy.wait(1000); InteractorsTools.checkCalloutMessage('Fiscal year has been saved'); FiscalYears.waitForFiscalYearDetailsLoading(); FiscalYears.getFiscalYearIdByName(newFiscalYear.name).then((fiscalYearId) => { - createdFiscalYearId = fiscalYearId; + newFiscalYear.id = fiscalYearId; }); FiscalYears.clickActionsButtonInFY(); FiscalYears.checkDeleteButtonIsDisabled(); diff --git a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-edit-and-view.cy.js b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-edit-and-view.cy.js index dc968d9040..8150db1583 100644 --- a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-edit-and-view.cy.js +++ b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-edit-and-view.cy.js @@ -1,71 +1,63 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import FinanceHelp from '../../support/fragments/finance/financeHelper'; import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; describe('Acquisition Units', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; - const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectCreate: true, + protectUpdate: false, + }; + const fiscalYear = { ...FiscalYears.defaultUiFiscalYear }; let user; before(() => { - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, + cy.getAdminToken(); + FiscalYears.createViaApi(fiscalYear).then((fiscalYearResponse) => { + fiscalYear.id = fiscalYearResponse.id; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + FiscalYears.updateFiscalYearViaApi({ + ...fiscalYearResponse, + acqUnitIds: [acquisitionUnit.id], + }); }); - cy.reload(); - AcquisitionUnits.waitLoading(); - }, 20_000); - FiscalYears.createViaApi(defaultFiscalYear).then((firstFiscalYearResponse) => { - defaultFiscalYear.id = firstFiscalYearResponse.id; }); + cy.createTempUser([ - permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, - permissions.uiSettingsFinanceViewEditCreateDelete.gui, - permissions.uiFinanceViewEditDeleteLedger.gui, - permissions.uiFinanceViewEditDeleteGroups.gui, - permissions.uiFinanceViewEditDeleteFundBudget.gui, - permissions.uiFinanceViewEditDeleteFiscalYear.gui, - permissions.uiFinanceViewEditCreateLedger.gui, - permissions.uiFinanceCreateViewEditGroups.gui, - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiFinanceViewEditCreateFiscalYear.gui, - permissions.uiFinanceViewEditLedger.gui, - permissions.uiFinanceViewEditFundAndBudget.gui, - permissions.uiFinanceViewEditFiscalYear.gui, - permissions.uiFinanceViewLedger.gui, - permissions.uiFinanceViewGroups.gui, - permissions.uiFinanceViewFundAndBudget.gui, - permissions.uiFinanceViewFiscalYear.gui, - permissions.uiFinanceManuallyReleaseEncumbrance.gui, - permissions.uiFinanceManageAcquisitionUnits.gui, - permissions.uiFinanceExportFinanceRecords.gui, - permissions.uiFinanceExecuteFiscalYearRollover.gui, - permissions.uiFinanceCreateTransfers.gui, - permissions.uiFinanceCreateAllocations.gui, - permissions.uiFinanceFinanceViewGroup.gui, + Permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, + Permissions.uiSettingsFinanceViewEditCreateDelete.gui, + Permissions.uiFinanceViewEditDeleteLedger.gui, + Permissions.uiFinanceViewEditDeleteGroups.gui, + Permissions.uiFinanceViewEditDeleteFundBudget.gui, + Permissions.uiFinanceViewEditDeleteFiscalYear.gui, + Permissions.uiFinanceViewEditCreateLedger.gui, + Permissions.uiFinanceCreateViewEditGroups.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiFinanceViewEditCreateFiscalYear.gui, + Permissions.uiFinanceViewEditLedger.gui, + Permissions.uiFinanceViewEditFundAndBudget.gui, + Permissions.uiFinanceViewEditFiscalYear.gui, + Permissions.uiFinanceViewLedger.gui, + Permissions.uiFinanceViewGroups.gui, + Permissions.uiFinanceViewFundAndBudget.gui, + Permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiFinanceManuallyReleaseEncumbrance.gui, + Permissions.uiFinanceManageAcquisitionUnits.gui, + Permissions.uiFinanceExportFinanceRecords.gui, + Permissions.uiFinanceExecuteFiscalYearRollover.gui, + Permissions.uiFinanceCreateTransfers.gui, + Permissions.uiFinanceCreateAllocations.gui, + Permissions.uiFinanceFinanceViewGroup.gui, ]).then((userProperties) => { user = userProperties; - AcquisitionUnits.newAcquisitionUnit(); - AcquisitionUnits.fillInAUInfo(defaultAcquisitionUnit.name); - AcquisitionUnits.assignAdmin(); - AcquisitionUnits.editAU(); - AcquisitionUnits.selectViewCheckbox(); - AcquisitionUnits.editAU(); - AcquisitionUnits.selectEditCheckbox(); - - cy.visit(TopMenu.fiscalYearPath); - FinanceHelp.searchByAll(defaultFiscalYear.name); - FiscalYears.selectFisacalYear(defaultFiscalYear.name); - FiscalYears.editFiscalYearDetails(); - FiscalYears.assignAU(defaultAcquisitionUnit.name); - FiscalYears.closeThirdPane(); - FiscalYears.resetFilters(); cy.login(userProperties.username, userProperties.password, { path: TopMenu.fiscalYearPath, waiter: FiscalYears.waitForFiscalYearDetailsLoading, @@ -74,29 +66,25 @@ describe('Acquisition Units', () => { }); after(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, - }); - FiscalYears.deleteFiscalYearViaApi(defaultFiscalYear.id); - AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name); - AcquisitionUnits.delete(defaultAcquisitionUnit.name); + cy.getAdminToken(); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); + FiscalYears.deleteFiscalYearViaApi(fiscalYear.id); Users.deleteViaApi(user.userId); }); it( 'C375079 Acquisition unit restrictions for "Fiscal year" records (Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375079'] }, () => { - FinanceHelp.searchByAll(defaultFiscalYear.name); - FiscalYears.selectFisacalYear(defaultFiscalYear.name); + FinanceHelp.searchByAll(fiscalYear.name); + FiscalYears.selectFisacalYear(fiscalYear.name); FiscalYears.clickActionsButtonInFY(); FiscalYears.checkDeleteButtonIsDisabled(); FiscalYears.clickActionsButtonInFY(); FiscalYears.editFiscalYearDetails(); FiscalYears.editDescription(); FiscalYears.clickNewFY(); - FiscalYears.checkAcquisitionUnitIsAbsentToAssign(defaultAcquisitionUnit.name); + FiscalYears.checkAcquisitionUnitIsAbsentToAssign(acquisitionUnit.name); }, ); }); diff --git a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-view.cy.js b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-view.cy.js index 25eb64587e..bbdec40c6f 100644 --- a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-view.cy.js +++ b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU-only-view.cy.js @@ -1,70 +1,63 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import FinanceHelp from '../../support/fragments/finance/financeHelper'; import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; describe('Acquisition Units', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; - const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectCreate: true, + protectUpdate: true, + }; + const fiscalYear = { ...FiscalYears.defaultUiFiscalYear }; let user; before(() => { - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, + cy.getAdminToken(); + FiscalYears.createViaApi(fiscalYear).then((fiscalYearResponse) => { + fiscalYear.id = fiscalYearResponse.id; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + FiscalYears.updateFiscalYearViaApi({ + ...fiscalYearResponse, + acqUnitIds: [acquisitionUnit.id], + }); }); - cy.reload(); - AcquisitionUnits.waitLoading(); - }, 20_000); - FiscalYears.createViaApi(defaultFiscalYear).then((firstFiscalYearResponse) => { - defaultFiscalYear.id = firstFiscalYearResponse.id; }); + cy.createTempUser([ - permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, - permissions.uiSettingsFinanceViewEditCreateDelete.gui, - permissions.uiFinanceViewEditDeleteLedger.gui, - permissions.uiFinanceViewEditDeleteGroups.gui, - permissions.uiFinanceViewEditDeleteFundBudget.gui, - permissions.uiFinanceViewEditDeleteFiscalYear.gui, - permissions.uiFinanceViewEditCreateLedger.gui, - permissions.uiFinanceCreateViewEditGroups.gui, - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiFinanceViewEditCreateFiscalYear.gui, - permissions.uiFinanceViewEditLedger.gui, - permissions.uiFinanceViewEditFundAndBudget.gui, - permissions.uiFinanceViewEditFiscalYear.gui, - permissions.uiFinanceViewLedger.gui, - permissions.uiFinanceViewGroups.gui, - permissions.uiFinanceViewFundAndBudget.gui, - permissions.uiFinanceViewFiscalYear.gui, - permissions.uiFinanceManuallyReleaseEncumbrance.gui, - permissions.uiFinanceManageAcquisitionUnits.gui, - permissions.uiFinanceExportFinanceRecords.gui, - permissions.uiFinanceExecuteFiscalYearRollover.gui, - permissions.uiFinanceCreateTransfers.gui, - permissions.uiFinanceCreateAllocations.gui, - permissions.uiFinanceFinanceViewGroup.gui, + Permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, + Permissions.uiSettingsFinanceViewEditCreateDelete.gui, + Permissions.uiFinanceViewEditDeleteLedger.gui, + Permissions.uiFinanceViewEditDeleteGroups.gui, + Permissions.uiFinanceViewEditDeleteFundBudget.gui, + Permissions.uiFinanceViewEditDeleteFiscalYear.gui, + Permissions.uiFinanceViewEditCreateLedger.gui, + Permissions.uiFinanceCreateViewEditGroups.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiFinanceViewEditCreateFiscalYear.gui, + Permissions.uiFinanceViewEditLedger.gui, + Permissions.uiFinanceViewEditFundAndBudget.gui, + Permissions.uiFinanceViewEditFiscalYear.gui, + Permissions.uiFinanceViewLedger.gui, + Permissions.uiFinanceViewGroups.gui, + Permissions.uiFinanceViewFundAndBudget.gui, + Permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiFinanceManuallyReleaseEncumbrance.gui, + Permissions.uiFinanceManageAcquisitionUnits.gui, + Permissions.uiFinanceExportFinanceRecords.gui, + Permissions.uiFinanceExecuteFiscalYearRollover.gui, + Permissions.uiFinanceCreateTransfers.gui, + Permissions.uiFinanceCreateAllocations.gui, + Permissions.uiFinanceFinanceViewGroup.gui, ]).then((userProperties) => { user = userProperties; - AcquisitionUnits.newAcquisitionUnit(); - AcquisitionUnits.fillInAUInfo(defaultAcquisitionUnit.name); - AcquisitionUnits.assignAdmin(); - AcquisitionUnits.editAU(); - AcquisitionUnits.selectViewCheckbox(); - TopMenuNavigation.openAppFromDropdown('Finance'); - FinanceHelp.clickFiscalYearButton(); - FinanceHelp.searchByAll(defaultFiscalYear.name); - FiscalYears.selectFisacalYear(defaultFiscalYear.name); - FiscalYears.editFiscalYearDetails(); - FiscalYears.assignAU(defaultAcquisitionUnit.name); - FiscalYears.closeThirdPane(); - FiscalYears.resetFilters(); cy.login(userProperties.username, userProperties.password, { path: TopMenu.fiscalYearPath, waiter: FiscalYears.waitForFiscalYearDetailsLoading, @@ -73,27 +66,23 @@ describe('Acquisition Units', () => { }); after(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, - }); - FiscalYears.deleteFiscalYearViaApi(defaultFiscalYear.id); - AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name); - AcquisitionUnits.delete(defaultAcquisitionUnit.name); + cy.getAdminToken(); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); + FiscalYears.deleteFiscalYearViaApi(fiscalYear.id); Users.deleteViaApi(user.userId); }); it( 'C375078 Acquisition unit restrictions for "Fiscal year" records (Edit, Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375078'] }, () => { - FinanceHelp.searchByAll(defaultFiscalYear.name); - FiscalYears.selectFisacalYear(defaultFiscalYear.name); + FinanceHelp.searchByAll(fiscalYear.name); + FiscalYears.selectFisacalYear(fiscalYear.name); FiscalYears.clickActionsButtonInFY(); FiscalYears.checkEditButtonIsDisabled(); FiscalYears.checkDeleteButtonIsDisabled(); FiscalYears.clickNewFY(); - FiscalYears.checkAcquisitionUnitIsAbsentToAssign(defaultAcquisitionUnit.name); + FiscalYears.checkAcquisitionUnitIsAbsentToAssign(acquisitionUnit.name); }, ); }); diff --git a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU.cy.js b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU.cy.js index 644de30910..465d60faee 100644 --- a/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU.cy.js +++ b/cypress/e2e/acquisition-units/acquisition-unit-restrictions-for-FY-when-user-is-NOT-assigned-to-AU.cy.js @@ -1,66 +1,64 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import FinanceHelp from '../../support/fragments/finance/financeHelper'; import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; describe('Acquisition Units', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; - const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectCreate: true, + protectUpdate: true, + protectRead: true, + }; + const fiscalYear = { ...FiscalYears.defaultUiFiscalYear }; let user; before(() => { - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, + cy.getAdminToken(); + FiscalYears.createViaApi(fiscalYear).then((fiscalYearResponse) => { + fiscalYear.id = fiscalYearResponse.id; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + FiscalYears.updateFiscalYearViaApi({ + ...fiscalYearResponse, + acqUnitIds: [acquisitionUnit.id], + }); }); - cy.reload(); - AcquisitionUnits.waitLoading(); - }, 20_000); - FiscalYears.createViaApi(defaultFiscalYear).then((firstFiscalYearResponse) => { - defaultFiscalYear.id = firstFiscalYearResponse.id; }); + cy.createTempUser([ - permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, - permissions.uiSettingsFinanceViewEditCreateDelete.gui, - permissions.uiFinanceViewEditDeleteLedger.gui, - permissions.uiFinanceViewEditDeleteGroups.gui, - permissions.uiFinanceViewEditDeleteFundBudget.gui, - permissions.uiFinanceViewEditDeleteFiscalYear.gui, - permissions.uiFinanceViewEditCreateLedger.gui, - permissions.uiFinanceCreateViewEditGroups.gui, - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiFinanceViewEditCreateFiscalYear.gui, - permissions.uiFinanceViewEditLedger.gui, - permissions.uiFinanceViewEditFundAndBudget.gui, - permissions.uiFinanceViewEditFiscalYear.gui, - permissions.uiFinanceViewLedger.gui, - permissions.uiFinanceViewGroups.gui, - permissions.uiFinanceViewFundAndBudget.gui, - permissions.uiFinanceViewFiscalYear.gui, - permissions.uiFinanceManuallyReleaseEncumbrance.gui, - permissions.uiFinanceManageAcquisitionUnits.gui, - permissions.uiFinanceExportFinanceRecords.gui, - permissions.uiFinanceExecuteFiscalYearRollover.gui, - permissions.uiFinanceCreateTransfers.gui, - permissions.uiFinanceCreateAllocations.gui, - permissions.uiFinanceFinanceViewGroup.gui, + Permissions.uiFinanceAssignAcquisitionUnitsToNewRecord.gui, + Permissions.uiSettingsFinanceViewEditCreateDelete.gui, + Permissions.uiFinanceViewEditDeleteLedger.gui, + Permissions.uiFinanceViewEditDeleteGroups.gui, + Permissions.uiFinanceViewEditDeleteFundBudget.gui, + Permissions.uiFinanceViewEditDeleteFiscalYear.gui, + Permissions.uiFinanceViewEditCreateLedger.gui, + Permissions.uiFinanceCreateViewEditGroups.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiFinanceViewEditCreateFiscalYear.gui, + Permissions.uiFinanceViewEditLedger.gui, + Permissions.uiFinanceViewEditFundAndBudget.gui, + Permissions.uiFinanceViewEditFiscalYear.gui, + Permissions.uiFinanceViewLedger.gui, + Permissions.uiFinanceViewGroups.gui, + Permissions.uiFinanceViewFundAndBudget.gui, + Permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiFinanceManuallyReleaseEncumbrance.gui, + Permissions.uiFinanceManageAcquisitionUnits.gui, + Permissions.uiFinanceExportFinanceRecords.gui, + Permissions.uiFinanceExecuteFiscalYearRollover.gui, + Permissions.uiFinanceCreateTransfers.gui, + Permissions.uiFinanceCreateAllocations.gui, + Permissions.uiFinanceFinanceViewGroup.gui, ]).then((userProperties) => { user = userProperties; - AcquisitionUnits.newAcquisitionUnit(); - AcquisitionUnits.fillInAUInfo(defaultAcquisitionUnit.name); - AcquisitionUnits.assignAdmin(); - cy.visit(TopMenu.fiscalYearPath); - FinanceHelp.searchByAll(defaultFiscalYear.name); - FiscalYears.selectFisacalYear(defaultFiscalYear.name); - FiscalYears.editFiscalYearDetails(); - FiscalYears.assignAU(defaultAcquisitionUnit.name); - FiscalYears.closeThirdPane(); - FiscalYears.resetFilters(); cy.login(userProperties.username, userProperties.password, { path: TopMenu.fiscalYearPath, waiter: FiscalYears.waitForFiscalYearDetailsLoading, @@ -69,27 +67,23 @@ describe('Acquisition Units', () => { }); after(() => { - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, - }); - FiscalYears.deleteFiscalYearViaApi(defaultFiscalYear.id); - AcquisitionUnits.unAssignAdmin(defaultAcquisitionUnit.name); - AcquisitionUnits.delete(defaultAcquisitionUnit.name); + cy.getAdminToken(); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); + FiscalYears.deleteFiscalYearViaApi(fiscalYear.id); Users.deleteViaApi(user.userId); }); it( - 'C375073 Acquisition unit restrictions for "Fiscal year" records (Edit, Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + 'C375073 Acquisition unit restrictions for "Fiscal year" records (View, Edit, Create, Delete options are restricted) when user is NOT assigned to acquisition unit (thunderjet)', + { tags: ['criticalPath', 'thunderjet', 'C375073'] }, () => { - FinanceHelp.searchByAll(defaultFiscalYear.name); + FinanceHelp.searchByAll(fiscalYear.name); FiscalYears.checkNoResultsMessage( - `No results found for "${defaultFiscalYear.name}". Please check your spelling and filters.`, + `No results found for "${fiscalYear.name}". Please check your spelling and filters.`, ); FiscalYears.resetFilters(); FiscalYears.openAcquisitionAccordion(); - FiscalYears.selectAcquisitionUnitFilter(defaultAcquisitionUnit.name); + FiscalYears.selectAcquisitionUnitFilter(acquisitionUnit.name); FiscalYears.checkNoResultsMessage('No results found. Please check your filters.'); }, ); diff --git a/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js b/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js index c58ca619af..d7bee29da2 100644 --- a/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js +++ b/cypress/e2e/data-import/e2e/edi-import-file-for-create-invoice-record.cy.js @@ -89,7 +89,7 @@ describe('Data Import', () => { it( 'C343338 EDIFACT file import with creating of new invoice record (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C343338', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'shiftLeft', 'C343338'] }, () => { // create Field mapping profile cy.wait(2000); diff --git a/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js b/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js index 345986b8d3..1512a15a84 100644 --- a/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js +++ b/cypress/e2e/data-import/e2e/edi-import-large-invoice-file.cy.js @@ -79,7 +79,7 @@ describe('Data Import', () => { it( 'C347615 Import a large EDIFACT invoice file (folijet)', - { tags: ['smoke', 'folijet', 'C347615', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'C347615'] }, () => { // create Field mapping profile FieldMappingProfiles.createInvoiceMappingProfile(mappingProfile, profileForDuplicate); diff --git a/cypress/e2e/data-import/importing-edifact-files/edifact-file-with-file-extention-txt-imports-without-errors.cy.js b/cypress/e2e/data-import/importing-edifact-files/edifact-file-with-file-extention-txt-imports-without-errors.cy.js index 2d6ba02d0a..802cfce4a4 100644 --- a/cypress/e2e/data-import/importing-edifact-files/edifact-file-with-file-extention-txt-imports-without-errors.cy.js +++ b/cypress/e2e/data-import/importing-edifact-files/edifact-file-with-file-extention-txt-imports-without-errors.cy.js @@ -94,7 +94,7 @@ describe('Data Import', () => { it( 'C350716 Ensure an EDIFACT file with file extension .txt imports without errors (folijet)', - { tags: ['extendedPath', 'folijet', 'C350716', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C350716'] }, () => { // create Field mapping profile FieldMappingProfiles.waitLoading(); diff --git a/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-file-with-parsing-problems-completes-and-displays-error.cy.js b/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-file-with-parsing-problems-completes-and-displays-error.cy.js index 448269a863..e01a830e16 100644 --- a/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-file-with-parsing-problems-completes-and-displays-error.cy.js +++ b/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-file-with-parsing-problems-completes-and-displays-error.cy.js @@ -86,7 +86,7 @@ describe('Data Import', () => { it( 'C377019 Confirm an EDIFACT invoice file with parsing problems completes and displays an error (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C377019', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C377019'] }, () => { // create Field mapping profile FieldMappingProfiles.createInvoiceMappingProfile(mappingProfile, profileForDuplicate); diff --git a/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-import-when-invoice-line-description-is-incorrectly-constructed.cy.js b/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-import-when-invoice-line-description-is-incorrectly-constructed.cy.js index 772eb99761..312ffe5cd7 100644 --- a/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-import-when-invoice-line-description-is-incorrectly-constructed.cy.js +++ b/cypress/e2e/data-import/importing-edifact-files/edifact-invoice-import-when-invoice-line-description-is-incorrectly-constructed.cy.js @@ -93,7 +93,7 @@ describe('Data Import', () => { it( 'C347926 Check EDIFACT invoice import when Invoice line description is incorrectly constructed (folijet)', - { tags: ['extendedPath', 'folijet', 'C347926', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C347926'] }, () => { // create Field mapping profile FieldMappingProfiles.waitLoading(); diff --git a/cypress/e2e/data-import/importing-edifact-files/empty-srs-column-when-importing-edifact-files.cy.js b/cypress/e2e/data-import/importing-edifact-files/empty-srs-column-when-importing-edifact-files.cy.js index 89685e6935..39b2483c44 100644 --- a/cypress/e2e/data-import/importing-edifact-files/empty-srs-column-when-importing-edifact-files.cy.js +++ b/cypress/e2e/data-import/importing-edifact-files/empty-srs-column-when-importing-edifact-files.cy.js @@ -83,7 +83,7 @@ describe('Data Import', () => { it( 'C375103 Verify the empty SRS column when importing EDIFACT files (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C375103', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C375103'] }, () => { // create Field mapping profile FieldMappingProfiles.waitLoading(); diff --git a/cypress/e2e/data-import/importing-marc-bib-files/import-of-orders-with-pending-status.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/import-of-orders-with-pending-status.cy.js index 16dd1f4a09..2e1d1cfdfe 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/import-of-orders-with-pending-status.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/import-of-orders-with-pending-status.cy.js @@ -154,7 +154,7 @@ describe('Data Import', () => { it( 'C375174 Verify the importing of orders with pending status (folijet)', - { tags: ['criticalPath', 'folijet', 'C375174', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C375174'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-electronic-resource-with-no-inventory.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-electronic-resource-with-no-inventory.cy.js index 4cfe5f8efb..1c8b1f251c 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-electronic-resource-with-no-inventory.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-electronic-resource-with-no-inventory.cy.js @@ -93,7 +93,7 @@ describe('Data Import', () => { it( 'C380483 Import to create open orders: Electronic resource with NO inventory (folijet)', - { tags: ['criticalPath', 'folijet', 'C380483', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C380483'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-other-with-instance-holdings.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-other-with-instance-holdings.cy.js index 85cf6f8af1..a157fff4df 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-other-with-instance-holdings.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-other-with-instance-holdings.cy.js @@ -126,7 +126,7 @@ describe('Data Import', () => { it( 'C380485 Import to create open orders: Other with Instances, Holdings (folijet)', - { tags: ['criticalPath', 'folijet', 'C380485', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C380485'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile( diff --git a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js index 5bd13292cd..72df20efb2 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/import-to-create-open-orders-physical-resource-with-instances-holdings-items.cy.js @@ -145,7 +145,7 @@ describe('Data Import', () => { it( 'C380474 Import to create open orders: Physical resource with Instances, Holdings, Items (folijet)', - { tags: ['criticalPath', 'folijet', 'C380474', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C380474'] }, () => { // create mapping profiles FieldMappingProfiles.createOrderMappingProfile( diff --git a/cypress/e2e/data-import/importing-marc-bib-files/importing-ebook-orders-with-open-status.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/importing-ebook-orders-with-open-status.cy.js index d69363b1fa..6aa7a2732b 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/importing-ebook-orders-with-open-status.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/importing-ebook-orders-with-open-status.cy.js @@ -112,7 +112,7 @@ describe('Data Import', () => { it( 'C375989 Verify the importing of eBook orders with open status (folijet)', - { tags: ['criticalPath', 'folijet', 'C375989', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C375989'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/importing-marc-bib-files/orders-multiple-marc-subfield-mappings.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/orders-multiple-marc-subfield-mappings.cy.js index 13c6182545..2c5bd78bca 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/orders-multiple-marc-subfield-mappings.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/orders-multiple-marc-subfield-mappings.cy.js @@ -107,7 +107,7 @@ describe('Data Import', () => { it( 'C380431 Verify orders multiple MARC subfield mappings (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C380431', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C380431'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/importing-marc-bib-files/pending-order-with-receipt-not-required.cy.js b/cypress/e2e/data-import/importing-marc-bib-files/pending-order-with-receipt-not-required.cy.js index ba2d6da9f8..4f11759115 100644 --- a/cypress/e2e/data-import/importing-marc-bib-files/pending-order-with-receipt-not-required.cy.js +++ b/cypress/e2e/data-import/importing-marc-bib-files/pending-order-with-receipt-not-required.cy.js @@ -112,7 +112,7 @@ describe('Data Import', () => { it( 'C380388 Creating a pending order with Receipt not required (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C380388', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C380388'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/log-details/errors-when-importing-orders-with-multiple-product-id-tepes-mapped-case-1.cy.js b/cypress/e2e/data-import/log-details/errors-when-importing-orders-with-multiple-product-id-tepes-mapped-case-1.cy.js index 1de1d876a4..618a78fc42 100644 --- a/cypress/e2e/data-import/log-details/errors-when-importing-orders-with-multiple-product-id-tepes-mapped-case-1.cy.js +++ b/cypress/e2e/data-import/log-details/errors-when-importing-orders-with-multiple-product-id-tepes-mapped-case-1.cy.js @@ -112,7 +112,7 @@ describe('Data Import', () => { it( 'C378893 Verify no errors when importing orders with multiple product ID types mapped: Case 1 (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C378893', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C378893'] }, () => { // create mapping profile createMappingProfile(mappingProfile, additionalProduct); diff --git a/cypress/e2e/data-import/log-details/filter-in-summary-table-create-discarded-error-actions-for-invoice.cy.js b/cypress/e2e/data-import/log-details/filter-in-summary-table-create-discarded-error-actions-for-invoice.cy.js index e3380b93ab..2777b5800d 100644 --- a/cypress/e2e/data-import/log-details/filter-in-summary-table-create-discarded-error-actions-for-invoice.cy.js +++ b/cypress/e2e/data-import/log-details/filter-in-summary-table-create-discarded-error-actions-for-invoice.cy.js @@ -87,7 +87,7 @@ describe('Data Import', () => { it( 'C357018 Check the filter in summary table with "create + discarded + error" actions for the Invoice column (folijet)', - { tags: ['criticalPath', 'folijet', 'C357018', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C357018'] }, () => { // create Field mapping profile FieldMappingProfiles.waitLoading(); diff --git a/cypress/e2e/data-import/log-details/import-summary-table-with-created-action-for-invoice-record.cy.js b/cypress/e2e/data-import/log-details/import-summary-table-with-created-action-for-invoice-record.cy.js index 894db637e9..b8cd05ad3e 100644 --- a/cypress/e2e/data-import/log-details/import-summary-table-with-created-action-for-invoice-record.cy.js +++ b/cypress/e2e/data-import/log-details/import-summary-table-with-created-action-for-invoice-record.cy.js @@ -90,7 +90,7 @@ describe('Data Import', () => { it( 'C353625 Check import summary table with "Created" action for invoice record (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C353625', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C353625'] }, () => { // create Field mapping profile FieldMappingProfiles.waitLoading(); diff --git a/cypress/e2e/data-import/log-details/importing-of-orders-with-pending-status.cy.js b/cypress/e2e/data-import/log-details/importing-of-orders-with-pending-status.cy.js index 5d20c602ea..b78319d6f8 100644 --- a/cypress/e2e/data-import/log-details/importing-of-orders-with-pending-status.cy.js +++ b/cypress/e2e/data-import/log-details/importing-of-orders-with-pending-status.cy.js @@ -150,7 +150,7 @@ describe('Data Import', () => { it( 'C375178 Verify the log details for created imported order records (folijet)', - { tags: ['criticalPath', 'folijet', 'C375178', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C375178'] }, () => { DataImport.verifyUploadState(); DataImport.uploadFile(filePathForCreateOrder, marcFileName); diff --git a/cypress/e2e/data-import/log-details/json-error-message-text-for-importer-not-member-of-aquisitions-unit.cy.js b/cypress/e2e/data-import/log-details/json-error-message-text-for-importer-not-member-of-aquisitions-unit.cy.js index 59ea8248d1..d9cf533bbd 100644 --- a/cypress/e2e/data-import/log-details/json-error-message-text-for-importer-not-member-of-aquisitions-unit.cy.js +++ b/cypress/e2e/data-import/log-details/json-error-message-text-for-importer-not-member-of-aquisitions-unit.cy.js @@ -98,7 +98,7 @@ describe('Data Import', () => { it( 'C385666 Verify JSON error message text for importer who is not a member of the specified Acquisitions unit (folijet)', - { tags: ['criticalPath', 'folijet', 'C385666', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C385666'] }, () => { // create mapping profile FieldMappingProfiles.createOrderMappingProfile(mappingProfile); diff --git a/cypress/e2e/data-import/log-details/json-error-screen-for-imported-orders.cy.js b/cypress/e2e/data-import/log-details/json-error-screen-for-imported-orders.cy.js index cf531c01b4..5ffda2e116 100644 --- a/cypress/e2e/data-import/log-details/json-error-screen-for-imported-orders.cy.js +++ b/cypress/e2e/data-import/log-details/json-error-screen-for-imported-orders.cy.js @@ -137,7 +137,7 @@ describe('Data Import', () => { it( 'C375202 Verify the JSON error screen for imported orders (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C375202', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C375202'] }, () => { DataImport.verifyUploadState(); DataImport.uploadFile(filePathForCreateOrder, marcFileName); diff --git a/cypress/e2e/data-import/log-details/json-screen-for-successful-imported-orders.cy.js b/cypress/e2e/data-import/log-details/json-screen-for-successful-imported-orders.cy.js index 5110c4bd16..1c3cb392aa 100644 --- a/cypress/e2e/data-import/log-details/json-screen-for-successful-imported-orders.cy.js +++ b/cypress/e2e/data-import/log-details/json-screen-for-successful-imported-orders.cy.js @@ -141,7 +141,7 @@ describe('Data Import', () => { it( 'C375197 Verify the JSON screen for successful imported orders (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C375197', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C375197'] }, () => { DataImport.verifyUploadState(); DataImport.uploadFile(testData.filePath, testData.fileName); diff --git a/cypress/e2e/data-import/log-details/log-details-for-no-action-order-records.cy.js b/cypress/e2e/data-import/log-details/log-details-for-no-action-order-records.cy.js index a9f09049ed..e235bdb42c 100644 --- a/cypress/e2e/data-import/log-details/log-details-for-no-action-order-records.cy.js +++ b/cypress/e2e/data-import/log-details/log-details-for-no-action-order-records.cy.js @@ -142,7 +142,7 @@ describe('Data Import', () => { it( 'C375179 Verify the log details for no action order records (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C375179', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C375179'] }, () => { DataImport.verifyUploadState(); DataImport.uploadFile(filePathForCreateOrder, marcFileName); diff --git a/cypress/e2e/data-import/log-details/no-errors-when-importing-orders-with-multiple-product-id-types-mapped-case-2.cy.js b/cypress/e2e/data-import/log-details/no-errors-when-importing-orders-with-multiple-product-id-types-mapped-case-2.cy.js index 74b3f99443..43e8539141 100644 --- a/cypress/e2e/data-import/log-details/no-errors-when-importing-orders-with-multiple-product-id-types-mapped-case-2.cy.js +++ b/cypress/e2e/data-import/log-details/no-errors-when-importing-orders-with-multiple-product-id-types-mapped-case-2.cy.js @@ -117,7 +117,7 @@ describe('Data Import', () => { it( 'C378900 Verify no errors when importing orders with multiple product ID types mapped: Case 2 (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C378900', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C378900'] }, () => { // create mapping profile createMappingProfile(mappingProfile, additionalProduct); diff --git a/cypress/e2e/data-import/permissions/can-see-json-tab-for-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js b/cypress/e2e/data-import/permissions/can-see-json-tab-for-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js index 845443e351..9cf914a6de 100644 --- a/cypress/e2e/data-import/permissions/can-see-json-tab-for-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js +++ b/cypress/e2e/data-import/permissions/can-see-json-tab-for-imported-orders-with-data-import-can-upload-files-import-and-view-logs-permission.cy.js @@ -137,7 +137,7 @@ describe('Data Import', () => { it( 'C377023 A user can see JSON tab for imported Orders with "Data import: Can upload files, import, and view logs" permission (folijet)', - { tags: ['extendedPath', 'folijet', 'C377023', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C377023'] }, () => { const message = `Import Log for Record 01 (${title})`; diff --git a/cypress/e2e/data-import/permissions/can-view-acquisition-methods-in-order-field-mapping.cy.js b/cypress/e2e/data-import/permissions/can-view-acquisition-methods-in-order-field-mapping.cy.js index 8a5b74026f..940e3f14de 100644 --- a/cypress/e2e/data-import/permissions/can-view-acquisition-methods-in-order-field-mapping.cy.js +++ b/cypress/e2e/data-import/permissions/can-view-acquisition-methods-in-order-field-mapping.cy.js @@ -27,7 +27,7 @@ describe('Data Import', () => { it( 'C377031 A user can view Acquisition Methods in Order field mapping with "Settings (Data import): Can view, create, edit, and remove" (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C377031', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C377031'] }, () => { FieldMappingProfiles.openNewMappingProfileForm(); NewFieldMappingProfile.waitLoading(); diff --git a/cypress/e2e/export-manager/check-view-jobs.cy.js b/cypress/e2e/export-manager/check-view-jobs.cy.js index fe99335c12..619ca1316e 100644 --- a/cypress/e2e/export-manager/check-view-jobs.cy.js +++ b/cypress/e2e/export-manager/check-view-jobs.cy.js @@ -1,18 +1,15 @@ -import permissions from '../../support/dictionary/permissions'; -import { APPLICATION_NAMES } from '../../support/constants'; +import { APPLICATION_NAMES, LOCATION_NAMES } from '../../support/constants'; +import Permissions from '../../support/dictionary/permissions'; import ExportManagerSearchPane from '../../support/fragments/exportManager/exportManagerSearchPane'; -import NewOrder from '../../support/fragments/orders/newOrder'; -import OrderLines from '../../support/fragments/orders/orderLines'; -import Orders from '../../support/fragments/orders/orders'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; -import NewLocation from '../../support/fragments/settings/tenant/locations/newLocation'; -import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints'; +import { InventoryInstance, InventoryInstances } from '../../support/fragments/inventory'; +import { NewOrder, OrderLines, Orders } from '../../support/fragments/orders'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; +import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; import Users from '../../support/fragments/users/users'; import DateTools from '../../support/utils/dateTools'; import getRandomPostfix from '../../support/utils/stringTools'; -import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format', () => { @@ -63,24 +60,23 @@ describe('Export Manager', () => { const UTCTime = DateTools.getUTCDateForScheduling(); let user; let location; - let servicePointId; let orderNumber; + let instance; before(() => { cy.getAdminToken(); - - ServicePoints.getViaApi().then((servicePoint) => { - servicePointId = servicePoint[0].id; - NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => { - location = res; - }); + InventoryInstance.createInstanceViaApi().then(({ instanceData }) => { + instance = instanceData; + }); + cy.getLocations({ query: `name="${LOCATION_NAMES.ANNEX_UI}"` }).then((response) => { + location = response; }); Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { organization.id = organizationsResponse; order.vendor = organizationsResponse; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -109,19 +105,21 @@ describe('Export Manager', () => { orderNumber = response.body.poNumber; }); // Need to wait while first job will be runing - cy.wait(60000); + cy.wait(30000); + cy.createTempUser([ - permissions.uiOrdersView.gui, - permissions.uiOrdersCreate.gui, - permissions.uiOrdersEdit.gui, - permissions.uiOrdersApprovePurchaseOrders.gui, - permissions.uiOrganizationsViewEditCreate.gui, - permissions.uiOrganizationsView.gui, - permissions.uiExportOrders.gui, - permissions.exportManagerAll.gui, - permissions.exportManagerDownloadAndResendFiles.gui, + Permissions.uiOrdersView.gui, + Permissions.uiOrdersCreate.gui, + Permissions.uiOrdersEdit.gui, + Permissions.uiOrdersApprovePurchaseOrders.gui, + Permissions.uiOrganizationsViewEditCreate.gui, + Permissions.uiOrganizationsView.gui, + Permissions.uiExportOrders.gui, + Permissions.exportManagerAll.gui, + Permissions.exportManagerDownloadAndResendFiles.gui, ]).then((userProperties) => { user = userProperties; + cy.login(user.username, user.password, { path: TopMenu.ordersPath, waiter: Orders.waitLoading, @@ -130,35 +128,25 @@ describe('Export Manager', () => { }); after(() => { - cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading }); - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.unOpenOrder(); - // Need to wait until the order is opened before deleting it - cy.wait(2000); + cy.getAdminToken(); Orders.deleteOrderViaApi(order.id); - + InventoryInstances.deleteInstanceAndItsHoldingsAndItemsViaApi(instance.instanceId); Organizations.deleteOrganizationViaApi(organization.id); - NewLocation.deleteInstitutionCampusLibraryLocationViaApi( - location.institutionId, - location.campusId, - location.libraryId, - location.id, - ); Users.deleteViaApi(user.userId); }); it( 'C347885 Check view for jobs on Export Manager page (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C347885'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); Orders.createPOLineViaActions(); - OrderLines.selectRandomInstanceInTitleLookUP('*', 1); + OrderLines.selectRandomInstanceInTitleLookUP(instance.instanceId, 0); OrderLines.fillInPOLineInfoForExportWithLocation('Purchase', location.name); OrderLines.backToEditingOrder(); Orders.openOrder(); + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.EXPORT_MANAGER); ExportManagerSearchPane.selectOrganizationsSearch(); ExportManagerSearchPane.searchByFailed(); diff --git a/cypress/e2e/export-manager/export-orders-in-edifact-format/job-type-filter-has-valid-options-list.cy.js b/cypress/e2e/export-manager/export-orders-in-edifact-format/job-type-filter-has-valid-options-list.cy.js index 48360d8cdd..5fc149266f 100644 --- a/cypress/e2e/export-manager/export-orders-in-edifact-format/job-type-filter-has-valid-options-list.cy.js +++ b/cypress/e2e/export-manager/export-orders-in-edifact-format/job-type-filter-has-valid-options-list.cy.js @@ -1,42 +1,124 @@ import moment from 'moment'; -import { ACQUISITION_METHOD_NAMES_IN_PROFILE } from '../../../support/constants'; -import { Permissions } from '../../../support/dictionary'; -import ExportManagerSearchPane from '../../../support/fragments/exportManager/exportManagerSearchPane'; import { - Integrations, - NewOrganization, - Organizations, -} from '../../../support/fragments/organizations'; + ACQUISITION_METHOD_NAMES_IN_PROFILE, + LOCATION_NAMES, + ORDER_STATUSES, +} from '../../../support/constants'; +import Permissions from '../../../support/dictionary/permissions'; +import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane'; +import ExportManagerSearchPane from '../../../support/fragments/exportManager/exportManagerSearchPane'; +import { BasicOrderLine, NewOrder, OrderLines, Orders } from '../../../support/fragments/orders'; +import { NewOrganization, Organizations } from '../../../support/fragments/organizations'; +import Integrations from '../../../support/fragments/organizations/integrations/integrations'; +import MaterialTypes from '../../../support/fragments/settings/inventory/materialTypes'; 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'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format', () => { const now = moment(); + const order = { + ...NewOrder.defaultOneTimeOrder, + approved: true, + }; + const organization = { + ...NewOrganization.defaultUiOrganizations, + accounts: [ + { + accountNo: getRandomPostfix(), + accountStatus: 'Active', + acqUnitIds: [], + appSystemNo: '', + description: 'Main library account', + libraryCode: 'COB', + libraryEdiCode: getRandomPostfix(), + name: 'TestAccout1', + notes: '', + paymentMethod: 'Cash', + }, + ], + }; const testData = { - organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), + user: {}, + userUUIDsFileName: `userUUIDs_${getRandomPostfix()}.csv`, }; before('Create test data', () => { cy.getAdminToken().then(() => { - Organizations.createOrganizationViaApi(testData.organization).then(() => { + Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { + organization.id = organizationsResponse; + order.vendor = organizationsResponse; + cy.getAcquisitionMethodsApi({ query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE}"`, - }).then(({ body: { acquisitionMethods } }) => { - const acqMethod = acquisitionMethods.find( - ({ value }) => value === ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE, - ); + }).then((acqMethod) => { + cy.getLocations({ query: `name="${LOCATION_NAMES.MAIN_LIBRARY_UI}"` }).then( + (locationResp) => { + MaterialTypes.createMaterialTypeViaApi(MaterialTypes.getDefaultMaterialType()).then( + (mtypes) => { + const orderLine = { + ...BasicOrderLine.defaultOrderLine, + cost: { + listUnitPrice: 20.0, + currency: 'USD', + discountType: 'percentage', + quantityPhysical: 1, + poLineEstimatedPrice: 20.0, + }, + locations: [ + { locationId: locationResp.id, quantity: 1, quantityPhysical: 1 }, + ], + acquisitionMethod: acqMethod.body.acquisitionMethods[0].id, + physical: { + createInventory: 'Instance, Holding, Item', + materialType: mtypes.body.id, + volumes: [], + }, + automaticExport: true, + vendorDetail: { vendorAccount: null }, + }; + cy.createOrderApi(order).then((orderResponse) => { + testData.orderNumber = orderResponse.body.poNumber; + orderLine.purchaseOrderId = orderResponse.body.id; - now.set('second', now.second() + 10); - testData.integration = Integrations.getDefaultIntegration({ - vendorId: testData.organization.id, - acqMethodId: acqMethod.id, - scheduleTime: now.utc().format('HH:mm:ss'), - }); - Integrations.createIntegrationViaApi(testData.integration); + OrderLines.createOrderLineViaApi(orderLine); + Orders.updateOrderViaApi({ + ...orderResponse.body, + workflowStatus: ORDER_STATUSES.OPEN, + }).then(() => { + testData.integration = Integrations.getDefaultIntegration({ + vendorId: organization.id, + acqMethodId: acqMethod.body.acquisitionMethods[0].id, + accountNoList: [organization.accounts[0].accountNo], + scheduleTime: now.utc().format('HH:mm:ss'), + isDefaultConfig: true, + }); + testData.integrationName = + testData.integration.exportTypeSpecificParameters.vendorEdiOrdersExportConfig.configName; + Integrations.createIntegrationViaApi(testData.integration); + }); + }); + }, + ); + }, + ); }); }); + cy.loginAsAdmin({ + path: TopMenu.bulkEditPath, + waiter: BulkEditSearchPane.waitLoading, + }); + FileManager.createFile( + `cypress/fixtures/${testData.userUUIDsFileName}`, + testData.user.userId, + ); + BulkEditSearchPane.checkUsersRadio(); + BulkEditSearchPane.selectRecordIdentifier('User UUIDs'); + BulkEditSearchPane.uploadFile(testData.userUUIDsFileName); + BulkEditSearchPane.waitFileUploading(); }); cy.createTempUser([Permissions.exportManagerAll.gui]).then((userProperties) => { @@ -51,15 +133,16 @@ describe('Export Manager', () => { after('Delete test data', () => { cy.getAdminToken().then(() => { - Organizations.deleteOrganizationViaApi(testData.organization.id); + Organizations.deleteOrganizationViaApi(organization.id); Integrations.deleteIntegrationViaApi(testData.integration.id); + Orders.deleteOrderViaApi(order.id); Users.deleteViaApi(testData.user.userId); }); }); it( 'C378884 "EDIFACT orders export" option is added to job type filter in "Export manager" app (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C378884'] }, () => { // Check default page view ExportManagerSearchPane.checkDefaultView(); diff --git a/cypress/e2e/export-manager/export-orders-in-edifact-format/sorting-by-export-method-does-not-reset-search-results.cy.js b/cypress/e2e/export-manager/export-orders-in-edifact-format/sorting-by-export-method-does-not-reset-search-results.cy.js index 22ee49bfb5..f5b5262bb9 100644 --- a/cypress/e2e/export-manager/export-orders-in-edifact-format/sorting-by-export-method-does-not-reset-search-results.cy.js +++ b/cypress/e2e/export-manager/export-orders-in-edifact-format/sorting-by-export-method-does-not-reset-search-results.cy.js @@ -6,6 +6,7 @@ import OrderLines from '../../../support/fragments/orders/orderLines'; import Orders from '../../../support/fragments/orders/orders'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import NewLocation from '../../../support/fragments/settings/tenant/locations/newLocation'; import ServicePoints from '../../../support/fragments/settings/tenant/servicePoints/servicePoints'; import TopMenu from '../../../support/fragments/topMenu'; @@ -91,7 +92,7 @@ describe('Export Manager', () => { orderForFirstOrganization.orderType = 'One-time'; cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.addIntegration(); @@ -112,7 +113,7 @@ describe('Export Manager', () => { orderForSecondOrganization.orderType = 'One-time'; cy.visit(TopMenu.organizationsPath); - Organizations.searchByParameters('Name', secondOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', secondOrganization.name); Organizations.checkSearchResults(secondOrganization); Organizations.selectOrganization(secondOrganization.name); Organizations.addIntegration(); @@ -173,7 +174,7 @@ describe('Export Manager', () => { it( 'C377045 Sorting by export method does not reset search results (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C377045'] }, () => { ExportManagerSearchPane.selectOrganizationsSearch(); ExportManagerSearchPane.searchBySuccessful(); diff --git a/cypress/e2e/export-manager/job-for-order-with-acquisition-unit.cy.js b/cypress/e2e/export-manager/job-for-order-with-acquisition-unit.cy.js index 0cc4a89b37..74dd87ef24 100644 --- a/cypress/e2e/export-manager/job-for-order-with-acquisition-unit.cy.js +++ b/cypress/e2e/export-manager/job-for-order-with-acquisition-unit.cy.js @@ -1,21 +1,31 @@ -import permissions from '../../support/dictionary/permissions'; +import moment from 'moment'; +import { + ACQUISITION_METHOD_NAMES_IN_PROFILE, + LOCATION_NAMES, + ORDER_STATUSES, +} from '../../support/constants'; +import Permissions from '../../support/dictionary/permissions'; import ExportManagerSearchPane from '../../support/fragments/exportManager/exportManagerSearchPane'; -import NewOrder from '../../support/fragments/orders/newOrder'; -import OrderLines from '../../support/fragments/orders/orderLines'; -import Orders from '../../support/fragments/orders/orders'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; +import { BasicOrderLine, NewOrder, OrderLines, Orders } from '../../support/fragments/orders'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import Integrations from '../../support/fragments/organizations/integrations/integrations'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; -import NewLocation from '../../support/fragments/settings/tenant/locations/newLocation'; -import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints'; -import SettingsMenu from '../../support/fragments/settingsMenu'; +import MaterialTypes from '../../support/fragments/settings/inventory/materialTypes'; import TopMenu from '../../support/fragments/topMenu'; +import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format', () => { describe('Orders Export to a Vendor', () => { - const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit }; + const now = moment(); + const acquisitionUnit = { + ...AcquisitionUnits.defaultAcquisitionUnit, + protectDelete: true, + protectUpdate: true, + protectCreate: true, + protectRead: true, + }; const order = { ...NewOrder.defaultOneTimeOrder, approved: true, @@ -37,88 +47,129 @@ describe('Export Manager', () => { }, ], }; - const integrationName = `FirstIntegrationName${getRandomPostfix()}`; - const integartionDescription = 'Test Integation descripton1'; - const vendorEDICodeFor1Integration = getRandomPostfix(); - const libraryEDICodeFor1Integration = getRandomPostfix(); - let user; - let location; - let servicePointId; - let orderNumber; + const testData = { + user: {}, + }; before(() => { - cy.getAdminToken(); + cy.getAdminToken().then(() => { + Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { + organization.id = organizationsResponse; + order.vendor = organizationsResponse; + + cy.getAcquisitionMethodsApi({ + query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE}"`, + }).then((acqMethod) => { + cy.getLocations({ query: `name="${LOCATION_NAMES.MAIN_LIBRARY_UI}"` }).then( + (locationResp) => { + MaterialTypes.createMaterialTypeViaApi( + MaterialTypes.getDefaultMaterialType(), + ).then((mtypes) => { + const orderLine = { + ...BasicOrderLine.defaultOrderLine, + cost: { + listUnitPrice: 20.0, + currency: 'USD', + discountType: 'percentage', + quantityPhysical: 1, + poLineEstimatedPrice: 20.0, + }, + locations: [ + { locationId: locationResp.id, quantity: 1, quantityPhysical: 1 }, + ], + acquisitionMethod: acqMethod.body.acquisitionMethods[0].id, + physical: { + createInventory: 'Instance, Holding, Item', + materialType: mtypes.body.id, + volumes: [], + }, + automaticExport: true, + vendorDetail: { vendorAccount: null }, + }; + cy.createOrderApi(order).then((orderResponse) => { + testData.orderId = orderResponse.body.id; + orderLine.purchaseOrderId = orderResponse.body.id; + + OrderLines.createOrderLineViaApi(orderLine); + Orders.updateOrderViaApi({ + ...orderResponse.body, + workflowStatus: ORDER_STATUSES.OPEN, + }).then(() => { + testData.integration = Integrations.getDefaultIntegration({ + vendorId: organization.id, + acqMethodId: acqMethod.body.acquisitionMethods[0].id, + accountNoList: [organization.accounts[0].accountNo], + scheduleTime: now.utc().format('HH:mm:ss'), + isDefaultConfig: true, + }); + testData.integrationName = + testData.integration.exportTypeSpecificParameters.vendorEdiOrdersExportConfig.configName; + Integrations.createIntegrationViaApi(testData.integration); + }); + }); + }); + }, + ); + }); + }); + }); + cy.createTempUser([ - permissions.exportManagerAll.gui, - permissions.uiOrdersView.gui, - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, - permissions.uiOrganizationsViewEdit.gui, + Permissions.exportManagerAll.gui, + Permissions.uiOrdersView.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, + Permissions.uiOrganizationsViewEdit.gui, ]).then((userProperties) => { - user = userProperties; - cy.loginAsAdmin({ - path: SettingsMenu.acquisitionUnitsPath, - waiter: AcquisitionUnits.waitLoading, + testData.user = userProperties; + + AcquisitionUnits.createAcquisitionUnitViaApi(acquisitionUnit).then((acqUnitResponse) => { + acquisitionUnit.id = acqUnitResponse.id; + + AcquisitionUnits.assignUserViaApi(userProperties.userId, acquisitionUnit.id).then( + (id) => { + testData.membershipUserId = id; + }, + ); + cy.getAdminUserDetails().then((adminUser) => { + AcquisitionUnits.assignUserViaApi(adminUser.id, acquisitionUnit.id).then((id) => { + testData.membershipAdminId = id; + }); + }); }); - AcquisitionUnits.newAcquisitionUnit(); - AcquisitionUnits.fillInAUInfo(defaultAcquisitionUnit.name); - AcquisitionUnits.assignAdmin(); - AcquisitionUnits.assignUser(user.username); - }); - ServicePoints.getViaApi().then((servicePoint) => { - servicePointId = servicePoint[0].id; - NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => { - location = res; + + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.exportManagerOrganizationsPath, + waiter: ExportManagerSearchPane.waitLoading, }); }); - Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { - organization.id = organizationsResponse; - order.vendor = organizationsResponse; - }); - cy.visit(TopMenu.organizationsPath); - Organizations.searchByParameters('Name', organization.name); - Organizations.checkSearchResults(organization); - Organizations.selectOrganization(organization.name); - Organizations.addIntegration(); - Organizations.fillIntegrationInformation( - integrationName, - integartionDescription, - vendorEDICodeFor1Integration, - libraryEDICodeFor1Integration, - organization.accounts[0].accountNo, - 'Purchase', - ); + }); - cy.createOrderApi(order).then((response) => { - orderNumber = response.body.poNumber; - cy.visit(TopMenu.ordersPath); - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.createPOLineViaActions(); - OrderLines.selectRandomInstanceInTitleLookUP('*', 20); - OrderLines.fillInPOLineInfoForExportWithLocation('Purchase', location.name); - OrderLines.backToEditingOrder(); - Orders.openOrder(); + after(() => { + cy.getAdminToken().then(() => { + Organizations.deleteOrganizationViaApi(organization.id); + Integrations.deleteIntegrationViaApi(testData.integration.id); + Orders.deleteOrderViaApi(testData.orderId); + AcquisitionUnits.unAssignUserViaApi(testData.membershipUserId); + AcquisitionUnits.unAssignUserViaApi(testData.membershipAdminId); + Users.deleteViaApi(testData.user.userId); + AcquisitionUnits.deleteAcquisitionUnitViaApi(acquisitionUnit.id); }); }); it( 'C380640 Schedule export job for order with Acquisition unit (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C380640'] }, () => { - cy.login(user.username, user.password, { - path: TopMenu.exportManagerOrganizationsPath, - waiter: ExportManagerSearchPane.waitLoading, - }); ExportManagerSearchPane.selectOrganizationsSearch(); - ExportManagerSearchPane.selectExportMethod(integrationName); - ExportManagerSearchPane.selectJobByIntegrationInList(integrationName); + ExportManagerSearchPane.selectExportMethod(testData.integrationName); + ExportManagerSearchPane.selectJobByIntegrationInList(testData.integrationName); ExportManagerSearchPane.rerunJob(); - cy.reload(); + cy.wait(7000); ExportManagerSearchPane.verifyResult('Successful'); ExportManagerSearchPane.selectJob('Successful'); ExportManagerSearchPane.verifyJobStatusInDetailView('Successful'); ExportManagerSearchPane.verifyJobOrganizationInDetailView(organization); - ExportManagerSearchPane.verifyJobExportMethodInDetailView(integrationName); + ExportManagerSearchPane.verifyJobExportMethodInDetailView(testData.integrationName); }, ); }); diff --git a/cypress/e2e/export-manager/orders-export-to-a-vendor/create-default-integration-for-sftp.cy.js b/cypress/e2e/export-manager/orders-export-to-a-vendor/create-default-integration-for-sftp.cy.js index cb284e255b..42f1f76346 100644 --- a/cypress/e2e/export-manager/orders-export-to-a-vendor/create-default-integration-for-sftp.cy.js +++ b/cypress/e2e/export-manager/orders-export-to-a-vendor/create-default-integration-for-sftp.cy.js @@ -99,7 +99,7 @@ describe('Export Manager', () => { it( 'C402381 Creating default integration for "SFTP" option (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402381'] }, () => { // Click "Organizations", Select created export method in "Export method" accordion ExportManagerSearchPane.selectOrganizationsSearch(); diff --git a/cypress/e2e/export-manager/orders-export-to-a-vendor/days-for-weekly-scheduling-are-not-displaying-in-new-scheduling-settings.cy.js b/cypress/e2e/export-manager/orders-export-to-a-vendor/days-for-weekly-scheduling-are-not-displaying-in-new-scheduling-settings.cy.js index 35674896a2..bb2d6eab9e 100644 --- a/cypress/e2e/export-manager/orders-export-to-a-vendor/days-for-weekly-scheduling-are-not-displaying-in-new-scheduling-settings.cy.js +++ b/cypress/e2e/export-manager/orders-export-to-a-vendor/days-for-weekly-scheduling-are-not-displaying-in-new-scheduling-settings.cy.js @@ -10,6 +10,7 @@ import TopMenu from '../../../support/fragments/topMenu'; import Users from '../../../support/fragments/users/users'; import getRandomPostfix from '../../../support/utils/stringTools'; import { ACQUISITION_METHOD_NAMES_IN_PROFILE } from '../../../support/constants'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format: Orders Export to a Vendor', () => { @@ -110,9 +111,9 @@ describe('Export Manager', () => { it( 'C359200 Days previously chosen for weekly scheduling are NOT displaying in new current scheduling settings (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C359200'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.selectIntegration(integrationName); diff --git a/cypress/e2e/export-manager/orders-export-to-a-vendor/downloading-the-exact-edi-file.cy.js b/cypress/e2e/export-manager/orders-export-to-a-vendor/downloading-the-exact-edi-file.cy.js index ecdeda80c3..3fa15d60fc 100644 --- a/cypress/e2e/export-manager/orders-export-to-a-vendor/downloading-the-exact-edi-file.cy.js +++ b/cypress/e2e/export-manager/orders-export-to-a-vendor/downloading-the-exact-edi-file.cy.js @@ -5,6 +5,7 @@ import OrderLines from '../../../support/fragments/orders/orderLines'; import Orders from '../../../support/fragments/orders/orders'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import NewLocation from '../../../support/fragments/settings/tenant/locations/newLocation'; import ServicePoints from '../../../support/fragments/settings/tenant/servicePoints/servicePoints'; import TopMenu from '../../../support/fragments/topMenu'; @@ -77,7 +78,7 @@ describe('Export Manager', () => { order.vendor = organizationsResponse; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -163,7 +164,7 @@ describe('Export Manager', () => { it( 'C365123 Downloading the exact ".edi" file that was exported for a given export job with "Successful" status (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C365123'] }, () => { cy.visit(TopMenu.exportManagerOrganizationsPath); ExportManagerSearchPane.selectOrganizationsSearch(); diff --git a/cypress/e2e/export-manager/orders-export-to-a-vendor/set-daily-scheduling-for-new-integration.cy.js b/cypress/e2e/export-manager/orders-export-to-a-vendor/set-daily-scheduling-for-new-integration.cy.js index 5625edcfdb..4fb3a27825 100644 --- a/cypress/e2e/export-manager/orders-export-to-a-vendor/set-daily-scheduling-for-new-integration.cy.js +++ b/cypress/e2e/export-manager/orders-export-to-a-vendor/set-daily-scheduling-for-new-integration.cy.js @@ -13,6 +13,7 @@ import Users from '../../../support/fragments/users/users'; import OrganizationDetails from '../../../support/fragments/organizations/organizationDetails'; import IntegrationViewForm from '../../../support/fragments/organizations/integrations/integrationViewForm'; import IntegrationEditForm from '../../../support/fragments/organizations/integrations/integrationEditForm'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format: Orders Export to a Vendor', () => { @@ -73,10 +74,10 @@ describe('Export Manager', () => { it( 'C377048 Setting "daily" scheduling on 12 PM for new export Integration (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C377048'] }, () => { // Click on the "Name" link for Organization - Organizations.searchByParameters('Name', testData.organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organization.name); Organizations.checkSearchResults(testData.organization); Organizations.selectOrganization(testData.organization.name); diff --git a/cypress/e2e/export-manager/orders-export-to-a-vendor/trying-to-open-an-order-with-2-pol.cy.js b/cypress/e2e/export-manager/orders-export-to-a-vendor/trying-to-open-an-order-with-2-pol.cy.js index b94299c873..7df06844bf 100644 --- a/cypress/e2e/export-manager/orders-export-to-a-vendor/trying-to-open-an-order-with-2-pol.cy.js +++ b/cypress/e2e/export-manager/orders-export-to-a-vendor/trying-to-open-an-order-with-2-pol.cy.js @@ -11,6 +11,7 @@ import Users from '../../../support/fragments/users/users'; import getRandomPostfix from '../../../support/utils/stringTools'; import OrderLinesLimit from '../../../support/fragments/settings/orders/orderLinesLimit'; import TopMenuNavigation from '../../../support/fragments/topMenuNavigation'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Export Manager', () => { describe('Export Orders in EDIFACT format: Orders Export to a Vendor', () => { @@ -77,7 +78,7 @@ describe('Export Manager', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -161,7 +162,7 @@ describe('Export Manager', () => { it( 'C350410 Check if a User is alerted trying to open an Order with 2 POL, having more than 1 unique accounts for export (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350410', 'shiftLeft'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/finance/check-available-balance.cy.js b/cypress/e2e/finance/check-available-balance.cy.js index 8d3536be9f..c4d8a05741 100644 --- a/cypress/e2e/finance/check-available-balance.cy.js +++ b/cypress/e2e/finance/check-available-balance.cy.js @@ -103,7 +103,7 @@ describe('Finance', () => { it( 'C377030 "Available balance" is displayed as a negative number when running a deficit (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C377030'] }, () => { FinanceHelp.searchByName(defaultFiscalYear.name); FiscalYears.selectFisacalYear(defaultFiscalYear.name); diff --git a/cypress/e2e/finance/error-message-appears-when-approve-invoice-from-previous-budget.cy.js b/cypress/e2e/finance/error-message-appears-when-approve-invoice-from-previous-budget.cy.js index 499eb41cc3..e10298c428 100644 --- a/cypress/e2e/finance/error-message-appears-when-approve-invoice-from-previous-budget.cy.js +++ b/cypress/e2e/finance/error-message-appears-when-approve-invoice-from-previous-budget.cy.js @@ -162,7 +162,7 @@ describe('Finance', () => { it( 'C375959 Meaningful error message appears when trying to approve invoice with related fund having only previous budget (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C375959'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/finance/fiscalYears/calulate-available-balance-for-negative-amount.cy.js b/cypress/e2e/finance/fiscalYears/calulate-available-balance-for-negative-amount.cy.js index 1698476b14..ffff2a9c90 100644 --- a/cypress/e2e/finance/fiscalYears/calulate-available-balance-for-negative-amount.cy.js +++ b/cypress/e2e/finance/fiscalYears/calulate-available-balance-for-negative-amount.cy.js @@ -122,7 +122,7 @@ describe('Finance', () => { it( 'C375283 Available balance at the fiscal year level is calculated correctly if one of the related fund has negative amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375283'] }, () => { // Click on "Fiscal year #1" link on "Fiscal year" pane FinanceHelper.searchByName(fiscalYear.name); diff --git a/cypress/e2e/finance/fiscalYears/displaying-settings-for-common-rollover.cy.js b/cypress/e2e/finance/fiscalYears/displaying-settings-for-common-rollover.cy.js index a7cc1b7769..baeedc8151 100644 --- a/cypress/e2e/finance/fiscalYears/displaying-settings-for-common-rollover.cy.js +++ b/cypress/e2e/finance/fiscalYears/displaying-settings-for-common-rollover.cy.js @@ -160,7 +160,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376605 Displaying FY rollover settings for common rollover (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C376605'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/displaying-settings-for-test-rollover.cy.js b/cypress/e2e/finance/fiscalYears/displaying-settings-for-test-rollover.cy.js index c94a7a673b..064ea2b1fd 100644 --- a/cypress/e2e/finance/fiscalYears/displaying-settings-for-test-rollover.cy.js +++ b/cypress/e2e/finance/fiscalYears/displaying-settings-for-test-rollover.cy.js @@ -160,7 +160,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376978 Displaying FY rollover settings for test rollover (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C376978'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/budget-summary-and-encumbrances-updated.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/budget-summary-and-encumbrances-updated.cy.js index 68b94f9dfd..3d2d095d7b 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/budget-summary-and-encumbrances-updated.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/budget-summary-and-encumbrances-updated.cy.js @@ -235,7 +235,7 @@ describe('Fiscal Year Rollover', () => { it( 'C357580 Budget summary and Encumbrances updated correctly when editing POL with related invoice after rollover of fiscal year (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1', 'C357580'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C357580'] }, () => { Orders.searchByParameter('PO number', secondOrderNumber); Orders.selectFromResultsList(secondOrderNumber); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/consecutive-rollovers-within-three-fiscal-years.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/consecutive-rollovers-within-three-fiscal-years.cy.js index 0e57b95e77..ac9b2d762b 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/consecutive-rollovers-within-three-fiscal-years.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/consecutive-rollovers-within-three-fiscal-years.cy.js @@ -168,7 +168,7 @@ describe('Fiscal Year Rollover', () => { it( 'C407710 Consecutive rollovers within three fiscal years (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1', 'C407710'] }, + { tags: ['extendedPath', 'thunderjet', 'C407710'] }, () => { FinanceHelp.searchByName(defaultFund.name); Funds.selectFund(defaultFund.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/encumbrances-are-rolled-over.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/encumbrances-are-rolled-over.cy.js index d9f0743a37..9b6023688c 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/encumbrances-are-rolled-over.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/encumbrances-are-rolled-over.cy.js @@ -204,7 +204,7 @@ describe('Fiscal Year Rollover', () => { it( 'C375267 Encumbrances are rolled over correctly when order fund distribution was changed and related paid invoice exists (based on Remaining) (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375267'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/execute-rollover-not-active-allocation.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/execute-rollover-not-active-allocation.cy.js index 587216da35..d8f9418f8b 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/execute-rollover-not-active-allocation.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/execute-rollover-not-active-allocation.cy.js @@ -203,7 +203,7 @@ describe('Finance: Fiscal Year Rollover', () => { it( 'C376609 Execute rollover when "Allocation" option is NOT active and "None" option is selected in "Rollover budget value" dropdown (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C376609'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/make-more-than-one-preview-for-one-ledger.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/make-more-than-one-preview-for-one-ledger.cy.js index a508de9ec5..5b88eeb371 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/make-more-than-one-preview-for-one-ledger.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/make-more-than-one-preview-for-one-ledger.cy.js @@ -140,7 +140,7 @@ describe('Fiscal Year Rollover', () => { it( 'C359604 Make more than one preview for one ledger and same fiscal year with "Test rollover", check test rollover results (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C359604'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/planned-budget-status-is-updating-to-active-during-rollover.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/planned-budget-status-is-updating-to-active-during-rollover.cy.js index 84d58ea5f2..029298ff3f 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/planned-budget-status-is-updating-to-active-during-rollover.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/planned-budget-status-is-updating-to-active-during-rollover.cy.js @@ -251,8 +251,8 @@ describe('Fiscal Year Rollover', () => { }); it( - 'C359186: "Planned" budget status is updating to "Active" during FY rollover (based on "Expended") (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1', 'C359186'] }, + 'C359186 "Planned" budget status is updating to "Active" during FY rollover (based on "Expended") (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C359186'] }, () => { FinanceHelp.searchByName(testData.ledger.name); Ledgers.selectLedger(testData.ledger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-based-on-remaining-for-paid-invoice.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-based-on-remaining-for-paid-invoice.cy.js index 5c1ad73454..318590a322 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-based-on-remaining-for-paid-invoice.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-based-on-remaining-for-paid-invoice.cy.js @@ -127,7 +127,7 @@ describe('Finance', () => { it( 'C400643 Rollover based on "Remaining" when order has related paid invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C400643'] }, () => { // Click on Ledger name link from preconditions FinanceHelper.searchByName(ledger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-active-allocation.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-active-allocation.cy.js index eb4d60661b..c6d874afe2 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-active-allocation.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-active-allocation.cy.js @@ -204,7 +204,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376607 Rollover cash balance as transfer ("Allocation" option is active) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C376607'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-not-active-allocation.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-not-active-allocation.cy.js index 7608a333c4..06fafb199f 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-not-active-allocation.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-cash-balance-as-transfer-not-active-allocation.cy.js @@ -204,7 +204,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376610 Rollover cash balance as transfer ("Allocation" option is NOT active) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C376610'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-for-same-fy-can-be-started-only-once.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-for-same-fy-can-be-started-only-once.cy.js index ebe12ed75e..5a39e4690b 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-for-same-fy-can-be-started-only-once.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-for-same-fy-can-be-started-only-once.cy.js @@ -71,7 +71,7 @@ describe('Finance', () => { it( 'C360956 Rollover for one ledger and same fiscal year can be started just once (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C360956'] }, () => { // Click on Ledger name link from preconditions FinanceHelper.searchByName(ledger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-when-po-line-contains-two-fund-distributions.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-when-po-line-contains-two-fund-distributions.cy.js index 5dc2fc3979..ff805bd4d2 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-when-po-line-contains-two-fund-distributions.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/rollover-when-po-line-contains-two-fund-distributions.cy.js @@ -152,7 +152,7 @@ describe('Finance', () => { it( 'C397990 Rollover when PO line contains two fund distributions related to different ledgers and same fiscal year (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C397990'] }, () => { // Click on Ledger name link from preconditions FinanceHelper.searchByName(ledgers.first.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-is-blocked.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-is-blocked.cy.js index 719122ea42..859c7ac45e 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-is-blocked.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-is-blocked.cy.js @@ -175,7 +175,7 @@ describe('Fiscal Year Rollover', () => { it( 'C402327 Test rollover is blocked once common rollover has been done for given ledger and FY (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C402327'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedgerAfterRollover(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-when-pol-has-2-funds.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-when-pol-has-2-funds.cy.js index 1996ded7fe..08973cd0c6 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-when-pol-has-2-funds.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollover-when-pol-has-2-funds.cy.js @@ -195,7 +195,7 @@ describe('Fiscal Year Rollover', () => { it( 'C398023 Test rollover when PO line contains two fund distributions related to different ledgers and same fiscal year (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C398023'] }, () => { FinanceHelp.searchByName(firstLedger.name); Ledgers.selectLedger(firstLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollovers-within-3-fy-when-polcontains-2-funds.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollovers-within-3-fy-when-polcontains-2-funds.cy.js index 30514941b3..b0c0d43b05 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollovers-within-3-fy-when-polcontains-2-funds.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/test-rollovers-within-3-fy-when-polcontains-2-funds.cy.js @@ -281,7 +281,7 @@ describe('Fiscal Year Rollover', () => { it( 'C399059 Test rollovers within 3 FYs when PO line contains two fund distributions related to different ledgers and same fiscal year (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C399059'] }, () => { FinanceHelp.searchByName(firstLedger.name); Ledgers.selectLedger(firstLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/transactions-displaying-correctly-after-fund-name-was-changed.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/transactions-displaying-correctly-after-fund-name-was-changed.cy.js index 1af7d08d8f..5f3c64268f 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYearRollover/transactions-displaying-correctly-after-fund-name-was-changed.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYearRollover/transactions-displaying-correctly-after-fund-name-was-changed.cy.js @@ -165,7 +165,7 @@ describe('Fiscal Year Rollover', () => { it( 'C357565 Transactions are displaying correctly after rollover when fund name was changed in POL after opening order (Thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1', 'C357565'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C357565'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYears-create.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYears-create.cy.js index d7d50d340b..eb57fba65f 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYears-create.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYears-create.cy.js @@ -14,7 +14,7 @@ describe('Fiscal Year', () => { it( 'C4051 Create a new fiscal year (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1', 'shiftLeft'] }, + { tags: ['smoke', 'thunderjet', 'C4051', 'shiftLeft'] }, () => { const defaultFiscalYear = { ...NewFiscalYear.defaultFiscalYear }; FiscalYears.createDefaultFiscalYear(defaultFiscalYear); diff --git a/cypress/e2e/finance/fiscalYears/fiscalYears-viewDetails.cy.js b/cypress/e2e/finance/fiscalYears/fiscalYears-viewDetails.cy.js index b37248da40..538061130a 100644 --- a/cypress/e2e/finance/fiscalYears/fiscalYears-viewDetails.cy.js +++ b/cypress/e2e/finance/fiscalYears/fiscalYears-viewDetails.cy.js @@ -19,7 +19,7 @@ describe('Fiscal Year', () => { it( 'C3452 View fiscal year details (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C3452'] }, () => { FiscalYears.fiscalYearsDisplay(); FinanceHelp.searchByName(defaultFiscalYear.name); diff --git a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation-not-active-option.cy.js b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation-not-active-option.cy.js index 39135355c9..989b0b5279 100644 --- a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation-not-active-option.cy.js +++ b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation-not-active-option.cy.js @@ -204,7 +204,7 @@ describe('Finance: Fiscal Year Rollover', () => { it( 'C376608 Rollover cash balance as allocation ("Allocation" option is NOT active) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C376608'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation.cy.js b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation.cy.js index 8dc1b84100..932bb7f65c 100644 --- a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation.cy.js +++ b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-allocation.cy.js @@ -203,7 +203,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376601 Rollover cash balance as allocation ("Allocation" option is active) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C376601'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-none-allocation.cy.js b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-none-allocation.cy.js index 5bcfc0a9d5..5077c7d27d 100644 --- a/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-none-allocation.cy.js +++ b/cypress/e2e/finance/fiscalYears/rollover-cash-balance-as-none-allocation.cy.js @@ -203,7 +203,7 @@ describe('Fiscal Year Rollover', () => { it( 'C376611 Rollover allocation with "None" option selected in "Rollover budget value" dropdown (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C376611'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/search-and-filter.cy.js b/cypress/e2e/finance/fiscalYears/search-and-filter.cy.js index 28810f3e9c..0a20108ec4 100644 --- a/cypress/e2e/finance/fiscalYears/search-and-filter.cy.js +++ b/cypress/e2e/finance/fiscalYears/search-and-filter.cy.js @@ -27,7 +27,7 @@ describe('Fiscal Year', () => { it( 'C4058 Test the search and filter options for fiscal years (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C4058'] }, () => { // Search Fiscal Year FinanceHelp.searchByAll(defaultFiscalYear.name); diff --git a/cypress/e2e/finance/fiscalYears/test-and-common-rollover-are-executed-successfully.cy.js b/cypress/e2e/finance/fiscalYears/test-and-common-rollover-are-executed-successfully.cy.js index 9c1ef81e4f..c2f9dbecb0 100644 --- a/cypress/e2e/finance/fiscalYears/test-and-common-rollover-are-executed-successfully.cy.js +++ b/cypress/e2e/finance/fiscalYears/test-and-common-rollover-are-executed-successfully.cy.js @@ -135,7 +135,7 @@ describe('Fiscal Year Rollover', () => { it( 'C366540 Test and common rollover are executed successfully when "Planned budget" was created by user (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C366540'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/fiscalYears/utc-is-displayed-when-create-or-view-fiscal-year.cy.js b/cypress/e2e/finance/fiscalYears/utc-is-displayed-when-create-or-view-fiscal-year.cy.js index 0d4d144790..dd9b8f5950 100644 --- a/cypress/e2e/finance/fiscalYears/utc-is-displayed-when-create-or-view-fiscal-year.cy.js +++ b/cypress/e2e/finance/fiscalYears/utc-is-displayed-when-create-or-view-fiscal-year.cy.js @@ -29,7 +29,7 @@ describe('Fiscal Year', () => { it( 'C380514 "UTC" is displayed in "Period begin date" and "Period end date" fields when create or view fiscal year (Orchid +) (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C380514'] }, () => { FiscalYears.createDefaultFiscalYear(defaultFiscalYear); FiscalYears.closeThirdPane(); diff --git a/cypress/e2e/finance/funds/add-allocation-to-budget.cy.js b/cypress/e2e/finance/funds/add-allocation-to-budget.cy.js index ebca349f02..b8e4a0efb5 100644 --- a/cypress/e2e/finance/funds/add-allocation-to-budget.cy.js +++ b/cypress/e2e/finance/funds/add-allocation-to-budget.cy.js @@ -65,7 +65,7 @@ describe('Transactions', () => { it( 'C6649 Add allocation to a budget by creating an allocation transaction (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6649'] }, () => { FinanceHelp.searchByName(defaultFund.name); Funds.selectFund(defaultFund.name); diff --git a/cypress/e2e/finance/funds/add-donor-information-to-fund.cy.js b/cypress/e2e/finance/funds/add-donor-information-to-fund.cy.js index 26708ef0f3..0a7d671307 100644 --- a/cypress/e2e/finance/funds/add-donor-information-to-fund.cy.js +++ b/cypress/e2e/finance/funds/add-donor-information-to-fund.cy.js @@ -61,7 +61,7 @@ describe('Finance', () => { it( 'C422161 Add donor information to a new Fund (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C422161'] }, () => { // On "Fund" page of "Finance" app click on "New" button Funds.clickCreateNewFundButton(); @@ -131,7 +131,7 @@ describe('Finance', () => { it( 'C422162 Add donor information to an existing fund (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C422162'] }, () => { // Open Fund from Preconditions Funds.searchByName(testData.fund.name); @@ -181,7 +181,7 @@ describe('Finance', () => { it( 'C422194 Adding donor information to existing fund with permission restrictions (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C422194'] }, () => { // Open Fund from Preconditions Funds.searchByName(testData.fund.name); diff --git a/cypress/e2e/finance/funds/add-expense-class-to-budget.cy.js b/cypress/e2e/finance/funds/add-expense-class-to-budget.cy.js index fda95c3bab..28ff1a193f 100644 --- a/cypress/e2e/finance/funds/add-expense-class-to-budget.cy.js +++ b/cypress/e2e/finance/funds/add-expense-class-to-budget.cy.js @@ -62,7 +62,7 @@ describe('Funds', () => { it( 'C15858 Add expense class to budget (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C15858'] }, () => { cy.loginAsAdmin({ path: TopMenu.fundPath, waiter: Funds.waitLoading }); FinanceHelp.searchByName(defaultFund.name); diff --git a/cypress/e2e/finance/funds/add-transfer-to-budget.cy.js b/cypress/e2e/finance/funds/add-transfer-to-budget.cy.js index d37cbcde3a..5bd6f1f065 100644 --- a/cypress/e2e/finance/funds/add-transfer-to-budget.cy.js +++ b/cypress/e2e/finance/funds/add-transfer-to-budget.cy.js @@ -71,7 +71,7 @@ describe('Transactions', () => { it( 'C6650 Add transfer to a budget by creating a transfer transaction (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6650'] }, () => { FinanceHelp.searchByName(firstFund.name); Funds.selectFund(firstFund.name); diff --git a/cypress/e2e/finance/funds/available-balance-can-be-negative-number.cy.js b/cypress/e2e/finance/funds/available-balance-can-be-negative-number.cy.js index a4d02c7a49..ed838413b1 100644 --- a/cypress/e2e/finance/funds/available-balance-can-be-negative-number.cy.js +++ b/cypress/e2e/finance/funds/available-balance-can-be-negative-number.cy.js @@ -77,7 +77,7 @@ describe('Finance: Funds', () => { it( 'C374165 Available balance can be a negative number when ledger "Enforce all budget encumbrance limits" option is NOT active (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374165'] }, () => { Orders.createApprovedOrderForRollover(firstOrder).then((firstOrderResponse) => { firstOrder.id = firstOrderResponse.id; diff --git a/cypress/e2e/finance/funds/available-balance-can-not-be-made-negative-number-by-PO.cy.js b/cypress/e2e/finance/funds/available-balance-can-not-be-made-negative-number-by-PO.cy.js index 2de69b9798..c1e2a3dbf4 100644 --- a/cypress/e2e/finance/funds/available-balance-can-not-be-made-negative-number-by-PO.cy.js +++ b/cypress/e2e/finance/funds/available-balance-can-not-be-made-negative-number-by-PO.cy.js @@ -88,7 +88,7 @@ describe('Finance: Funds', () => { it( 'C374188 Available balance can NOT be made a negative number by PO when ledger "Enforce all budget encumbrance limits" option is active (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374188'] }, () => { Orders.createApprovedOrderForRollover(firstOrder, true).then((firstOrderResponse) => { firstOrder.id = firstOrderResponse.id; diff --git a/cypress/e2e/finance/funds/create-encumbrance-from-order.cy.js b/cypress/e2e/finance/funds/create-encumbrance-from-order.cy.js index a1ae6e5f0c..4121fa8fa0 100644 --- a/cypress/e2e/finance/funds/create-encumbrance-from-order.cy.js +++ b/cypress/e2e/finance/funds/create-encumbrance-from-order.cy.js @@ -76,7 +76,7 @@ describe('Transactions', () => { it( 'C6705 Create encumbrance from Order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6705'] }, () => { Orders.createPOLineViaActions(); OrderLines.fillInPOLineInfoWithFund(defaultFund); diff --git a/cypress/e2e/finance/funds/decrease-allocation-result-in-negative-amount.cy.js b/cypress/e2e/finance/funds/decrease-allocation-result-in-negative-amount.cy.js deleted file mode 100644 index 9616898bc4..0000000000 --- a/cypress/e2e/finance/funds/decrease-allocation-result-in-negative-amount.cy.js +++ /dev/null @@ -1,95 +0,0 @@ -import { Permissions } from '../../../support/dictionary'; -import { Budgets, Funds } from '../../../support/fragments/finance'; -import TopMenu from '../../../support/fragments/topMenu'; -import Users from '../../../support/fragments/users/users'; -import FundDetails from '../../../support/fragments/finance/funds/fundDetails'; - -describe('Finance', () => { - describe('Funds', () => { - const testData = { - user: {}, - }; - - before('Create test data', () => { - cy.getAdminToken().then(() => { - const { fiscalYear, fund, budget } = Budgets.createBudgetWithFundLedgerAndFYViaApi({ - budget: { allocated: 0 }, - }); - - testData.fiscalYear = fiscalYear; - testData.fund = fund; - testData.budget = budget; - }); - - cy.createTempUser([ - Permissions.uiFinanceCreateAllocations.gui, - Permissions.uiFinanceViewFundAndBudget.gui, - Permissions.uiFinanceViewEditFundAndBudget.gui, - ]).then((userProperties) => { - testData.user = userProperties; - - cy.login(testData.user.username, testData.user.password, { - path: TopMenu.fundPath, - waiter: Funds.waitLoading, - }); - }); - }); - - after('Delete test data', () => { - cy.getAdminToken().then(() => { - Budgets.deleteBudgetWithFundLedgerAndFYViaApi(testData.budget); - Users.deleteViaApi(testData.user.userId); - }); - }); - - it( - 'C414970 Decrease allocation resulting in a negative available budget amount (thunderjet) (TaaS)', - { tags: ['obsolete', 'thunderjet', 'eurekaPhase1'] }, - () => { - // Open Fund from Preconditions - Funds.searchByName(testData.fund.name); - Funds.selectFund(testData.fund.name); - FundDetails.checkFundDetails({ - currentBudget: { name: testData.budget.name, allocated: '$0.00' }, - }); - - // Click on the record in "Current budget" accordion - const BudgetDetails = FundDetails.openCurrentBudgetDetails(); - BudgetDetails.checkBudgetDetails({ - summary: [{ key: 'Total allocated', value: '$0.00' }], - }); - - // Click "Actions" button, Select "Decrease allocation" option - const AddTransferModal = BudgetDetails.clickDecreaseAllocationButton(); - - // Fill the following fields: "Amount" - AddTransferModal.fillTransferDetails({ amount: '10' }); - - // Click "Confirm" button - AddTransferModal.clickConfirmButton({ - confirmNegative: { confirm: true }, - transferCreated: false, - ammountAllocated: true, - }); - BudgetDetails.checkBudgetDetails({ - summary: [ - { key: 'Decrease in allocation', value: '$10.00' }, - { key: 'Total allocated', value: '($10.00)' }, - { key: 'Total funding', value: '($10.00)' }, - ], - balance: { cash: '($10.00)', available: '($10.00)' }, - }); - - // Close "Budget details" page by clicking "X" button - BudgetDetails.closeBudgetDetails(); - FundDetails.checkFundDetails({ - currentBudget: { - name: testData.budget.name, - allocated: '($10.00)', - available: '($10.00)', - }, - }); - }, - ); - }); -}); diff --git a/cypress/e2e/finance/funds/filter-status-field-in-fund.cy.js b/cypress/e2e/finance/funds/filter-status-field-in-fund.cy.js index 4d5a426788..123c0ac6e7 100644 --- a/cypress/e2e/finance/funds/filter-status-field-in-fund.cy.js +++ b/cypress/e2e/finance/funds/filter-status-field-in-fund.cy.js @@ -63,7 +63,7 @@ describe('Funds', () => { it( 'C380709 Filter in "Status" fields works correctly when creating and editing fund (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C380709'] }, + { tags: ['criticalPath', 'thunderjet', 'C380709'] }, () => { const fundEditForm = Funds.clickCreateNewFundButton(); fundEditForm.checkButtonsConditions([ diff --git a/cypress/e2e/finance/funds/filter-transer-from-in-fund.cy.js b/cypress/e2e/finance/funds/filter-transer-from-in-fund.cy.js index 5a9393add7..c4335d77e9 100644 --- a/cypress/e2e/finance/funds/filter-transer-from-in-fund.cy.js +++ b/cypress/e2e/finance/funds/filter-transer-from-in-fund.cy.js @@ -90,7 +90,7 @@ describe('Funds', () => { it( 'C380708 Filter in "Transfer from" and "Transfer to" fields works correctly when creating a new fund (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C380708'] }, () => { Funds.cancelCreatingFundWithTransfers(thirdFund, defaultLedger.name, firstFund, secondFund); }, diff --git a/cypress/e2e/finance/funds/funds.addBudget.cy.js b/cypress/e2e/finance/funds/funds.addBudget.cy.js index f77b1e2222..ba343f42cc 100644 --- a/cypress/e2e/finance/funds/funds.addBudget.cy.js +++ b/cypress/e2e/finance/funds/funds.addBudget.cy.js @@ -13,7 +13,7 @@ describe('Funds', () => { it( 'C4057 Add budget to a fund (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1', 'shiftLeft'] }, + { tags: ['smoke', 'thunderjet', 'C4057', 'shiftLeft'] }, () => { Funds.createFundViaUI(fund).then((createdLedger) => { createdLedgerId = createdLedger.id; diff --git a/cypress/e2e/finance/funds/funds.create.cy.js b/cypress/e2e/finance/funds/funds.create.cy.js index 0192dab0ce..916ec8e31b 100644 --- a/cypress/e2e/finance/funds/funds.create.cy.js +++ b/cypress/e2e/finance/funds/funds.create.cy.js @@ -14,7 +14,7 @@ describe('Funds', () => { it( 'C4052 Create a new fund (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C4052', 'shiftLeft'] }, () => { Funds.createFundViaUI(fund).then((createdLedger) => { createdLedgerId = createdLedger.id; diff --git a/cypress/e2e/finance/funds/funds.deleteBudget.cy.js b/cypress/e2e/finance/funds/funds.deleteBudget.cy.js index bd50fc3fd1..fe3d43bb2c 100644 --- a/cypress/e2e/finance/funds/funds.deleteBudget.cy.js +++ b/cypress/e2e/finance/funds/funds.deleteBudget.cy.js @@ -50,23 +50,19 @@ describe('Funds', () => { Users.deleteViaApi(user.userId); }); - it( - 'C343211 Delete Budget (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, - () => { - FinanceHelp.searchByName(defaultFund.name); - Funds.selectFund(defaultFund.name); - Funds.addBudget(allocatedQuantity); - Funds.checkCreatedBudget(defaultFund.code, firstFiscalYear.code); - Funds.viewTransactions(); - Funds.selectTransactionInList('Allocation'); - Funds.closeTransactionDetails(); - Funds.closeTransactionApp(defaultFund, firstFiscalYear); - Funds.deleteBudgetViaActions(); - Funds.checkDeletedBudget(currentBudgetSectionId); - Funds.deleteFundViaActions(); - FinanceHelp.searchByName(defaultFund.name); - Funds.checkZeroSearchResultsHeader(); - }, - ); + it('C343211 Delete Budget (thunderjet)', { tags: ['smoke', 'thunderjet', 'C343211'] }, () => { + FinanceHelp.searchByName(defaultFund.name); + Funds.selectFund(defaultFund.name); + Funds.addBudget(allocatedQuantity); + Funds.checkCreatedBudget(defaultFund.code, firstFiscalYear.code); + Funds.viewTransactions(); + Funds.selectTransactionInList('Allocation'); + Funds.closeTransactionDetails(); + Funds.closeTransactionApp(defaultFund, firstFiscalYear); + Funds.deleteBudgetViaActions(); + Funds.checkDeletedBudget(currentBudgetSectionId); + Funds.deleteFundViaActions(); + FinanceHelp.searchByName(defaultFund.name); + Funds.checkZeroSearchResultsHeader(); + }); }); diff --git a/cypress/e2e/finance/funds/funds.search.cy.js b/cypress/e2e/finance/funds/funds.search.cy.js index 293ebc1b6f..d70278bfda 100644 --- a/cypress/e2e/finance/funds/funds.search.cy.js +++ b/cypress/e2e/finance/funds/funds.search.cy.js @@ -77,7 +77,7 @@ describe('Funds', () => { it( 'C4059 Test the search and filter options for funds (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C4059', 'shiftLeft'] }, () => { TopMenuNavigation.navigateToApp('Finance'); FinanceHelp.checkZeroSearchResultsMessage(); diff --git a/cypress/e2e/finance/funds/moving-allocation-between-funds.cy.js b/cypress/e2e/finance/funds/moving-allocation-between-funds.cy.js index c45dac7c9d..677ac9e677 100644 --- a/cypress/e2e/finance/funds/moving-allocation-between-funds.cy.js +++ b/cypress/e2e/finance/funds/moving-allocation-between-funds.cy.js @@ -79,7 +79,7 @@ describe('Finance: Funds', () => { it( 'C374166 Moving allocation between funds is NOT successful if it results in negative available amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1', 'C374166'] }, + { tags: ['extendedPath', 'thunderjet', 'C374166'] }, () => { FinanceHelper.searchByName(fromFund.name); Funds.selectFund(fromFund.name); diff --git a/cypress/e2e/finance/funds/multiple-budgets-for-same-fund.cy.js b/cypress/e2e/finance/funds/multiple-budgets-for-same-fund.cy.js index 8552c21d11..00300988b8 100644 --- a/cypress/e2e/finance/funds/multiple-budgets-for-same-fund.cy.js +++ b/cypress/e2e/finance/funds/multiple-budgets-for-same-fund.cy.js @@ -80,7 +80,7 @@ describe('Finance', () => { it( 'C353527 Allow user to create multiple planned budgets (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353527'] }, () => { // Open Fund from Preconditions FinanceHelper.searchByName(fund.name); diff --git a/cypress/e2e/finance/funds/not-able-to-create-planned-budget.cy.js b/cypress/e2e/finance/funds/not-able-to-create-planned-budget.cy.js index ef37d8ad29..18d92e7609 100644 --- a/cypress/e2e/finance/funds/not-able-to-create-planned-budget.cy.js +++ b/cypress/e2e/finance/funds/not-able-to-create-planned-budget.cy.js @@ -46,7 +46,7 @@ describe('Finance: Funds', () => { it( 'C353528 A user is not able to create planned budget if upcoming fiscal year does not exist (Thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353528'] }, () => { FinanceHelp.searchByName(firstFund.name); Funds.selectFund(firstFund.name); diff --git a/cypress/e2e/finance/funds/remove-donor-from-fund.cy.js b/cypress/e2e/finance/funds/remove-donor-from-fund.cy.js index 76f02fd432..ba6e5aa321 100644 --- a/cypress/e2e/finance/funds/remove-donor-from-fund.cy.js +++ b/cypress/e2e/finance/funds/remove-donor-from-fund.cy.js @@ -59,7 +59,7 @@ describe('Finance', () => { it( 'C422212 Remove donor from fund (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C422212'] }, () => { // Open Fund from Preconditions Funds.searchByName(testData.fund.name); diff --git a/cypress/e2e/finance/funds/test-acquisition-unit-restrictions-for-funds.cy.js b/cypress/e2e/finance/funds/test-acquisition-unit-restrictions-for-funds.cy.js index b7059e84a4..7140fc6e34 100644 --- a/cypress/e2e/finance/funds/test-acquisition-unit-restrictions-for-funds.cy.js +++ b/cypress/e2e/finance/funds/test-acquisition-unit-restrictions-for-funds.cy.js @@ -49,7 +49,7 @@ describe('Funds', () => { it( 'C163928 Test acquisition unit restrictions for Fund records (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C163928'] }, () => { cy.loginAsAdmin({ path: SettingsMenu.acquisitionUnitsPath, diff --git a/cypress/e2e/finance/funds/transfer-allocation-between-funds.cy.js b/cypress/e2e/finance/funds/transfer-allocation-between-funds.cy.js index 9f7c084592..674f994ea3 100644 --- a/cypress/e2e/finance/funds/transfer-allocation-between-funds.cy.js +++ b/cypress/e2e/finance/funds/transfer-allocation-between-funds.cy.js @@ -94,7 +94,7 @@ describe('Finance', () => { it( 'C374183 Money transfer between funds is successful if it results in negative available amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374183'] }, () => { // Open Fund B from Preconditions FinanceHelper.searchByName(funds.second.name); @@ -162,7 +162,7 @@ describe('Finance', () => { it( 'C375066 Money transfer between funds is successful if budget "From" already has negative available amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375066'] }, () => { // Open Fund B from Preconditions FinanceHelper.searchByName(funds.second.name); @@ -221,7 +221,7 @@ describe('Finance', () => { it( 'C375067 Money transfer between funds is successful if budget "To" already has negative available amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375067'] }, () => { // Open Fund B from Preconditions FinanceHelper.searchByName(funds.second.name); @@ -280,7 +280,7 @@ describe('Finance', () => { it( 'C375068 Money transfer between funds is successful if budget "From" already has 0.00 money allocation (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375068'] }, () => { // Open Fund B from Preconditions FinanceHelper.searchByName(funds.second.name); diff --git a/cypress/e2e/finance/funds/view-expense-class-info-on-budget-details.cy.js b/cypress/e2e/finance/funds/view-expense-class-info-on-budget-details.cy.js index daa8eebeee..72ada98949 100644 --- a/cypress/e2e/finance/funds/view-expense-class-info-on-budget-details.cy.js +++ b/cypress/e2e/finance/funds/view-expense-class-info-on-budget-details.cy.js @@ -77,7 +77,7 @@ describe('Finance', () => { it( "C415261 User can view actual Expense Class information on Fund's Budget details pane after the first using Expense Class (thunderjet) (TaaS)", - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C415261'] }, () => { // Open the record with Fund from precondition by clicking on its name Funds.searchByName(testData.fund.name); diff --git a/cypress/e2e/finance/funds/warning-message.cy.js b/cypress/e2e/finance/funds/warning-message.cy.js index adf57e0351..1b72dcfc8c 100644 --- a/cypress/e2e/finance/funds/warning-message.cy.js +++ b/cypress/e2e/finance/funds/warning-message.cy.js @@ -35,7 +35,7 @@ describe('Funds', () => { it( 'C357528 Warning message for already existing field appears when after filling duplicated field user clicks on the dropdown with filter options list (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C357528'] }, () => { Funds.createFundForWarningMessage(defaultFund); Funds.checkWarningMessageFundCodeUsed(); diff --git a/cypress/e2e/finance/groups/add-funds-to-group.cy.js b/cypress/e2e/finance/groups/add-funds-to-group.cy.js index c782f4b0b9..d1042a3af5 100644 --- a/cypress/e2e/finance/groups/add-funds-to-group.cy.js +++ b/cypress/e2e/finance/groups/add-funds-to-group.cy.js @@ -116,7 +116,7 @@ describe('Groups', () => { it( 'C4056 Add funds to a group (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C4056'] }, () => { FinanceHelp.searchByName(firstFund.name); Funds.selectFund(firstFund.name); diff --git a/cypress/e2e/finance/groups/add-multiple-funds-to-group.cy.js b/cypress/e2e/finance/groups/add-multiple-funds-to-group.cy.js index e75228acfb..6e066d103e 100644 --- a/cypress/e2e/finance/groups/add-multiple-funds-to-group.cy.js +++ b/cypress/e2e/finance/groups/add-multiple-funds-to-group.cy.js @@ -94,7 +94,7 @@ describe('Groups', () => { it( 'C347878 Add multiple funds to a group with plugin (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C347878'] }, () => { FinanceHelp.searchByName(defaultGroup.name); Groups.selectGroup(defaultGroup.name); diff --git a/cypress/e2e/finance/groups/create-group.cy.js b/cypress/e2e/finance/groups/create-group.cy.js index 670e791fab..937462cb39 100644 --- a/cypress/e2e/finance/groups/create-group.cy.js +++ b/cypress/e2e/finance/groups/create-group.cy.js @@ -12,7 +12,7 @@ describe('Groups', () => { it( 'C4054 Create a new fund group (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C4054'] }, () => { Groups.createDefaultGroup(defaultGroup); Groups.checkCreatedGroup(defaultGroup); diff --git a/cypress/e2e/finance/groups/current-fiscal-year-is-selected-by-default-when-viewing-group-records.cy.js b/cypress/e2e/finance/groups/current-fiscal-year-is-selected-by-default-when-viewing-group-records.cy.js index c6ace369f9..d814890c71 100644 --- a/cypress/e2e/finance/groups/current-fiscal-year-is-selected-by-default-when-viewing-group-records.cy.js +++ b/cypress/e2e/finance/groups/current-fiscal-year-is-selected-by-default-when-viewing-group-records.cy.js @@ -83,7 +83,7 @@ describe('Fiscal Year Rollover', () => { it( 'C367939 Current fiscal year is selected by default when viewing group records (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C367939'] }, () => { FinanceHelp.searchByName(defaultGroup.name); Groups.selectGroup(defaultGroup.name); diff --git a/cypress/e2e/finance/groups/search-and-filter.cy.js b/cypress/e2e/finance/groups/search-and-filter.cy.js index 4fe0865a8d..c604311383 100644 --- a/cypress/e2e/finance/groups/search-and-filter.cy.js +++ b/cypress/e2e/finance/groups/search-and-filter.cy.js @@ -45,7 +45,7 @@ describe('Groups', () => { it( 'C4060 Test the search and filter options for fund groups (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C4060'] }, () => { // Search Groups by all FinanceHelp.searchByAll(defaultGroup.name); diff --git a/cypress/e2e/finance/ledgers/export-ledger-w-different-fund-content.cy.js b/cypress/e2e/finance/ledgers/export-ledger-w-different-fund-content.cy.js index 63360d5848..348286250b 100644 --- a/cypress/e2e/finance/ledgers/export-ledger-w-different-fund-content.cy.js +++ b/cypress/e2e/finance/ledgers/export-ledger-w-different-fund-content.cy.js @@ -112,7 +112,7 @@ describe('Finance', () => { it( 'C350963 User can export Ledger with different Funds content (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350963'] }, () => { // Click on Ledger name link from preconditions FinanceHelper.searchByName(ledgers.first.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-class-active-without-rollover.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-class-active-without-rollover.cy.js index f1699148c1..6767ad8aa8 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-class-active-without-rollover.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-class-active-without-rollover.cy.js @@ -59,7 +59,7 @@ describe('Finance: Ledgers', () => { it( 'C353214 Ledger export settings: current year Fund with NO budget, NO Classes, Export settings; Expense class - Active (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353214'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover-with-ex-classes.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover-with-ex-classes.cy.js index 863860af43..bfaf5d1f78 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover-with-ex-classes.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover-with-ex-classes.cy.js @@ -124,7 +124,7 @@ describe('Finance: Ledgers', () => { it( 'C353205 Ledger export settings: current year Fund with budget, Print (Active) and Economic (Inactive) Classes, Export settings-None statuses (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353205'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover.cy.js index 1d687c7701..bbe815e4af 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none-without-rollover.cy.js @@ -59,7 +59,7 @@ describe('Finance: Ledgers', () => { it( 'C353215 Ledger export settings: current year Fund with NO budget, NO Classes, Export settings; Expense class - NONE (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353215'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none.cy.js index 1a92e4fef7..08d5d59d44 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/expense-classes-none.cy.js @@ -137,8 +137,8 @@ describe('Finance: Ledgers', () => { }); it( - 'C350976: Ledger export settings: last year Fund with budget, Economic (Active) Class, Export settings; Expense classes- None (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C350976 Ledger export settings: last year Fund with budget, Economic (Active) Class, Export settings; Expense classes- None (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C350976'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-active-status.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-active-status.cy.js index f9f7942a76..82a88ba6de 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-active-status.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-active-status.cy.js @@ -140,7 +140,7 @@ describe('Finance: Ledgers', () => { it( 'C350974 Ledger export settings: last year Fund with budget, Electronic (Active) Class, Export settings- Active status (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350974'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-with-ex-classes.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-with-ex-classes.cy.js index 2a29d2f81c..c1f786fc41 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-with-ex-classes.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-with-ex-classes.cy.js @@ -168,7 +168,7 @@ describe('Finance: Ledgers', () => { it( 'C350975 Ledger export settings: last year Fund with budget, Print (Active) and Electronic (Inactive) Classes, Export settings- All statuses (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350975'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-without-rollover-with-ex-classes.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-without-rollover-with-ex-classes.cy.js index 000c22b2b2..fa22487b7e 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-without-rollover-with-ex-classes.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses-without-rollover-with-ex-classes.cy.js @@ -104,7 +104,7 @@ describe('Finance: Ledgers', () => { it( 'C353207 Ledger export settings: current year Fund with budget, Print (Active) Class, Export settings - All statuses (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353207'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses.cy.js index 7963ba8693..0188580823 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-all-statuses.cy.js @@ -99,7 +99,7 @@ describe('Finance: Ledgers', () => { it( 'C353212 Ledger export settings: last year Fund with NO budget, NO Classes, Export settings-All statuses (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353212'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-with-rollover-and-2-exp-classes.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-with-rollover-and-2-exp-classes.cy.js index fa56cc254c..540fbe3f69 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-with-rollover-and-2-exp-classes.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-with-rollover-and-2-exp-classes.cy.js @@ -173,7 +173,7 @@ describe('Finance: Ledgers', () => { it( 'C350977 Ledger export settings: current year Fund with budget, Print (Active) and Electronic (Inactive) Classes, Export settings-Inactive status (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350977'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-without-rollover-with-2-exp-classes.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-without-rollover-with-2-exp-classes.cy.js index c6071ae398..ffc86f9b65 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-without-rollover-with-2-exp-classes.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status-without-rollover-with-2-exp-classes.cy.js @@ -102,7 +102,7 @@ describe('Finance: Ledgers', () => { it( 'C350978 Ledger export settings: current year Fund with budget, Economic (Inactive) Class, Export settings-Inactive status (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350978'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status.cy.js index ed428022bf..64addc4dab 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-inactive-status.cy.js @@ -92,7 +92,7 @@ describe('Finance: Ledgers', () => { it( 'C353213 Ledger export settings: last year Fund with NO budget, NO Classes, Export settings-Inactive status (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353213'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-no-fiscal-year-each-class-status.cy.js b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-no-fiscal-year-each-class-status.cy.js index efacdfd637..eb6d9941cd 100644 --- a/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-no-fiscal-year-each-class-status.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-export-settings-pairwise-variants/export-settings-no-fiscal-year-each-class-status.cy.js @@ -138,7 +138,7 @@ describe('Finance: Ledgers', () => { it( 'C353211 Ledger export settings: current year Fund with budget, Print (Active) and Economic (Inactive) Classes, Export settings: No fiscal year, Each class status (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C353211'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledger-summary-calculation-after-allocation-movement.cy.js b/cypress/e2e/finance/ledgers/ledger-summary-calculation-after-allocation-movement.cy.js index 501c5157bb..03eb3406c4 100644 --- a/cypress/e2e/finance/ledgers/ledger-summary-calculation-after-allocation-movement.cy.js +++ b/cypress/e2e/finance/ledgers/ledger-summary-calculation-after-allocation-movement.cy.js @@ -77,7 +77,7 @@ describe('Finance: Ledgers', () => { it( 'C411576 Ledger summary calculation after allocation movement to 0 budget (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C411576'] }, () => { FinanceHelp.searchByName(defaultLedger.name); Ledgers.selectLedger(defaultLedger.name); diff --git a/cypress/e2e/finance/ledgers/ledgers.create.cy.js b/cypress/e2e/finance/ledgers/ledgers.create.cy.js index 703d0caf6b..671525f24e 100644 --- a/cypress/e2e/finance/ledgers/ledgers.create.cy.js +++ b/cypress/e2e/finance/ledgers/ledgers.create.cy.js @@ -11,7 +11,7 @@ describe('Ledgers', () => { it( 'C4053 Create a new ledger (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C4053', 'shiftLeft'] }, () => { const defaultLedger = NewLedger.defaultLedger; diff --git a/cypress/e2e/finance/ledgers/ledgers.search.cy.js b/cypress/e2e/finance/ledgers/ledgers.search.cy.js index ffa5a28540..4d4e357cf7 100644 --- a/cypress/e2e/finance/ledgers/ledgers.search.cy.js +++ b/cypress/e2e/finance/ledgers/ledgers.search.cy.js @@ -73,7 +73,7 @@ describe( it( 'C4061 Test the search and filter options for ledgers (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C4061', 'shiftLeft'] }, () => { TopMenuNavigation.navigateToApp('Finance'); diff --git a/cypress/e2e/finance/name-columns-is-hyperlink.cy.js b/cypress/e2e/finance/name-columns-is-hyperlink.cy.js index e7bd97d846..004a9f841c 100644 --- a/cypress/e2e/finance/name-columns-is-hyperlink.cy.js +++ b/cypress/e2e/finance/name-columns-is-hyperlink.cy.js @@ -62,8 +62,8 @@ describe('Finance', () => { }); it( - 'C369083 - Finance | Results List | Verify that values in "Name" columns are hyperlink (Thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C369083 Finance | Results List | Verify that values in "Name" columns are hyperlink (Thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C369083'] }, () => { FinanceHelp.clickFiscalYearButton(); FiscalYears.waitLoading(); diff --git a/cypress/e2e/finance/transactions/allocation-amount-is-not-displayed-in-financial-summary.cy.js b/cypress/e2e/finance/transactions/allocation-amount-is-not-displayed-in-financial-summary.cy.js index ff8e9c5334..77adcf170c 100644 --- a/cypress/e2e/finance/transactions/allocation-amount-is-not-displayed-in-financial-summary.cy.js +++ b/cypress/e2e/finance/transactions/allocation-amount-is-not-displayed-in-financial-summary.cy.js @@ -110,7 +110,7 @@ describe('Finance', () => { it( 'C360116 "Increase/decrease in allocation" amounts for funds related to the same ledger should not be displayed in ledger Financial summary (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C360116'] }, () => { // Click on **"Fund B"** name on "Fund" pane FinanceHelper.searchByName(funds.b.name); diff --git a/cypress/e2e/finance/transactions/moving-allocation.cy.js b/cypress/e2e/finance/transactions/moving-allocation.cy.js index 1c565acb02..b133be4e44 100644 --- a/cypress/e2e/finance/transactions/moving-allocation.cy.js +++ b/cypress/e2e/finance/transactions/moving-allocation.cy.js @@ -79,7 +79,7 @@ describe('Finance', () => { it( 'C375175 Moving allocation is NOT successful if money was moved from fund having NO current budget (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375175'] }, () => { FinanceHelper.searchByName(toFund.name); Funds.selectFund(toFund.name); diff --git a/cypress/e2e/finance/transactions/rollover-transfer-amount-included-in-summary.cy.js b/cypress/e2e/finance/transactions/rollover-transfer-amount-included-in-summary.cy.js index 0d6e9c3267..4b944018f9 100644 --- a/cypress/e2e/finance/transactions/rollover-transfer-amount-included-in-summary.cy.js +++ b/cypress/e2e/finance/transactions/rollover-transfer-amount-included-in-summary.cy.js @@ -152,7 +152,7 @@ describe('Finance', () => { it( 'C375980 Rollover transfer amounts are included in Group and Ledger summary for Net Transfers (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375980'] }, () => { FinanceHelper.searchByName(fiscalYears.next.name); const FiscalYearDetails = FiscalYears.selectFisacalYear(fiscalYears.next.name); diff --git a/cypress/e2e/finance/transactions/unable-to-allocate-money-from-budget-with-insufficient-funds.cy.js b/cypress/e2e/finance/transactions/unable-to-allocate-money-from-budget-with-insufficient-funds.cy.js index b5d4b6e01d..043aa0b775 100644 --- a/cypress/e2e/finance/transactions/unable-to-allocate-money-from-budget-with-insufficient-funds.cy.js +++ b/cypress/e2e/finance/transactions/unable-to-allocate-money-from-budget-with-insufficient-funds.cy.js @@ -79,7 +79,7 @@ describe('Finance: Funds', () => { it( 'C380517 A user can not allocate money from budget with insufficient money (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1', 'C380517'] }, + { tags: ['extendedPath', 'thunderjet', 'C380517'] }, () => { FinanceHelper.searchByName(fundA.name); Funds.selectFund(fundA.name); diff --git a/cypress/e2e/finance/transactions/unrelease-encumbrance.cy.js b/cypress/e2e/finance/transactions/unrelease-encumbrance.cy.js index 405320a426..50aa3c71f7 100644 --- a/cypress/e2e/finance/transactions/unrelease-encumbrance.cy.js +++ b/cypress/e2e/finance/transactions/unrelease-encumbrance.cy.js @@ -150,7 +150,7 @@ describe('Finance', () => { it( 'C375105 Unrelease encumbrance when cancelling approved invoice related to Ongoing order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C375105'] }, + { tags: ['criticalPath', 'thunderjet', 'C375105'] }, () => { FinanceHelp.searchByName(defaultFund.name); Funds.selectFund(defaultFund.name); diff --git a/cypress/e2e/fse/ui/organizations-ui.cy.js b/cypress/e2e/fse/ui/organizations-ui.cy.js index 1f32ae3b93..8ea386392c 100644 --- a/cypress/e2e/fse/ui/organizations-ui.cy.js +++ b/cypress/e2e/fse/ui/organizations-ui.cy.js @@ -60,7 +60,7 @@ describe('fse-organizations - UI (data manipulation)', () => { { tags: ['nonProd', 'fse', 'ui', 'organizations', 'fse-user-journey'] }, () => { // create new organization via UI - Organizations.createOrganizationViaUi(organization); + Organizations.createOrganization(organization); Organizations.checkOrganizationInfo(organization); // assign an interface Organizations.editOrganization(); @@ -97,7 +97,7 @@ describe('fse-organizations - UI (data manipulation)', () => { () => { // create new organization via UI organization.name += 'FSE_TEST_TC195673'; - Organizations.createOrganizationViaUi(organization); + Organizations.createOrganization(organization); Organizations.checkOrganizationInfo(organization); // add organization to an agreement TopMenuNavigation.openAppFromDropdown(APPLICATION_NAMES.AGREEMENTS); diff --git a/cypress/e2e/inventory/bound-with/bound-with-items-view-on-bound-holdings.cy.js b/cypress/e2e/inventory/bound-with/bound-with-items-view-on-bound-holdings.cy.js index a96569a111..50b2490d4c 100644 --- a/cypress/e2e/inventory/bound-with/bound-with-items-view-on-bound-holdings.cy.js +++ b/cypress/e2e/inventory/bound-with/bound-with-items-view-on-bound-holdings.cy.js @@ -148,7 +148,7 @@ describe('Inventory', () => { it( 'C409512 Verify the Bound-with items view on bound holdings (sif)', - { tags: ['criticalPath', 'sif', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'sif', 'C409512'] }, () => { InventorySearchAndFilter.searchByParameter('Title (all)', testData.firstInstanceTitle); InstanceRecordView.verifyInstanceRecordViewOpened(); diff --git a/cypress/e2e/inventory/cataloging/creating-new-records/create-instance-holdings-and-item.cy.js b/cypress/e2e/inventory/cataloging/creating-new-records/create-instance-holdings-and-item.cy.js index 5fc9fb6b59..a9ef24beee 100644 --- a/cypress/e2e/inventory/cataloging/creating-new-records/create-instance-holdings-and-item.cy.js +++ b/cypress/e2e/inventory/cataloging/creating-new-records/create-instance-holdings-and-item.cy.js @@ -42,7 +42,7 @@ describe('Inventory', () => { it( 'C3505 Create instance, holdings, and item records for a print resource which has not been acquired through Orders (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C3505', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C3505'] }, () => { // Click on "New" in the "Actions" menu const InventoryNewInstance = InventoryInstances.addNewInventory(); diff --git a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-an-existing-title.cy.js b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-an-existing-title.cy.js index ec31d642e3..5c19a40191 100644 --- a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-an-existing-title.cy.js +++ b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/add-item-to-an-existing-title.cy.js @@ -65,7 +65,7 @@ describe('Inventory', () => { it( 'C3493 Add an item to an existing title. There is already a copy at the same library branch. (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C3493', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C3493'] }, () => { // Find the instance from precondition InventorySearchAndFilter.searchInstanceByTitle(testData.instance.instanceTitle); diff --git a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/edit-the-title-of-instance-which-has-source-folio.cy.js b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/edit-the-title-of-instance-which-has-source-folio.cy.js index d8d8ff58d2..c5152cf2f0 100644 --- a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/edit-the-title-of-instance-which-has-source-folio.cy.js +++ b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/edit-the-title-of-instance-which-has-source-folio.cy.js @@ -46,7 +46,7 @@ describe('Inventory', () => { it( 'C3495 Edit the title of an instance which has source FOLIO (record which do not have an underlying MARC record stored in SRS) (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C3495', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C3495'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(testData.instance.instanceTitle); InstanceRecordView.verifyInstanceRecordViewOpened(); diff --git a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js index 5cf089028f..a206f801b8 100644 --- a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js +++ b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/item-moved-from-one-shelf-to-another.cy.js @@ -56,7 +56,7 @@ describe('Inventory', () => { it( 'C3500 An item is being moved from one shelf to another. Change the call number of the associated holdings record! (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C3500', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C3500'] }, () => { // Find the instance from precondition InventorySearchAndFilter.searchInstanceByTitle(testData.folioInstances[0].instanceTitle); diff --git a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/update-effective-location-for-item.cy.js b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/update-effective-location-for-item.cy.js index 3be8b4b1f2..504cc80b47 100644 --- a/cypress/e2e/inventory/cataloging/maintaining-the-catalog/update-effective-location-for-item.cy.js +++ b/cypress/e2e/inventory/cataloging/maintaining-the-catalog/update-effective-location-for-item.cy.js @@ -103,7 +103,7 @@ describe('Inventory', () => { it( 'C3501 An item is being moved from one library location to another. Update the effective location for the item (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C3501', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'C3501', 'shiftLeft'] }, () => { InventorySearchAndFilter.searchInstanceByHRID(instanceHrid); InventoryInstance.waitInstanceRecordViewOpened(itemData.instanceTitle); diff --git a/cypress/e2e/inventory/fast-add/create-fast-add-record.cy.js b/cypress/e2e/inventory/fast-add/create-fast-add-record.cy.js index 8c71fcc752..3f7c20367d 100644 --- a/cypress/e2e/inventory/fast-add/create-fast-add-record.cy.js +++ b/cypress/e2e/inventory/fast-add/create-fast-add-record.cy.js @@ -47,7 +47,7 @@ describe('Inventory', () => { it( 'C15850 Create a fast add record from Inventory. Monograph. (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C15850', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'C15850', 'shiftLeft'] }, () => { cy.intercept('POST', '/inventory/instances').as('createInstance'); cy.intercept('POST', '/holdings-storage/holdings').as('createHolding'); @@ -116,7 +116,7 @@ describe('Inventory', () => { it( 'C16972 Create a fast add record from Inventory. Journal issue. (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C16972', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C16972'] }, () => { const fastAddRecord = { ...FastAddNewRecord.fastAddNewRecordFormDetails }; fastAddRecord.resourceTitle = `Journal issue${randomFourDigitNumber()}`; diff --git a/cypress/e2e/inventory/holdings/back-to-holdings-edit-page-from-another-app.cy.js b/cypress/e2e/inventory/holdings/back-to-holdings-edit-page-from-another-app.cy.js index 865880c57b..279944e999 100644 --- a/cypress/e2e/inventory/holdings/back-to-holdings-edit-page-from-another-app.cy.js +++ b/cypress/e2e/inventory/holdings/back-to-holdings-edit-page-from-another-app.cy.js @@ -73,7 +73,7 @@ describe('Inventory', () => { it( 'C397327 Verify that no error appears after switch from Holdings Edit screen to another app and back (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C397327', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C397327'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(testData.instanceTitle); InventorySearchAndFilter.selectViewHoldings(); diff --git a/cypress/e2e/inventory/holdings/check-new-formatting-statistical-code-on-holding-screen.cy.js b/cypress/e2e/inventory/holdings/check-new-formatting-statistical-code-on-holding-screen.cy.js index 89b7ef6e4f..7bf03740fd 100644 --- a/cypress/e2e/inventory/holdings/check-new-formatting-statistical-code-on-holding-screen.cy.js +++ b/cypress/e2e/inventory/holdings/check-new-formatting-statistical-code-on-holding-screen.cy.js @@ -69,7 +69,7 @@ describe('Inventory', () => { it( 'C400653 Check the new formatting of Statistical codes field on Holdings create/edit screen (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C400653', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C400653'] }, () => { InventoryInstances.searchByTitle(testData.item.instanceName); InventorySearchAndFilter.verifyInstanceDisplayed(testData.item.instanceName); diff --git a/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js b/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js index b3863a23d8..3f3b26bd9b 100644 --- a/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js +++ b/cypress/e2e/inventory/holdings/create-holdings-as-different-user.cy.js @@ -64,7 +64,7 @@ describe('Inventory', () => { it( 'C1294 Create a Holdings record as another user than the one that created the Instance (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C1294', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'C1294', 'shiftLeft'] }, () => { cy.wait(2000); const InventoryNewInstance = InventoryInstances.addNewInventory(); diff --git a/cypress/e2e/inventory/holdings/save-empty-statistical-code-on-holdings-page.cy.js b/cypress/e2e/inventory/holdings/save-empty-statistical-code-on-holdings-page.cy.js index aec260f6c4..3517ca800e 100644 --- a/cypress/e2e/inventory/holdings/save-empty-statistical-code-on-holdings-page.cy.js +++ b/cypress/e2e/inventory/holdings/save-empty-statistical-code-on-holdings-page.cy.js @@ -70,7 +70,7 @@ describe('Inventory', () => { it( 'C396396 Verify the inability to save empty statistical code field on Holdings create/edit page (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C396396', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C396396'] }, () => { InventoryInstances.searchByTitle(testData.item.instanceName); InventorySearchAndFilter.verifyInstanceDisplayed(testData.item.instanceName); diff --git a/cypress/e2e/inventory/instance/action-for-creating-new-local-shared-records-is-not-available-on-non-consortia-tenant.cy.js b/cypress/e2e/inventory/instance/action-for-creating-new-local-shared-records-is-not-available-on-non-consortia-tenant.cy.js index 25791c73b1..c4147f04db 100644 --- a/cypress/e2e/inventory/instance/action-for-creating-new-local-shared-records-is-not-available-on-non-consortia-tenant.cy.js +++ b/cypress/e2e/inventory/instance/action-for-creating-new-local-shared-records-is-not-available-on-non-consortia-tenant.cy.js @@ -26,7 +26,7 @@ describe('Inventory', () => { it( 'C405565 (NON-CONSORTIA) Verify the action for creating new local/shared records is NOT available on Non-consortia tenant (folijet) (TaaS)', - { tags: ['criticalPath', 'folijet', 'shiftLeft', 'C405565', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C405565', 'shiftLeft'] }, () => { InventorySearchAndFilter.verifyPanesExist(); InventorySearchAndFilter.instanceTabIsDefault(); diff --git a/cypress/e2e/inventory/instance/assign-preceding-title.cy.js b/cypress/e2e/inventory/instance/assign-preceding-title.cy.js index dfc7f6d3d1..5691cadeed 100644 --- a/cypress/e2e/inventory/instance/assign-preceding-title.cy.js +++ b/cypress/e2e/inventory/instance/assign-preceding-title.cy.js @@ -63,7 +63,7 @@ describe('Inventory', () => { it( 'C9215 In Accordion Title --> Test assigning a Preceding title (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C9215', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'shiftLeft', 'C9215'] }, () => { InventorySearchAndFilter.searchByParameter('Title (all)', instanceTitle); InventoryInstances.selectInstance(); diff --git a/cypress/e2e/inventory/instance/check-classification-types-list.cy.js b/cypress/e2e/inventory/instance/check-classification-types-list.cy.js index 8ee55255af..34cf0ce104 100644 --- a/cypress/e2e/inventory/instance/check-classification-types-list.cy.js +++ b/cypress/e2e/inventory/instance/check-classification-types-list.cy.js @@ -33,7 +33,7 @@ describe('Inventory', () => { it( 'C618 Classification --> Classification types (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C618', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C618'] }, () => { // Click on instance from preconditions InventoryInstances.searchByTitle(testData.instance.instanceTitle); diff --git a/cypress/e2e/inventory/instance/create-instance-with-duplicate.cy.js b/cypress/e2e/inventory/instance/create-instance-with-duplicate.cy.js index 6f4e29f9de..217585dcc7 100644 --- a/cypress/e2e/inventory/instance/create-instance-with-duplicate.cy.js +++ b/cypress/e2e/inventory/instance/create-instance-with-duplicate.cy.js @@ -53,7 +53,7 @@ describe('Inventory', () => { it( 'C380582 Create new instance with "Duplicate" (folijet)', - { tags: ['extendedPath', 'folijet', 'C380582', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C380582'] }, () => { InventorySearchAndFilter.searchByParameter('Title (all)', testData.instanceTitle); InstanceRecordView.verifyInstanceRecordViewOpened(); diff --git a/cypress/e2e/inventory/instance/in-accordion-admin-data-instance-status-term-validate-matching-settings.cy.js b/cypress/e2e/inventory/instance/in-accordion-admin-data-instance-status-term-validate-matching-settings.cy.js index 7dd6d55909..512fe2db46 100644 --- a/cypress/e2e/inventory/instance/in-accordion-admin-data-instance-status-term-validate-matching-settings.cy.js +++ b/cypress/e2e/inventory/instance/in-accordion-admin-data-instance-status-term-validate-matching-settings.cy.js @@ -47,7 +47,7 @@ describe('Inventory', () => { it( 'C602 In Accordion Administrative Data --> Instance status term --> (Validate matching settings) (folijet)', - { tags: ['extendedPath', 'folijet', 'C602', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C602'] }, () => { InventoryInstances.searchByTitle(testData.instance.instanceTitle); InventoryInstances.selectInstance(); @@ -65,7 +65,7 @@ describe('Inventory', () => { it( 'C604 In Accordion Administrative Data --> Go to the Statistical code --> (Validate matching settings) (folijet)', - { tags: ['extendedPath', 'folijet', 'C604', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C604'] }, () => { InventoryInstances.searchByTitle(testData.instance.instanceTitle); InventoryInstances.selectInstance(); diff --git a/cypress/e2e/inventory/instance/in-accordion-descriptive-data-test-assigning-nature-of-content.cy.js b/cypress/e2e/inventory/instance/in-accordion-descriptive-data-test-assigning-nature-of-content.cy.js index 7b4accb0ef..32647e102a 100644 --- a/cypress/e2e/inventory/instance/in-accordion-descriptive-data-test-assigning-nature-of-content.cy.js +++ b/cypress/e2e/inventory/instance/in-accordion-descriptive-data-test-assigning-nature-of-content.cy.js @@ -33,19 +33,13 @@ describe('Inventory', () => { after('Delete test data', () => { cy.getAdminToken().then(() => { Users.deleteViaApi(user.userId); - cy.getInstance({ - limit: 1, - expandAll: true, - query: `"title"=="${testData.instance.instanceTitle}"`, - }).then((instance) => { - InventoryInstance.deleteInstanceViaApi(instance.id); - }); + InventoryInstance.deleteInstanceViaApi(testData.instance.instanceId); }); }); it( 'C9214 In Accordion Descriptive Data --> Test assigning Nature of content (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C9214', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C9214'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(testData.instance.instanceTitle); InstanceRecordView.verifyInstanceRecordViewOpened(); diff --git a/cypress/e2e/inventory/instance/multiple-items-in-holding-record.cy.js b/cypress/e2e/inventory/instance/multiple-items-in-holding-record.cy.js index 518870d3e2..131257b91d 100644 --- a/cypress/e2e/inventory/instance/multiple-items-in-holding-record.cy.js +++ b/cypress/e2e/inventory/instance/multiple-items-in-holding-record.cy.js @@ -66,7 +66,7 @@ describe('Inventory', () => { it( 'C196761 Instance record: holdings accordion display (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C196761', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C196761'] }, () => { // Click on instance from preconditions InventoryInstances.searchByTitle(testData.folioInstances[0].instanceTitle); diff --git a/cypress/e2e/inventory/item/can-search-item-having-barcode-w-slash.cy.js b/cypress/e2e/inventory/item/can-search-item-having-barcode-w-slash.cy.js index 3f57169867..17f784695c 100644 --- a/cypress/e2e/inventory/item/can-search-item-having-barcode-w-slash.cy.js +++ b/cypress/e2e/inventory/item/can-search-item-having-barcode-w-slash.cy.js @@ -63,7 +63,7 @@ describe('Inventory', () => { it( 'C423380 Check that item barcodes with slashes can be searched (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C423380', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C423380'] }, () => { // Click on instance from preconditions InventoryInstances.searchByTitle(testData.folioInstances[0].instanceTitle); diff --git a/cypress/e2e/inventory/item/check-new-formatting-statistical-codes-field-on-item-create-screen.cy.js b/cypress/e2e/inventory/item/check-new-formatting-statistical-codes-field-on-item-create-screen.cy.js index 988c2f62c9..a9e6d3a495 100644 --- a/cypress/e2e/inventory/item/check-new-formatting-statistical-codes-field-on-item-create-screen.cy.js +++ b/cypress/e2e/inventory/item/check-new-formatting-statistical-codes-field-on-item-create-screen.cy.js @@ -81,7 +81,7 @@ describe('Inventory', () => { it( 'C400654 Check the new formatting of Statistical codes field on Item create/edit screen (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C400654', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C400654'] }, () => { InventoryInstances.searchByTitle(testData.instanceData.instanceTitle); InventorySearchAndFilter.verifyInstanceDisplayed(testData.instanceData.instanceTitle); diff --git a/cypress/e2e/inventory/item/delete-an-item-without-dependencies.cy.js b/cypress/e2e/inventory/item/delete-an-item-without-dependencies.cy.js index 4007b0a551..5e7556454c 100644 --- a/cypress/e2e/inventory/item/delete-an-item-without-dependencies.cy.js +++ b/cypress/e2e/inventory/item/delete-an-item-without-dependencies.cy.js @@ -103,7 +103,7 @@ describe('Inventory', () => { it( 'C715 Delete an item without dependencies (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C715', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C715'] }, () => { InventorySearchAndFilter.switchToItem(); InventorySearchAndFilter.searchByParameter(barcodeOption, createdItem.barcode); diff --git a/cypress/e2e/inventory/item/item-locations-permanent-validate-matching-settings.cy.js b/cypress/e2e/inventory/item/item-locations-permanent-validate-matching-settings.cy.js index 7917acf5ce..f4eaf84f8f 100644 --- a/cypress/e2e/inventory/item/item-locations-permanent-validate-matching-settings.cy.js +++ b/cypress/e2e/inventory/item/item-locations-permanent-validate-matching-settings.cy.js @@ -110,7 +110,7 @@ describe('Inventory', () => { it( 'C633 Locations --> Permanent Location --> (Validate in Settings) (Folijet)(TaaS)', - { tags: ['extendedPath', 'folijet', 'C633', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C633'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(itemData.instanceTitle); InventorySearchAndFilter.clickAccordionByName(`Holdings: ${location.name} >`); diff --git a/cypress/e2e/inventory/item/item-locations-temporary-validate-matching-settings.cy.js b/cypress/e2e/inventory/item/item-locations-temporary-validate-matching-settings.cy.js index 75d7bec1ed..1e6db1c8bc 100644 --- a/cypress/e2e/inventory/item/item-locations-temporary-validate-matching-settings.cy.js +++ b/cypress/e2e/inventory/item/item-locations-temporary-validate-matching-settings.cy.js @@ -110,7 +110,7 @@ describe('Inventory', () => { it( 'C634 Locations --> Temporary Location --> (Validate matching settings) (Folijet)(TaaS)', - { tags: ['extendedPath', 'folijet', 'C634', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C634'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(itemData.instanceTitle); InventorySearchAndFilter.clickAccordionByName(`Holdings: ${location.name} >`); diff --git a/cypress/e2e/inventory/item/loan-data-and-availability.cy.js b/cypress/e2e/inventory/item/loan-data-and-availability.cy.js index a1642d10f1..86c8df74e8 100644 --- a/cypress/e2e/inventory/item/loan-data-and-availability.cy.js +++ b/cypress/e2e/inventory/item/loan-data-and-availability.cy.js @@ -100,7 +100,7 @@ describe('Inventory', () => { it( 'C632 Loan Data and Availability (incl. validate Loan type settings) (Folijet)(TaaS)', - { tags: ['extendedPath', 'folijet', 'C632', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C632'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(itemData.instanceTitle); InventoryInstance.openHoldingsAccordion(location.name); diff --git a/cypress/e2e/inventory/item/locations-temporary-validate-matching-settings.cy.js b/cypress/e2e/inventory/item/locations-temporary-validate-matching-settings.cy.js index a0d3f332fa..7e8431bf22 100644 --- a/cypress/e2e/inventory/item/locations-temporary-validate-matching-settings.cy.js +++ b/cypress/e2e/inventory/item/locations-temporary-validate-matching-settings.cy.js @@ -109,7 +109,7 @@ describe('Inventory', () => { it( 'C622 Locations --> Temporary Location --> (Validate matching settings) (Folijet)(TaaS)', - { tags: ['extendedPath', 'folijet', 'C622', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C622'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(itemData.instanceTitle); InventorySearchAndFilter.selectViewHoldings(); diff --git a/cypress/e2e/inventory/item/material-type-validate-matching-settings.cy.js b/cypress/e2e/inventory/item/material-type-validate-matching-settings.cy.js index abab020c51..2455168da5 100644 --- a/cypress/e2e/inventory/item/material-type-validate-matching-settings.cy.js +++ b/cypress/e2e/inventory/item/material-type-validate-matching-settings.cy.js @@ -97,7 +97,7 @@ describe('Inventory', () => { it( 'C628 Item Data --> Material Type --> (Validate matching settings) (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C628', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C628'] }, () => { InventorySearchAndFilter.searchInstanceByTitle(itemData.instanceTitle); InventoryInstance.openHoldingsAccordion(location.name); diff --git a/cypress/e2e/inventory/item/trashcan-is-aligned-with-the-corresponding-data-row.cy.js b/cypress/e2e/inventory/item/trashcan-is-aligned-with-the-corresponding-data-row.cy.js index 83f2714f51..0f9c9d3df9 100644 --- a/cypress/e2e/inventory/item/trashcan-is-aligned-with-the-corresponding-data-row.cy.js +++ b/cypress/e2e/inventory/item/trashcan-is-aligned-with-the-corresponding-data-row.cy.js @@ -47,7 +47,7 @@ describe('Inventory', () => { it( 'C380748 Item Create screen: trashcan is aligned with the corresponding data row (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C380748', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C380748'] }, () => { InventoryInstances.searchByTitle(testData.item.instanceName); InventorySearchAndFilter.verifyInstanceDisplayed(testData.item.instanceName); diff --git a/cypress/e2e/inventory/move-holdings-and-item/moving-item-between-holdings.cy.js b/cypress/e2e/inventory/move-holdings-and-item/moving-item-between-holdings.cy.js index f105854142..d621617c91 100644 --- a/cypress/e2e/inventory/move-holdings-and-item/moving-item-between-holdings.cy.js +++ b/cypress/e2e/inventory/move-holdings-and-item/moving-item-between-holdings.cy.js @@ -81,7 +81,7 @@ describe('Inventory', () => { it( 'C15184 Move one item between holdings within an instance (firebird) (TaaS)', - { tags: ['extendedPath', 'firebird', 'C15184', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'firebird', 'C15184'] }, () => { // Find the instance from precondition InventorySearchAndFilter.searchInstanceByTitle(testData.instance.instanceTitle); diff --git a/cypress/e2e/inventory/permissions/create-edit-delete-material-types.cy.js b/cypress/e2e/inventory/permissions/create-edit-delete-material-types.cy.js index 49971a9da6..31dec2263c 100644 --- a/cypress/e2e/inventory/permissions/create-edit-delete-material-types.cy.js +++ b/cypress/e2e/inventory/permissions/create-edit-delete-material-types.cy.js @@ -31,7 +31,7 @@ describe('Inventory', () => { it( 'C505 Settings (Inventory): Create, edit, delete material types (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C505', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'shiftLeft', 'C505'] }, () => { TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS); SettingsInventory.goToSettingsInventory(); diff --git a/cypress/e2e/inventory/settings/create-edit-mode-for-isri-profiles.cy.js b/cypress/e2e/inventory/settings/create-edit-mode-for-isri-profiles.cy.js index ab481445c7..e6620927d9 100644 --- a/cypress/e2e/inventory/settings/create-edit-mode-for-isri-profiles.cy.js +++ b/cypress/e2e/inventory/settings/create-edit-mode-for-isri-profiles.cy.js @@ -53,7 +53,7 @@ describe('Inventory', () => { it( 'C374178 Verify the create/edit mode for ISRI profiles (folijet)', - { tags: ['criticalPath', 'folijet', 'C374178', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C374178'] }, () => { Z3950TargetProfiles.create(); NewTargetProfile.newFormContains(); diff --git a/cypress/e2e/inventory/settings/verifyWidgetOnHRIDSettingsPage.cy.js b/cypress/e2e/inventory/settings/verifyWidgetOnHRIDSettingsPage.cy.js index cf66120b94..2e98f7a982 100644 --- a/cypress/e2e/inventory/settings/verifyWidgetOnHRIDSettingsPage.cy.js +++ b/cypress/e2e/inventory/settings/verifyWidgetOnHRIDSettingsPage.cy.js @@ -27,7 +27,7 @@ describe('Inventory', () => { // this test we can't run in parallel, so it is skipped and moved to manual it( 'C369055 Verify created/updated by widget on HRID Settings page (folijet) (TaaS)', - { tags: ['extendedPathBroken', 'folijet', 'C369055', 'eurekaPhase1'] }, + { tags: ['extendedPathBroken', 'folijet', 'C369055'] }, () => { cy.visit(SettingsMenu.hridHandlingPath); HridHandling.waitloading(); diff --git a/cypress/e2e/inventory/settings/view-mode-of-isri-profiles.cy.js b/cypress/e2e/inventory/settings/view-mode-of-isri-profiles.cy.js index 3d4c451089..7a14557fcf 100644 --- a/cypress/e2e/inventory/settings/view-mode-of-isri-profiles.cy.js +++ b/cypress/e2e/inventory/settings/view-mode-of-isri-profiles.cy.js @@ -228,7 +228,7 @@ describe('Inventory', () => { it( 'C374176 Verify the view mode of ISRI profiles (folijet)', - { tags: ['criticalPath', 'folijet', 'C374176', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'folijet', 'C374176'] }, () => { TopMenuNavigation.navigateToApp(APPLICATION_NAMES.SETTINGS); SettingsInventory.goToSettingsInventory(); diff --git a/cypress/e2e/inventory/tags/tags-functionality.cy.js b/cypress/e2e/inventory/tags/tags-functionality.cy.js index 0a6451f6b5..003e21fefd 100644 --- a/cypress/e2e/inventory/tags/tags-functionality.cy.js +++ b/cypress/e2e/inventory/tags/tags-functionality.cy.js @@ -408,7 +408,7 @@ describe('Inventory', () => { it( 'C196769 Assign tags to an Instance record (folijet)', - { tags: ['smoke', 'folijet', 'shiftLeft', 'C196769', 'eurekaPhase1'] }, + { tags: ['smoke', 'folijet', 'shiftLeft', 'C196769'] }, () => { InventorySearchAndFilter.searchByParameter('Title (all)', instanceTitle); InventoryInstances.selectInstance(); diff --git a/cypress/e2e/invoices/FY-appears-after-fund-distribution-change-when-FY-was-undefined.cy.js b/cypress/e2e/invoices/FY-appears-after-fund-distribution-change-when-FY-was-undefined.cy.js index f31fbd35b4..456de174a0 100644 --- a/cypress/e2e/invoices/FY-appears-after-fund-distribution-change-when-FY-was-undefined.cy.js +++ b/cypress/e2e/invoices/FY-appears-after-fund-distribution-change-when-FY-was-undefined.cy.js @@ -165,7 +165,7 @@ describe('Invoices', () => { it( 'C396390 Fiscal year appears after fund distribution change when FY was undefined (for previous FY) (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C396390'] }, () => { Invoices.createRolloverInvoice(invoice, organization.name); Invoices.createInvoiceLineFromPol(orderNumber); diff --git a/cypress/e2e/invoices/add-invoice-line-from-pol-w-inactive-budget.cy.js b/cypress/e2e/invoices/add-invoice-line-from-pol-w-inactive-budget.cy.js index 9a5eeacb70..7f05aee32c 100644 --- a/cypress/e2e/invoices/add-invoice-line-from-pol-w-inactive-budget.cy.js +++ b/cypress/e2e/invoices/add-invoice-line-from-pol-w-inactive-budget.cy.js @@ -75,7 +75,7 @@ describe('Invoices', () => { it( 'C353572 Saving invoice line from POL with inactive budget (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353572'] }, () => { // Click "Actions" button, Select "New" option // Fill in all the required fields with valid data, Click "Save" button diff --git a/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-dollar.cy.js b/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-dollar.cy.js index 77b56e00b6..aa2697239b 100644 --- a/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-dollar.cy.js +++ b/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-dollar.cy.js @@ -157,7 +157,7 @@ describe('Invoices', () => { it( 'C375998 Approve and pay invoice with added adjustment amount to invoice line (not prorated, related to total as "In addition to") (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375998', 'shiftLeft'] }, () => { Invoices.searchByNumber(firstInvoice.vendorInvoiceNo); Invoices.selectInvoice(firstInvoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-percent.cy.js b/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-percent.cy.js index 965458f408..1a901fe10f 100644 --- a/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-percent.cy.js +++ b/cypress/e2e/invoices/adjustment-amount-to-invoice-line-in-percent.cy.js @@ -155,7 +155,7 @@ describe('Invoices', () => { it( 'C375999 Approve and pay invoice with added adjustment % to invoice line (not prorated, related to total as "In addition to") (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375999', 'shiftLeft'] }, () => { Invoices.searchByNumber(invoice.vendorInvoiceNo); Invoices.selectInvoice(invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FY-order.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FY-order.cy.js index 263d403494..d1b67f5456 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FY-order.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FY-order.cy.js @@ -222,7 +222,7 @@ describe('Invoices', { retries: { runMode: 1 } }, () => { it( 'C388564 Approve and pay invoice created in current FY for previous FY without related order (thunderjet) (TaaS)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C388564'] }, () => { Invoices.createRolloverInvoiceWithFY(invoice, organization.name, firstFiscalYear); Invoices.createInvoiceLineWithFund(invoiceLine, defaultFund); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FYwhen-POL-created-in-previous-FY.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FYwhen-POL-created-in-previous-FY.cy.js index e41e583129..c4762f962d 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FYwhen-POL-created-in-previous-FY.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-created-in-current-FY-for-previous-FYwhen-POL-created-in-previous-FY.cy.js @@ -192,7 +192,7 @@ describe('Invoices', { retries: { runMode: 1 } }, () => { it( 'C396361 Approve and pay invoice created in current FY for previous FY when related order line was created in previous Fiscal Year (thunderjet) (TaaS)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C396361'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js index f9c38cd5ca..9c60fe8516 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js @@ -167,7 +167,7 @@ describe('Invoices', () => { it( 'C388526 Approve and pay invoice created in current FY for previous FY when related order line was created in current FY (thunderjet) (TaaS)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C388526'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-with-added-adjustment-amount-to-invoice-line-not-prorated.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-with-added-adjustment-amount-to-invoice-line-not-prorated.cy.js index ce7e08c0c5..32fdd9f150 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-with-added-adjustment-amount-to-invoice-line-not-prorated.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-with-added-adjustment-amount-to-invoice-line-not-prorated.cy.js @@ -123,7 +123,7 @@ describe('Invoices', () => { it( 'C376007 Approve and pay invoice with added adjustment amount to invoice line (not prorated, related to total as Included in) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C376007'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-with-currency-different-from-default.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-with-currency-different-from-default.cy.js index 7719a36afa..050872682c 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-with-currency-different-from-default.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-with-currency-different-from-default.cy.js @@ -87,7 +87,7 @@ describe('Invoices', () => { it( 'C380406 Approve and pay invoice with currency different from default when "Export to accounting" option is active (thunderjet) (TaaS)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C380406'] }, () => { // Click "Vendor invoice number" link for Invoice from Preconditions Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/approve-and-pay-invoice-with-more-than-50-invoice-lines.cy.js b/cypress/e2e/invoices/approve-and-pay-invoice-with-more-than-50-invoice-lines.cy.js index 07f394a52f..e204317418 100644 --- a/cypress/e2e/invoices/approve-and-pay-invoice-with-more-than-50-invoice-lines.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-invoice-with-more-than-50-invoice-lines.cy.js @@ -177,7 +177,7 @@ describe('Invoices', () => { it( 'C446075 Approve & pay invoice with more than 50 invoice lines (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C446075'] }, () => { // Click on Invoice number link Invoices.searchByNumber(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/approve-and-pay-more-than-one-invoice.cy.js b/cypress/e2e/invoices/approve-and-pay-more-than-one-invoice.cy.js index 219dbed177..238d002638 100644 --- a/cypress/e2e/invoices/approve-and-pay-more-than-one-invoice.cy.js +++ b/cypress/e2e/invoices/approve-and-pay-more-than-one-invoice.cy.js @@ -152,7 +152,7 @@ describe('Invoices', () => { it( 'C366537 Approve & pay more than one invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C366537'] }, () => { Invoices.searchByNumber(firstInvoice.invoiceNumber); Invoices.selectInvoice(firstInvoice.invoiceNumber); diff --git a/cypress/e2e/invoices/approve-invoice-in-previous-FY-and-pay-invoice-in-current FY.cy.js b/cypress/e2e/invoices/approve-invoice-in-previous-FY-and-pay-invoice-in-current FY.cy.js index 92e98a2732..6ae4a3b61a 100644 --- a/cypress/e2e/invoices/approve-invoice-in-previous-FY-and-pay-invoice-in-current FY.cy.js +++ b/cypress/e2e/invoices/approve-invoice-in-previous-FY-and-pay-invoice-in-current FY.cy.js @@ -182,7 +182,7 @@ describe('Invoices', () => { it( 'C388538 Approve invoice in previous FY and pay invoice in current FY (for previous FY) (thunderjet) (TaaS)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C388538'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/approve-invoice-is-disabled.cy.js b/cypress/e2e/invoices/approve-invoice-is-disabled.cy.js index 1e0f2a43c3..dc21f2c270 100644 --- a/cypress/e2e/invoices/approve-invoice-is-disabled.cy.js +++ b/cypress/e2e/invoices/approve-invoice-is-disabled.cy.js @@ -93,7 +93,7 @@ describe('Invoices', () => { isApprovePayEnabled: false, }, ].forEach(({ description, isApprovePayEnabled }) => { - it(description, { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, () => { + it(description, { tags: ['criticalPath', 'thunderjet'] }, () => { setApprovePayValue(isApprovePayEnabled); // Click on "Vendor invoice number" link diff --git a/cypress/e2e/invoices/approve-invoice-when-balance-is-close-to-encumbrance.cy.js b/cypress/e2e/invoices/approve-invoice-when-balance-is-close-to-encumbrance.cy.js index bb891ef169..5372e6c902 100644 --- a/cypress/e2e/invoices/approve-invoice-when-balance-is-close-to-encumbrance.cy.js +++ b/cypress/e2e/invoices/approve-invoice-when-balance-is-close-to-encumbrance.cy.js @@ -86,7 +86,7 @@ describe('Invoices', () => { it( 'C399084 Invoice can be approved when balance is close to the encumbrance available balance (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C399084'] }, () => { // Click invoice line record on invoice Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/approve-invoice-with-payment-credit.cy.js b/cypress/e2e/invoices/approve-invoice-with-payment-credit.cy.js index 90237605e4..0a1717dbf5 100644 --- a/cypress/e2e/invoices/approve-invoice-with-payment-credit.cy.js +++ b/cypress/e2e/invoices/approve-invoice-with-payment-credit.cy.js @@ -1,30 +1,25 @@ -import { ACQUISITION_METHOD_NAMES_IN_PROFILE, ORDER_STATUSES } from '../../support/constants'; -import Budgets from '../../support/fragments/finance/budgets/budgets'; -import BasicOrderLine from '../../support/fragments/orders/basicOrderLine'; -import MaterialTypes from '../../support/fragments/settings/inventory/materialTypes'; -import permissions from '../../support/dictionary/permissions'; +import { + ACQUISITION_METHOD_NAMES_IN_PROFILE, + APPLICATION_NAMES, + LOCATION_NAMES, + ORDER_STATUSES, +} from '../../support/constants'; +import Permissions from '../../support/dictionary/permissions'; +import { Budgets, Funds, Transactions } from '../../support/fragments/finance'; import FinanceHelp from '../../support/fragments/finance/financeHelper'; -import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears'; -import Funds from '../../support/fragments/finance/funds/funds'; -import Ledgers from '../../support/fragments/finance/ledgers/ledgers'; -import Invoices from '../../support/fragments/invoices/invoices'; -import NewInvoice from '../../support/fragments/invoices/newInvoice'; -import NewOrder from '../../support/fragments/orders/newOrder'; -import OrderLines from '../../support/fragments/orders/orderLines'; -import Orders from '../../support/fragments/orders/orders'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; -import NewLocation from '../../support/fragments/settings/tenant/locations/newLocation'; -import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints'; +import { Invoices, NewInvoice } from '../../support/fragments/invoices'; +import { BasicOrderLine, NewOrder, OrderLines, Orders } from '../../support/fragments/orders'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import MaterialTypes from '../../support/fragments/settings/inventory/materialTypes'; import TopMenu from '../../support/fragments/topMenu'; +import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; import Users from '../../support/fragments/users/users'; -describe('ui-invoices: Cancelling approved invoices', () => { - const firstFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; - - const defaultLedger = { ...Ledgers.defaultUiLedger }; - const defaultFund = { ...Funds.defaultUiFund }; - const firstOrder = { +describe('Invoices', () => { + const testData = { + user: {}, + }; + const order = { ...NewOrder.defaultOneTimeOrder, orderType: 'Ongoing', ongoing: { isSubscription: false, manualRenewal: false }, @@ -33,154 +28,125 @@ describe('ui-invoices: Cancelling approved invoices', () => { }; const organization = { ...NewOrganization.defaultUiOrganizations }; const invoice = { ...NewInvoice.defaultUiInvoice }; - const firstBudget = { - ...Budgets.getDefaultBudget(), - allocated: 100, - }; - let user; - let firstOrderNumber; - let servicePointId; - let location; before(() => { cy.getAdminToken(); - FiscalYears.createViaApi(firstFiscalYear).then((firstFiscalYearResponse) => { - firstFiscalYear.id = firstFiscalYearResponse.id; - firstBudget.fiscalYearId = firstFiscalYearResponse.id; - defaultLedger.fiscalYearOneId = firstFiscalYear.id; - Ledgers.createViaApi(defaultLedger).then((ledgerResponse) => { - defaultLedger.id = ledgerResponse.id; - defaultFund.ledgerId = defaultLedger.id; + const { fiscalYear, fund, budget } = Budgets.createBudgetWithFundLedgerAndFYViaApi(); + testData.fiscalYear = fiscalYear; + testData.fund = fund; + testData.budget = budget; - Funds.createViaApi(defaultFund).then((fundResponse) => { - defaultFund.id = fundResponse.fund.id; - firstBudget.fundId = fundResponse.fund.id; - Budgets.createViaApi(firstBudget); - ServicePoints.getViaApi().then((servicePoint) => { - servicePointId = servicePoint[0].id; - NewLocation.createViaApi(NewLocation.getDefaultLocation(servicePointId)).then((res) => { - location = res; + cy.getLocations({ query: `name="${LOCATION_NAMES.MAIN_LIBRARY_UI}"` }).then((locationResp) => { + MaterialTypes.createMaterialTypeViaApi(MaterialTypes.getDefaultMaterialType()).then( + (mtypes) => { + cy.getAcquisitionMethodsApi({ + query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM}"`, + }).then((params) => { + Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { + organization.id = responseOrganizations; + order.vendor = organization.id; - MaterialTypes.createMaterialTypeViaApi(MaterialTypes.getDefaultMaterialType()).then( - (mtypes) => { - cy.getAcquisitionMethodsApi({ - query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM}"`, - }).then((params) => { - // Prepare 2 Open Orders for Rollover - Organizations.createOrganizationViaApi(organization).then( - (responseOrganizations) => { - organization.id = responseOrganizations; - firstOrder.vendor = organization.id; - const firstOrderLine = { - ...BasicOrderLine.defaultOrderLine, - cost: { - listUnitPrice: 20.0, - currency: 'USD', - discountType: 'percentage', - quantityPhysical: 1, - poLineEstimatedPrice: 20.0, - }, - fundDistribution: [ - { code: defaultFund.code, fundId: defaultFund.id, value: 100 }, - ], - locations: [ - { locationId: location.id, quantity: 1, quantityPhysical: 1 }, - ], - acquisitionMethod: params.body.acquisitionMethods[0].id, - physical: { - createInventory: 'Instance, Holding, Item', - materialType: mtypes.body.id, - materialSupplier: responseOrganizations, - volumes: [], - }, - }; - Orders.createOrderViaApi(firstOrder).then((firstOrderResponse) => { - firstOrder.id = firstOrderResponse.id; - firstOrderNumber = firstOrderResponse.poNumber; - firstOrderLine.purchaseOrderId = firstOrderResponse.id; - - OrderLines.createOrderLineViaApi(firstOrderLine); - Orders.updateOrderViaApi({ - ...firstOrderResponse, - workflowStatus: ORDER_STATUSES.OPEN, - }); - }); - }, - ); - }); + const orderLine = { + ...BasicOrderLine.defaultOrderLine, + cost: { + listUnitPrice: 20.0, + currency: 'USD', + discountType: 'percentage', + quantityPhysical: 1, + poLineEstimatedPrice: 20.0, + }, + fundDistribution: [ + { code: testData.fund.code, fundId: testData.fund.id, value: 100 }, + ], + locations: [{ locationId: locationResp.id, quantity: 1, quantityPhysical: 1 }], + acquisitionMethod: params.body.acquisitionMethods[0].id, + physical: { + createInventory: 'Instance, Holding, Item', + materialType: mtypes.body.id, + materialSupplier: responseOrganizations, + volumes: [], }, - ); + }; + Orders.createOrderViaApi(order).then((orderResponse) => { + order.id = orderResponse.id; + testData.orderNumber = orderResponse.poNumber; + orderLine.purchaseOrderId = orderResponse.id; + + OrderLines.createOrderLineViaApi(orderLine); + Orders.updateOrderViaApi({ + ...orderResponse, + workflowStatus: ORDER_STATUSES.OPEN, + }); + }); }); }); - }); - }); + }, + ); }); cy.createTempUser([ - permissions.uiFinanceViewEditCreateFundAndBudget.gui, - permissions.uiInvoicesApproveInvoices.gui, - permissions.uiInvoicesPayInvoices.gui, - permissions.viewEditCreateInvoiceInvoiceLine.gui, + Permissions.uiFinanceViewEditCreateFundAndBudget.gui, + Permissions.uiInvoicesApproveInvoices.gui, + Permissions.uiInvoicesPayInvoices.gui, + Permissions.viewEditCreateInvoiceInvoiceLine.gui, ]).then((userProperties) => { - user = userProperties; - cy.waitForAuthRefresh(() => { - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.invoicesPath, - waiter: Invoices.waitLoading, - }); - }, 20_000); + testData.user = userProperties; + + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.invoicesPath, + waiter: Invoices.waitLoading, + }); }); }); + after(() => { cy.getAdminToken(); Organizations.deleteOrganizationViaApi(organization.id); - Users.deleteViaApi(user.userId); + Users.deleteViaApi(testData.user.userId); }); it( 'C347897 Approve invoice with both payment and credit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C347897'] }, () => { Invoices.createRolloverInvoice(invoice, organization.name); - cy.wait(2000); - Invoices.createInvoiceLinePOLLookUWithSubTotal(firstOrderNumber, '10'); - cy.wait(2000); - Invoices.createInvoiceLinePOLLookUWithSubTotal(firstOrderNumber, '-10'); - cy.wait(2000); - Invoices.createInvoiceLinePOLLookUWithSubTotal(firstOrderNumber, '10'); + Invoices.createInvoiceLinePOLLookUWithSubTotal(testData.orderNumber, '10'); + Invoices.createInvoiceLinePOLLookUWithSubTotal(testData.orderNumber, '-10'); + Invoices.createInvoiceLinePOLLookUWithSubTotal(testData.orderNumber, '10'); cy.wait(2000); Invoices.approveInvoice(); - cy.visit(TopMenu.fundPath); - FinanceHelp.searchByName(defaultFund.name); - Funds.selectFund(defaultFund.name); + + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.FINANCE); + FinanceHelp.searchByName(testData.fund.name); + Funds.selectFund(testData.fund.name); Funds.selectBudgetDetails(); Funds.checkFinancialActivityAndOverages('$10.00', '$10.00', '$0.00', '$0.00', '$20.00'); Funds.viewTransactions(); Funds.selectTransactionInList('Encumbrance'); Funds.varifyDetailsInTransaction( - firstFiscalYear.code, + testData.fiscalYear.code, '($10.00)', - `${firstOrderNumber}-1`, + `${testData.orderNumber}-1`, 'Encumbrance', - `${defaultFund.name} (${defaultFund.code})`, + `${testData.fund.name} (${testData.fund.code})`, ); - cy.visit(TopMenu.invoicesPath); + + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.INVOICES); Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); Invoices.payInvoice(); - cy.visit(TopMenu.fundPath); - FinanceHelp.searchByName(defaultFund.name); - Funds.selectFund(defaultFund.name); - Funds.selectBudgetDetails(); + + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.FINANCE); + Transactions.closeTransactionsPage(); Funds.checkFinancialActivityAndOverages('$10.00', '$0.00', '$20.00', '$10.00', '$20.00'); Funds.viewTransactions(); Funds.selectTransactionInList('Credit'); Funds.varifyDetailsInTransactionFundTo( - firstFiscalYear.code, + testData.fiscalYear.code, '$10.00', invoice.invoiceNumber, 'Credit', - `${defaultFund.name} (${defaultFund.code})`, + `${testData.fund.name} (${testData.fund.code})`, ); }, ); diff --git a/cypress/e2e/invoices/approve-invoice.cy.js b/cypress/e2e/invoices/approve-invoice.cy.js index f38ea669f4..b392577245 100644 --- a/cypress/e2e/invoices/approve-invoice.cy.js +++ b/cypress/e2e/invoices/approve-invoice.cy.js @@ -148,7 +148,7 @@ describe('Invoices', () => { it( 'C10945 Approve invoice (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C10945'] }, () => { Invoices.searchByNumber(invoice.vendorInvoiceNo); Invoices.selectInvoice(invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/attach-file-to-approved-paid-invoice.cy.js b/cypress/e2e/invoices/attach-file-to-approved-paid-invoice.cy.js index 187cad8f1f..e6558fa209 100644 --- a/cypress/e2e/invoices/attach-file-to-approved-paid-invoice.cy.js +++ b/cypress/e2e/invoices/attach-file-to-approved-paid-invoice.cy.js @@ -97,7 +97,7 @@ describe('Invoices', () => { it( 'C360544 Attaching file to approved invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C360544'] }, () => { updateInvoiceStatusAndLogin(INVOICE_STATUSES.APPROVED); @@ -123,7 +123,7 @@ describe('Invoices', () => { it( 'C360546 Attaching files to paid invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C360546'] }, () => { updateInvoiceStatusAndLogin(INVOICE_STATUSES.PAID); diff --git a/cypress/e2e/invoices/cancel-invoice-created-in-current-fy-and-paid-against-previous-fy.cy.js b/cypress/e2e/invoices/cancel-invoice-created-in-current-fy-and-paid-against-previous-fy.cy.js index adc766e43b..352259cbbb 100644 --- a/cypress/e2e/invoices/cancel-invoice-created-in-current-fy-and-paid-against-previous-fy.cy.js +++ b/cypress/e2e/invoices/cancel-invoice-created-in-current-fy-and-paid-against-previous-fy.cy.js @@ -170,7 +170,7 @@ describe('Invoices', () => { it( 'C388563 Cancel invoice created in current FY and paid against previous FY (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C388563'] }, () => { // Click "Vendor invoice number" link for Invoice from Preconditions Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/cancelling-approved-invoices.cy.js b/cypress/e2e/invoices/cancelling-approved-invoices.cy.js index da1871ce01..8534c4c9d1 100644 --- a/cypress/e2e/invoices/cancelling-approved-invoices.cy.js +++ b/cypress/e2e/invoices/cancelling-approved-invoices.cy.js @@ -158,7 +158,7 @@ describe('Invoices', () => { it( 'C350728 Cancelling approved invoices voids payments/credits and Unreleases encumbrances (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350728'] }, () => { Invoices.searchByNumber(defaultInvoice.vendorInvoiceNo); Invoices.selectInvoice(defaultInvoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/cancelling-invoice-creation-from-order.cy.js b/cypress/e2e/invoices/cancelling-invoice-creation-from-order.cy.js index e05e53d5ed..b524a5a28c 100644 --- a/cypress/e2e/invoices/cancelling-invoice-creation-from-order.cy.js +++ b/cypress/e2e/invoices/cancelling-invoice-creation-from-order.cy.js @@ -113,7 +113,7 @@ describe('Invoices', () => { it( 'C357020 Cancelling invoice creation from order (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C357020'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/change-fund-before-approve-invoice.cy.js b/cypress/e2e/invoices/change-fund-before-approve-invoice.cy.js index d9fc4e5400..e4c52e1926 100644 --- a/cypress/e2e/invoices/change-fund-before-approve-invoice.cy.js +++ b/cypress/e2e/invoices/change-fund-before-approve-invoice.cy.js @@ -131,7 +131,7 @@ describe('Invoices', () => { it( 'C353596 Invoice payment is successful if order line fund distribution is changed before invoice approval (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C353596'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/copy-icon-present-invoice-pane.cy.js b/cypress/e2e/invoices/copy-icon-present-invoice-pane.cy.js index 4d3ab932ab..80b6c25b3b 100644 --- a/cypress/e2e/invoices/copy-icon-present-invoice-pane.cy.js +++ b/cypress/e2e/invoices/copy-icon-present-invoice-pane.cy.js @@ -81,7 +81,7 @@ describe('Invoices', () => { it( 'C353944 "Copy" icon is added to invoice number (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353944'] }, () => { // Search for Invoice number from precondition Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/creating-invoice-from-purchase-order.cy.js b/cypress/e2e/invoices/creating-invoice-from-purchase-order.cy.js index 02f480ff54..08cd962751 100644 --- a/cypress/e2e/invoices/creating-invoice-from-purchase-order.cy.js +++ b/cypress/e2e/invoices/creating-invoice-from-purchase-order.cy.js @@ -105,7 +105,7 @@ describe('Invoices', () => { it( 'C357056 Creating invoice from purchase order (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C357056'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/edit-subscription-info-and-dates-after-approve.cy.js b/cypress/e2e/invoices/edit-subscription-info-and-dates-after-approve.cy.js index 3a00cccc3c..92c27246e3 100644 --- a/cypress/e2e/invoices/edit-subscription-info-and-dates-after-approve.cy.js +++ b/cypress/e2e/invoices/edit-subscription-info-and-dates-after-approve.cy.js @@ -100,7 +100,7 @@ describe('Invoices', () => { it( 'C350952 Allow editing of subscription dates and subscription info after an invoice is approved/paid (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350952'] }, () => { cy.getAdminToken(); Approvals.setApprovePayValue(false); diff --git a/cypress/e2e/invoices/filter-invoices.cy.js b/cypress/e2e/invoices/filter-invoices.cy.js index c987d0e183..5697bf1484 100644 --- a/cypress/e2e/invoices/filter-invoices.cy.js +++ b/cypress/e2e/invoices/filter-invoices.cy.js @@ -214,7 +214,7 @@ describe('Invoices', () => { ].forEach((filter) => { it( `C6724 Test the invoice filters: ${filter.name} (thunderjet)`, - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6724'] }, () => { filter.filterActions(); Invoices.selectInvoice(firstInvoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/fiscal-year-is-not-displayed.cy.js b/cypress/e2e/invoices/fiscal-year-is-not-displayed.cy.js index ef2ed23e92..b2181e27d8 100644 --- a/cypress/e2e/invoices/fiscal-year-is-not-displayed.cy.js +++ b/cypress/e2e/invoices/fiscal-year-is-not-displayed.cy.js @@ -74,7 +74,7 @@ describe('Invoices', { retries: { runMode: 1 } }, () => { it( 'C387533 "Fiscal year" field is NOT displayed and can NOT be selected by user without "Invoice: Pay invoices in a different fiscal year" permission when creating and editing invoice (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C387533'] }, () => { // #1 Click "Actions" button on the second "Invoices" pane -> select "New" option const InvoiceEditForm = Invoices.openInvoiceEditForm({ createNew: true }); diff --git a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-approved.cy.js b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-approved.cy.js index 5af80c09e2..bdb44c5939 100644 --- a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-approved.cy.js +++ b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-approved.cy.js @@ -83,7 +83,7 @@ describe('Invoices', () => { it( 'C387534 "Fiscal year" field is not editable for approved invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C387534'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-cancelled.cy.js b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-cancelled.cy.js index a6bb172248..9e3d60f0bc 100644 --- a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-cancelled.cy.js +++ b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-cancelled.cy.js @@ -84,7 +84,7 @@ describe('Invoices', () => { it( 'C387537 "Fiscal year" field is not editable for cancelled invoice (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C387537'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-paid.cy.js b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-paid.cy.js index aaf41dae82..55628cdcf9 100644 --- a/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-paid.cy.js +++ b/cypress/e2e/invoices/fiscal-year-is-not-etitable-if-invoice-is-paid.cy.js @@ -83,7 +83,7 @@ describe('Invoices', () => { it( 'C387536 "Fiscal year" field is not editable for paid invoice (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C387536'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/fiscal-year-specifies-expecse-class-selection.cy.js b/cypress/e2e/invoices/fiscal-year-specifies-expecse-class-selection.cy.js index a7f64fd3ea..f27bc03a31 100644 --- a/cypress/e2e/invoices/fiscal-year-specifies-expecse-class-selection.cy.js +++ b/cypress/e2e/invoices/fiscal-year-specifies-expecse-class-selection.cy.js @@ -160,7 +160,7 @@ describe('Invoices', () => { it( 'C396400 Select Expense class related to Fiscal year specified in invoice (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C396400'] }, () => { // Click "Actions" button on the second "Invoices" pane -> select "New" option const InvoiceEditForm = Invoices.openInvoiceEditForm({ createNew: true }); diff --git a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-1.cy.js b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-1.cy.js index a43d624f75..478b5f63eb 100644 --- a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-1.cy.js +++ b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-1.cy.js @@ -102,7 +102,7 @@ describe('Invoices', () => { it( 'C400612 Initial encumbrance amount remains the same as it was before payment after cancelling one of related paid invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C400612'] }, () => { updateInvoiceStatusAndLogin({ invoice: testData.invoices[1], status: INVOICE_STATUSES.PAID }); diff --git a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-2.cy.js b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-2.cy.js index 052181a904..a0004de3ce 100644 --- a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-2.cy.js +++ b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-2.cy.js @@ -102,7 +102,7 @@ describe('Invoices', () => { it( 'C400614 Initial encumbrance amount remains the same as it was before payment after cancelling related paid invoice (another related approved invoice exists) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C400614'] }, () => { updateInvoiceStatusAndLogin({ invoice: testData.invoices[1], diff --git a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-3.cy.js b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-3.cy.js index ca306ac6f5..652e2712db 100644 --- a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-3.cy.js +++ b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-3.cy.js @@ -101,7 +101,7 @@ describe('Invoices', () => { }); it( 'C400615 Initial encumbrance amount remains the same as it was before payment after cancelling related approved invoice (another related paid invoice exists) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C400615'] }, () => { updateInvoiceStatusAndLogin({ invoice: testData.invoices[1], diff --git a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-4.cy.js b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-4.cy.js index 4817925821..355468e43c 100644 --- a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-4.cy.js +++ b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling-4.cy.js @@ -100,7 +100,7 @@ describe('Invoices', () => { it( 'C400618 Initial encumbrance amount remains the same as it was before payment after cancelling related paid credit invoice (another related paid invoice exists) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C400618'] }, () => { updateInvoiceStatusAndLogin({ invoice: testData.invoices[1], status: INVOICE_STATUSES.PAID }); diff --git a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling.cy.js b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling.cy.js index 3862f734a6..47e35f6ac9 100644 --- a/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling.cy.js +++ b/cypress/e2e/invoices/initial-encumbrance-remain-the-same-after-cancelling.cy.js @@ -84,7 +84,7 @@ describe('Invoices', () => { it( 'C399092 Initial encumbrance amount remains the same as it was before payment after cancelling related paid invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C399092'] }, () => { // Open invoice from precondition Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/invoice-with-fund-different-from-related-pol-can-be-approved.cy.js b/cypress/e2e/invoices/invoice-with-fund-different-from-related-pol-can-be-approved.cy.js index 7c5e6de7f4..bdade9a272 100644 --- a/cypress/e2e/invoices/invoice-with-fund-different-from-related-pol-can-be-approved.cy.js +++ b/cypress/e2e/invoices/invoice-with-fund-different-from-related-pol-can-be-approved.cy.js @@ -139,7 +139,7 @@ describe('Invoices', () => { it( 'C378895 An invoice with fund distribution different from related PO line can be approved (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C378895'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/invoices/invoices-create-credit-invoice.cy.js b/cypress/e2e/invoices/invoices-create-credit-invoice.cy.js index d88b4dbb86..a38d1b7874 100644 --- a/cypress/e2e/invoices/invoices-create-credit-invoice.cy.js +++ b/cypress/e2e/invoices/invoices-create-credit-invoice.cy.js @@ -42,7 +42,7 @@ describe('Invoices', () => { it( 'C343209 Create, approve and pay a credit invoice (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C343209'] }, () => { Invoices.createDefaultInvoice(invoice, vendorPrimaryAddress); Invoices.createInvoiceLine(invoiceLine); diff --git a/cypress/e2e/invoices/invoices-manually-create-line-from-pol.cy.js b/cypress/e2e/invoices/invoices-manually-create-line-from-pol.cy.js index 8ca1c8a432..6b99012a95 100644 --- a/cypress/e2e/invoices/invoices-manually-create-line-from-pol.cy.js +++ b/cypress/e2e/invoices/invoices-manually-create-line-from-pol.cy.js @@ -87,7 +87,7 @@ describe( it( 'C2327 Create invoice line based on purchase order line (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C2327'] }, () => { Orders.createOrderWithOrderLineViaApi(order, orderLine).then(({ poNumber }) => { cy.loginAsAdmin({ path: TopMenu.invoicesPath, waiter: Invoices.waitLoading }); diff --git a/cypress/e2e/invoices/invoices-manually-create-line.cy.js b/cypress/e2e/invoices/invoices-manually-create-line.cy.js index 2b0bb3c498..4ff3b959ed 100644 --- a/cypress/e2e/invoices/invoices-manually-create-line.cy.js +++ b/cypress/e2e/invoices/invoices-manually-create-line.cy.js @@ -31,7 +31,7 @@ describe('Invoices', () => { it( 'C2326 Manually create invoice line (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C2326'] }, () => { Invoices.createDefaultInvoice(invoice, vendorPrimaryAddress); Invoices.createInvoiceLine(invoiceLine); diff --git a/cypress/e2e/invoices/invoices-manually-create.cy.js b/cypress/e2e/invoices/invoices-manually-create.cy.js index 591f0eb416..badb9ce04f 100644 --- a/cypress/e2e/invoices/invoices-manually-create.cy.js +++ b/cypress/e2e/invoices/invoices-manually-create.cy.js @@ -38,7 +38,7 @@ describe( it( 'C2299 Manually Create Invoice (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C2299'] }, () => { Invoices.createDefaultInvoice(invoice, vendorPrimaryAddress); Invoices.checkCreatedInvoice(invoice, vendorPrimaryAddress); diff --git a/cypress/e2e/invoices/invoices-test-pol-search-plugin.cy.js b/cypress/e2e/invoices/invoices-test-pol-search-plugin.cy.js index 6d171c7cfa..5cc4ff9803 100644 --- a/cypress/e2e/invoices/invoices-test-pol-search-plugin.cy.js +++ b/cypress/e2e/invoices/invoices-test-pol-search-plugin.cy.js @@ -74,7 +74,7 @@ describe('Invoices', () => { it( 'C350389 Test purchase order line plugin search (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C350389'] }, () => { Invoices.getSearchParamsMap(createdOrderNumber, orderLine); Invoices.createSpecialInvoice(invoice, vendorPrimaryAddress); diff --git a/cypress/e2e/invoices/only-active-account-numbers-displayed-when-create-invoice-line.cy.js b/cypress/e2e/invoices/only-active-account-numbers-displayed-when-create-invoice-line.cy.js index 0498d83945..654b332389 100644 --- a/cypress/e2e/invoices/only-active-account-numbers-displayed-when-create-invoice-line.cy.js +++ b/cypress/e2e/invoices/only-active-account-numbers-displayed-when-create-invoice-line.cy.js @@ -79,7 +79,7 @@ describe('Invoices', () => { it( 'C413346 Only active account numbers are displayed in dropdown list when create invoice line (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C413346'] }, + { tags: ['criticalPath', 'thunderjet', 'C413346'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/only-active-account-numbers-displayed-when-edit-invoice-line.cy.js b/cypress/e2e/invoices/only-active-account-numbers-displayed-when-edit-invoice-line.cy.js index 806c2bd6d5..8670cb465d 100644 --- a/cypress/e2e/invoices/only-active-account-numbers-displayed-when-edit-invoice-line.cy.js +++ b/cypress/e2e/invoices/only-active-account-numbers-displayed-when-edit-invoice-line.cy.js @@ -89,7 +89,7 @@ describe('Invoices', () => { it( 'C413347 Only active account numbers are displayed in dropdown list when edit invoice line (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C413347'] }, + { tags: ['criticalPath', 'thunderjet', 'C413347'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/pay-invoice-for-previous-fy.cy.js b/cypress/e2e/invoices/pay-invoice-for-previous-fy.cy.js index 0745c11313..59cc3fe111 100644 --- a/cypress/e2e/invoices/pay-invoice-for-previous-fy.cy.js +++ b/cypress/e2e/invoices/pay-invoice-for-previous-fy.cy.js @@ -175,8 +175,8 @@ describe('Invoices', { retries: { runMode: 1 } }, () => { }); it( - 'C388520: Approve and pay invoice created in current FY for previous FY when related order line was created in previous FY (thunderjet) (TaaS)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + 'C388520 Approve and pay invoice created in current FY for previous FY when related order line was created in previous FY (thunderjet) (TaaS)', + { tags: ['criticalPathFlaky', 'thunderjet', 'C388520'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -391,7 +391,7 @@ describe('Invoices', { retries: { runMode: 1 } }, () => { it( 'C388545 Approve and pay invoice created in current FY when related order line was created in previous FY and user does not have "Invoice: Pay invoices in a different fiscal year" permission (thunderjet) (TaaS)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C388545'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/invoices/pay-invoice-with-multiple-expense-classes.cy.js b/cypress/e2e/invoices/pay-invoice-with-multiple-expense-classes.cy.js index 552f6ce5fc..835469e400 100644 --- a/cypress/e2e/invoices/pay-invoice-with-multiple-expense-classes.cy.js +++ b/cypress/e2e/invoices/pay-invoice-with-multiple-expense-classes.cy.js @@ -110,7 +110,7 @@ describe('Invoices', () => { it( 'C15859 Pay an invoice with multiple "Expense classes" assigned to it (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C15859'] }, () => { Invoices.createRolloverInvoice(invoice, organization.name); Invoices.createInvoiceLineFromPol(firstOrderNumber); diff --git a/cypress/e2e/invoices/pay-invoice.cy.js b/cypress/e2e/invoices/pay-invoice.cy.js index ba4c0e4ef4..ce9ee9beb2 100644 --- a/cypress/e2e/invoices/pay-invoice.cy.js +++ b/cypress/e2e/invoices/pay-invoice.cy.js @@ -87,27 +87,23 @@ describe('Invoices', () => { Users.deleteViaApi(user.userId); }); - it( - 'C3453 Pay invoice (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - Invoices.searchByNumber(invoice.invoiceNumber); - Invoices.selectInvoice(invoice.invoiceNumber); - Invoices.payInvoice(); - // check transactions after payment - TopMenuNavigation.navigateToApp('Finance'); - Helper.searchByName(defaultFund.name); - Funds.selectFund(defaultFund.name); - Funds.selectBudgetDetails(); - Funds.openTransactions(); - Funds.selectTransactionInList('Credit'); - Funds.varifyDetailsInTransactionFundTo( - defaultFiscalYear.code, - '$100.00', - invoice.invoiceNumber, - 'Credit', - `${defaultFund.name} (${defaultFund.code})`, - ); - }, - ); + it('C3453 Pay invoice (thunderjet)', { tags: ['criticalPath', 'thunderjet', 'C3453'] }, () => { + Invoices.searchByNumber(invoice.invoiceNumber); + Invoices.selectInvoice(invoice.invoiceNumber); + Invoices.payInvoice(); + // check transactions after payment + TopMenuNavigation.navigateToApp('Finance'); + Helper.searchByName(defaultFund.name); + Funds.selectFund(defaultFund.name); + Funds.selectBudgetDetails(); + Funds.openTransactions(); + Funds.selectTransactionInList('Credit'); + Funds.varifyDetailsInTransactionFundTo( + defaultFiscalYear.code, + '$100.00', + invoice.invoiceNumber, + 'Credit', + `${defaultFund.name} (${defaultFund.code})`, + ); + }); }); diff --git a/cypress/e2e/invoices/release-encumbrance-checkbox-is-not-checked.cy.js b/cypress/e2e/invoices/release-encumbrance-checkbox-is-not-checked.cy.js index 6b86769044..6b86a455a9 100644 --- a/cypress/e2e/invoices/release-encumbrance-checkbox-is-not-checked.cy.js +++ b/cypress/e2e/invoices/release-encumbrance-checkbox-is-not-checked.cy.js @@ -68,7 +68,7 @@ describe('Invoices', () => { it( 'C389582 "Release encumbrance" checkbox is NOT checked after creating new blank invoice line (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C389582'] }, () => { // Open invoice by clicking on its "Vendor invoice number" link on "Invoices" pane Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/remove-invoice-number-from-invoice-line-column.cy.js b/cypress/e2e/invoices/remove-invoice-number-from-invoice-line-column.cy.js index de42f188f6..09c0915773 100644 --- a/cypress/e2e/invoices/remove-invoice-number-from-invoice-line-column.cy.js +++ b/cypress/e2e/invoices/remove-invoice-number-from-invoice-line-column.cy.js @@ -62,7 +62,7 @@ describe('Invoices', () => { it( 'C350949 Remove "Folio invoice number" from display in invoice line column (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350949'] }, () => { // Click "Actions" button, Select "New" option // Fill in required fields with valid data and click "Save & close" button diff --git a/cypress/e2e/invoices/save-invoice-FY-after-fund-change.cy.js b/cypress/e2e/invoices/save-invoice-FY-after-fund-change.cy.js index 435aaf86a6..0509e4dfe9 100644 --- a/cypress/e2e/invoices/save-invoice-FY-after-fund-change.cy.js +++ b/cypress/e2e/invoices/save-invoice-FY-after-fund-change.cy.js @@ -195,7 +195,7 @@ describe('Invoices', () => { it( 'C388645 Save invoice fiscal year after fund distribution change if FY was undefined and pay invoice against previous FY (thunderjet) (TaaS)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C388645'] }, () => { Invoices.createRolloverInvoice(invoice, organization.name); Invoices.createInvoiceLineFromPol(orderNumber); diff --git a/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js b/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js index 65b08accf7..6c0921aa71 100644 --- a/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js +++ b/cypress/e2e/invoices/save-invoice-fiscal-year-after-fund-distribution-change.cy.js @@ -170,7 +170,7 @@ describe('Invoices', () => { it( 'C396360 Save invoice fiscal year after fund distribution change to fund using different ledger if FY was undefined (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C396360'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/save-invoise-fiscal-year-after-adding-adjustment.cy.js b/cypress/e2e/invoices/save-invoise-fiscal-year-after-adding-adjustment.cy.js index 76cff499ae..768f951c54 100644 --- a/cypress/e2e/invoices/save-invoise-fiscal-year-after-adding-adjustment.cy.js +++ b/cypress/e2e/invoices/save-invoise-fiscal-year-after-adding-adjustment.cy.js @@ -195,7 +195,7 @@ describe('Invoices', () => { it( 'C396373 Save invoice fiscal year after adding adjustment on invoice level if FY was undefined and pay against previous FY (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C396373'] }, () => { Invoices.createRolloverInvoiceWithAjustmentAndFund( invoice, diff --git a/cypress/e2e/invoices/search-invoices.cy.js b/cypress/e2e/invoices/search-invoices.cy.js index 7a56ed3635..388d39a1d8 100644 --- a/cypress/e2e/invoices/search-invoices.cy.js +++ b/cypress/e2e/invoices/search-invoices.cy.js @@ -134,7 +134,7 @@ describe('Invoices', () => { it( 'C6723 Test the invoice searches (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6723'] }, () => { Invoices.searchByParameter('All', invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/settings/voucher-export-not-present-in-actions-if-no-permissions.cy.js b/cypress/e2e/invoices/settings/voucher-export-not-present-in-actions-if-no-permissions.cy.js index 69b9c7b3bb..b521bfc313 100644 --- a/cypress/e2e/invoices/settings/voucher-export-not-present-in-actions-if-no-permissions.cy.js +++ b/cypress/e2e/invoices/settings/voucher-export-not-present-in-actions-if-no-permissions.cy.js @@ -97,7 +97,7 @@ describe('Invoices', () => { it( 'C353222 Negative: Run batch export from full screen view with NO Voucher export permission (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353222'] }, () => { // Search "Vendor invoice number" from precondition Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/test-acquisition-unit-for-invoices.cy.js b/cypress/e2e/invoices/test-acquisition-unit-for-invoices.cy.js index d16bd7bd9e..857b17558d 100644 --- a/cypress/e2e/invoices/test-acquisition-unit-for-invoices.cy.js +++ b/cypress/e2e/invoices/test-acquisition-unit-for-invoices.cy.js @@ -55,7 +55,7 @@ describe('Invoices', () => { it( 'C163930 Test acquisition unit restrictions for Invoice records (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C163930'] }, () => { cy.loginAsAdmin({ path: SettingsMenu.acquisitionUnitsPath, diff --git a/cypress/e2e/invoices/update-accordion-labels-and-logic-on-invoice.cy.js b/cypress/e2e/invoices/update-accordion-labels-and-logic-on-invoice.cy.js index a14214b0d0..8fc105495f 100644 --- a/cypress/e2e/invoices/update-accordion-labels-and-logic-on-invoice.cy.js +++ b/cypress/e2e/invoices/update-accordion-labels-and-logic-on-invoice.cy.js @@ -83,7 +83,7 @@ describe('Invoices', () => { it( 'C350937 Update accordion labels and logic on Invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350937'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/update-exchange-rates-on-invoice-lines-with-multiple-funds.cy.js b/cypress/e2e/invoices/update-exchange-rates-on-invoice-lines-with-multiple-funds.cy.js index 1e4b01cd52..4ee8829da6 100644 --- a/cypress/e2e/invoices/update-exchange-rates-on-invoice-lines-with-multiple-funds.cy.js +++ b/cypress/e2e/invoices/update-exchange-rates-on-invoice-lines-with-multiple-funds.cy.js @@ -155,7 +155,7 @@ describe('Invoices', () => { it( 'C378881 Update exchange rates on invoice lines with multiple funds (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C378881'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/user-is-not-able-to-pay-previously-approved-invoice.cy.js b/cypress/e2e/invoices/user-is-not-able-to-pay-previously-approved-invoice.cy.js index 7d771b2181..299210fbf8 100644 --- a/cypress/e2e/invoices/user-is-not-able-to-pay-previously-approved-invoice.cy.js +++ b/cypress/e2e/invoices/user-is-not-able-to-pay-previously-approved-invoice.cy.js @@ -128,7 +128,7 @@ describe('Invoices', () => { it( 'C397330 User is not able to pay previously approved invoice when related order was unopened (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C397330'] }, () => { Invoices.searchByNumber(invoice.invoiceNumber); Invoices.selectInvoice(invoice.invoiceNumber); diff --git a/cypress/e2e/invoices/vendor-code-displays.cy.js b/cypress/e2e/invoices/vendor-code-displays.cy.js index e9d6943cc8..03c3d959c6 100644 --- a/cypress/e2e/invoices/vendor-code-displays.cy.js +++ b/cypress/e2e/invoices/vendor-code-displays.cy.js @@ -80,7 +80,7 @@ describe('Invoices', () => { it( 'C359171 Vendor code displays rather than Vendor name in the invoice UI (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C359171'] }, () => { Invoices.searchByNumber(testData.invoice.vendorInvoiceNo); Invoices.selectInvoice(testData.invoice.vendorInvoiceNo); diff --git a/cypress/e2e/invoices/vendor-invoice-number-is-hyperlink.cy.js b/cypress/e2e/invoices/vendor-invoice-number-is-hyperlink.cy.js index 4c02831159..fe57a16ca7 100644 --- a/cypress/e2e/invoices/vendor-invoice-number-is-hyperlink.cy.js +++ b/cypress/e2e/invoices/vendor-invoice-number-is-hyperlink.cy.js @@ -78,8 +78,8 @@ describe('Invoices', () => { }); it( - 'C369085 - Invoices | Results List | Verify that value in "Vendor invoice number" column is hyperlink (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C369085 Invoices | Results List | Verify that value in "Vendor invoice number" column is hyperlink (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C369085'] }, () => { Invoices.selectStatusFilter(INVOICE_STATUSES.OPEN); InvoiceView.verifyInvoicesList(); diff --git a/cypress/e2e/notes/item-notes.cy.js b/cypress/e2e/notes/item-notes.cy.js index ba545ac14b..2f1c2f6cbe 100644 --- a/cypress/e2e/notes/item-notes.cy.js +++ b/cypress/e2e/notes/item-notes.cy.js @@ -48,34 +48,27 @@ describe('Inventory', () => { Locations.deleteViaApi(testData.defaultLocation); }); - it( - 'C631 Item notes (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C631', 'eurekaPhase1'] }, - () => { - // #1 Go to the **Inventory** app and search for your title. Click on the instance record and select a hyperlinked barcode from the **Item: barcode** table that will be visible in the rightmost pane - InventorySearchAndFilter.switchToItem(); - InventorySearchAndFilter.searchByParameter( - 'Barcode', - testData.folioInstances[0].barcodes[0], - ); - ItemRecordView.waitLoading(); - // #2 Note the presence or lack of fields under the **Item notes** heading - ItemRecordView.checkItemNote('No value set-', 'No value set-'); - // #3 Click the caret to the right of the **Item record [Status]** at the top of the page and select **Edit** - ItemRecordView.openItemEditForm(testData.folioInstances[0].instanceTitle); - // #4 Click **Add note** under the **Item notes** heading to display a set of note fields. Choose a **Note type** from the dropdown, enter a value into the **Note** field and select or skip the **Staff only** checkbox. Add several notes with different combinations of values - ItemRecordEdit.addNotes([itemNote]); - // #5 Click **Save and close** when you have finished adding notes - ItemRecordEdit.saveAndClose(); - ItemRecordView.checkItemNote(itemNote.text, 'Yes', itemNote.noteType); - // #6 Click the caret to the right of the **Item record [Status]** at the top of the page and select **Edit** - ItemRecordView.openItemEditForm(testData.folioInstances[0].instanceTitle); - // #7 Click the trash can icon next to any of the sets of note fields to delete a note - ItemRecordEdit.deleteNote(); - // #8 Click **Save and close** after deleting a note - ItemRecordEdit.saveAndClose(); - ItemRecordView.checkItemNote('No value set-', 'No value set-'); - }, - ); + it('C631 Item notes (folijet) (TaaS)', { tags: ['extendedPath', 'folijet', 'C631'] }, () => { + // #1 Go to the **Inventory** app and search for your title. Click on the instance record and select a hyperlinked barcode from the **Item: barcode** table that will be visible in the rightmost pane + InventorySearchAndFilter.switchToItem(); + InventorySearchAndFilter.searchByParameter('Barcode', testData.folioInstances[0].barcodes[0]); + ItemRecordView.waitLoading(); + // #2 Note the presence or lack of fields under the **Item notes** heading + ItemRecordView.checkItemNote('No value set-', 'No value set-'); + // #3 Click the caret to the right of the **Item record [Status]** at the top of the page and select **Edit** + ItemRecordView.openItemEditForm(testData.folioInstances[0].instanceTitle); + // #4 Click **Add note** under the **Item notes** heading to display a set of note fields. Choose a **Note type** from the dropdown, enter a value into the **Note** field and select or skip the **Staff only** checkbox. Add several notes with different combinations of values + ItemRecordEdit.addNotes([itemNote]); + // #5 Click **Save and close** when you have finished adding notes + ItemRecordEdit.saveAndClose(); + ItemRecordView.checkItemNote(itemNote.text, 'Yes', itemNote.noteType); + // #6 Click the caret to the right of the **Item record [Status]** at the top of the page and select **Edit** + ItemRecordView.openItemEditForm(testData.folioInstances[0].instanceTitle); + // #7 Click the trash can icon next to any of the sets of note fields to delete a note + ItemRecordEdit.deleteNote(); + // #8 Click **Save and close** after deleting a note + ItemRecordEdit.saveAndClose(); + ItemRecordView.checkItemNote('No value set-', 'No value set-'); + }); }); }); diff --git a/cypress/e2e/orders/add-cancel-po-and-display-indication.cy.js b/cypress/e2e/orders/add-cancel-po-and-display-indication.cy.js index f94e29a392..6e3b7cea09 100644 --- a/cypress/e2e/orders/add-cancel-po-and-display-indication.cy.js +++ b/cypress/e2e/orders/add-cancel-po-and-display-indication.cy.js @@ -119,7 +119,7 @@ describe('Fiscal Year Rollover', () => { it( 'C353546 Add cancel PO action and display indication that PO is canceled (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353546'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/adding-donor-information-to-new-pol.cy.js b/cypress/e2e/orders/adding-donor-information-to-new-pol.cy.js index 6c49f4d770..4f9acc1ebd 100644 --- a/cypress/e2e/orders/adding-donor-information-to-new-pol.cy.js +++ b/cypress/e2e/orders/adding-donor-information-to-new-pol.cy.js @@ -84,8 +84,8 @@ describe('Orders', () => { }); it( - 'C422251: Adding donor information to a new PO line (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + 'C422251 Adding donor information to a new PO line (thunderjet) (TaaS)', + { tags: ['criticalPath', 'thunderjet', 'C422251'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/adding-funds-to-POL-with-different-expense-classes.cy.js b/cypress/e2e/orders/adding-funds-to-POL-with-different-expense-classes.cy.js index cd1e321ccf..5aa281fd27 100644 --- a/cypress/e2e/orders/adding-funds-to-POL-with-different-expense-classes.cy.js +++ b/cypress/e2e/orders/adding-funds-to-POL-with-different-expense-classes.cy.js @@ -100,7 +100,7 @@ describe('Orders', () => { it( 'C399087 Adding same fund distribution with different expense class in the POL for unopened order (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C399087'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/blocked-when-PO-line-has-related-approved-invoice.cy.js b/cypress/e2e/orders/blocked-when-PO-line-has-related-approved-invoice.cy.js index 110cddbf2c..cfb1efef1f 100644 --- a/cypress/e2e/orders/blocked-when-PO-line-has-related-approved-invoice.cy.js +++ b/cypress/e2e/orders/blocked-when-PO-line-has-related-approved-invoice.cy.js @@ -166,7 +166,7 @@ describe('Orders', () => { it( 'C368485 Editing fund distribution is blocked when PO line has related approved invoice (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C368485'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/can-not-be-delete-pol-and-order.cy.js b/cypress/e2e/orders/can-not-be-delete-pol-and-order.cy.js index 7c0bf41787..878adccef4 100644 --- a/cypress/e2e/orders/can-not-be-delete-pol-and-order.cy.js +++ b/cypress/e2e/orders/can-not-be-delete-pol-and-order.cy.js @@ -147,7 +147,7 @@ describe('Orders', () => { it( 'C375962 Order (line) linked to Invoice can not be deleted (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C375962'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/change-fund-in-pol-with-paid-invoices-in-previous-and-current-fiscal-years.cy.js b/cypress/e2e/orders/change-fund-in-pol-with-paid-invoices-in-previous-and-current-fiscal-years.cy.js index e7a6f4459b..6a24b254c5 100644 --- a/cypress/e2e/orders/change-fund-in-pol-with-paid-invoices-in-previous-and-current-fiscal-years.cy.js +++ b/cypress/e2e/orders/change-fund-in-pol-with-paid-invoices-in-previous-and-current-fiscal-years.cy.js @@ -225,7 +225,7 @@ describe('Orders', () => { it( 'C404376 Change fund distribution when PO line has related paid invoices in previous and current fiscal years (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C404376'] }, () => { TopMenuNavigation.navigateToApp('Orders'); Orders.selectOrdersPane(); diff --git a/cypress/e2e/orders/change-location-during-receiving.cy.js b/cypress/e2e/orders/change-location-during-receiving.cy.js index 943fbc33ea..92fad37533 100644 --- a/cypress/e2e/orders/change-location-during-receiving.cy.js +++ b/cypress/e2e/orders/change-location-during-receiving.cy.js @@ -14,115 +14,117 @@ import InventoryInstance from '../../support/fragments/inventory/inventoryInstan import InventoryInstances from '../../support/fragments/inventory/inventoryInstances'; describe( - 'orders: Receive piece from Order', + 'Orders', { retries: { runMode: 1, }, }, () => { - let order; - let organization; - let orderLineUI; - let user; - let orderNumber; - let firstLocation; - let secondLocation; - const displaySummary = 'autotestCaption'; + describe('Receiving and Check-in', () => { + let order; + let organization; + let orderLineUI; + let user; + let orderNumber; + let firstLocation; + let secondLocation; + const displaySummary = 'autotestCaption'; - beforeEach(() => { - order = { ...NewOrder.defaultOneTimeOrder, approved: true }; - organization = { ...NewOrganization.defaultUiOrganizations }; + beforeEach(() => { + order = { ...NewOrder.defaultOneTimeOrder, approved: true }; + organization = { ...NewOrganization.defaultUiOrganizations }; - cy.getAdminToken(); + cy.getAdminToken(); - InventoryInstances.getLocations({ limit: 2 }).then((res) => { - [firstLocation, secondLocation] = res; + InventoryInstances.getLocations({ limit: 2 }).then((res) => { + [firstLocation, secondLocation] = res; - cy.getDefaultMaterialType().then((mtype) => { - cy.getAcquisitionMethodsApi({ - query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM}"`, - }).then((params) => { - // Prepare 2 Open Orders for Rollover - Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { - organization.id = responseOrganizations; - order.vendor = organization.id; - const orderLine = { - ...BasicOrderLine.defaultOrderLine, - id: uuid(), - cost: { - listUnitPrice: 200.0, - currency: 'USD', - discountType: 'percentage', - quantityPhysical: 1, - poLineEstimatedPrice: 200.0, - }, - fundDistribution: [], - locations: [{ locationId: firstLocation.id, quantity: 1, quantityPhysical: 1 }], - acquisitionMethod: params.body.acquisitionMethods[0].id, - physical: { - createInventory: 'Instance, Holding, Item', - materialType: mtype.id, - materialSupplier: responseOrganizations, - volumes: [], - }, - }; - Orders.createOrderViaApi(order).then((orderResponse) => { - order.id = orderResponse.id; - orderNumber = orderResponse.poNumber; - orderLine.purchaseOrderId = orderResponse.id; - orderLineUI = orderLine; - OrderLines.createOrderLineViaApi(orderLine); - Orders.updateOrderViaApi({ - ...orderResponse, - workflowStatus: ORDER_STATUSES.OPEN, + cy.getDefaultMaterialType().then((mtype) => { + cy.getAcquisitionMethodsApi({ + query: `value="${ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM}"`, + }).then((params) => { + // Prepare 2 Open Orders for Rollover + Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { + organization.id = responseOrganizations; + order.vendor = organization.id; + const orderLine = { + ...BasicOrderLine.defaultOrderLine, + id: uuid(), + cost: { + listUnitPrice: 200.0, + currency: 'USD', + discountType: 'percentage', + quantityPhysical: 1, + poLineEstimatedPrice: 200.0, + }, + fundDistribution: [], + locations: [{ locationId: firstLocation.id, quantity: 1, quantityPhysical: 1 }], + acquisitionMethod: params.body.acquisitionMethods[0].id, + physical: { + createInventory: 'Instance, Holding, Item', + materialType: mtype.id, + materialSupplier: responseOrganizations, + volumes: [], + }, + }; + Orders.createOrderViaApi(order).then((orderResponse) => { + order.id = orderResponse.id; + orderNumber = orderResponse.poNumber; + orderLine.purchaseOrderId = orderResponse.id; + orderLineUI = orderLine; + OrderLines.createOrderLineViaApi(orderLine); + Orders.updateOrderViaApi({ + ...orderResponse, + workflowStatus: ORDER_STATUSES.OPEN, + }); }); }); }); }); }); - }); - cy.createTempUser([ - permissions.uiOrdersView.gui, - permissions.uiOrdersEdit.gui, - permissions.uiInventoryViewInstances.gui, - permissions.uiReceivingViewEditCreate.gui, - ]).then((userProperties) => { - user = userProperties; - cy.waitForAuthRefresh(() => { - cy.login(user.username, user.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + cy.createTempUser([ + permissions.uiOrdersView.gui, + permissions.uiOrdersEdit.gui, + permissions.uiInventoryViewInstances.gui, + permissions.uiReceivingViewEditCreate.gui, + ]).then((userProperties) => { + user = userProperties; + cy.waitForAuthRefresh(() => { + cy.login(user.username, user.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); }); - }); - afterEach(() => { - cy.getAdminToken(); - Orders.deleteOrderViaApi(order.id); - Organizations.deleteOrganizationViaApi(organization.id); - Users.deleteViaApi(user.userId); - }); + afterEach(() => { + cy.getAdminToken(); + Orders.deleteOrderViaApi(order.id); + Organizations.deleteOrganizationViaApi(organization.id); + Users.deleteViaApi(user.userId); + }); - it( - 'C9177 Change location during receiving (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, - () => { - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - // Receiving part - Orders.receiveOrderViaActions(); - Receiving.selectFromResultsList(orderLineUI.titleOrPackage); - Receiving.receiveAndChangeLocation(0, displaySummary, secondLocation.name); + it( + 'C9177 Change location during receiving (thunderjet)', + { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'C9177'] }, + () => { + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + // Receiving part + Orders.receiveOrderViaActions(); + Receiving.selectFromResultsList(orderLineUI.titleOrPackage); + Receiving.receiveAndChangeLocation(0, displaySummary, secondLocation.name); - Receiving.checkReceived(0, displaySummary); - Receiving.selectInstanceInReceive(); - InventoryInstance.checkInstanceTitle(orderLineUI.titleOrPackage); - InventoryInstance.openHoldingsAccordion(secondLocation.name); - InventoryInstance.openItemByBarcodeAndIndex('No barcode'); - }, - ); + Receiving.checkReceived(0, displaySummary); + Receiving.selectInstanceInReceive(); + InventoryInstance.checkInstanceTitle(orderLineUI.titleOrPackage); + InventoryInstance.openHoldingsAccordion(secondLocation.name); + InventoryInstance.openItemByBarcodeAndIndex('No barcode'); + }, + ); + }); }, ); diff --git a/cypress/e2e/orders/changing-order-format-from-pe-mix-to-electronic.cy.js b/cypress/e2e/orders/changing-order-format-from-pe-mix-to-electronic.cy.js index d8f4e8d8df..e5b4fc0be5 100644 --- a/cypress/e2e/orders/changing-order-format-from-pe-mix-to-electronic.cy.js +++ b/cypress/e2e/orders/changing-order-format-from-pe-mix-to-electronic.cy.js @@ -92,7 +92,7 @@ describe('Orders', () => { it( 'C357550 “Physical” format specific fields are cleared when changing order format from "P/E Mix" to "Electronic Resource" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C357550'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/changing-order-format-from-pe-mix-to-other.cy.js b/cypress/e2e/orders/changing-order-format-from-pe-mix-to-other.cy.js index 38b25447b2..5bd6055632 100644 --- a/cypress/e2e/orders/changing-order-format-from-pe-mix-to-other.cy.js +++ b/cypress/e2e/orders/changing-order-format-from-pe-mix-to-other.cy.js @@ -91,8 +91,8 @@ describe('Orders', () => { }); it( - 'C357551: “Electronic” format specific fields are cleared when changing order format from "P/E Mix" to "Other" (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + 'C357551 “Electronic” format specific fields are cleared when changing order format from "P/E Mix" to "Other" (thunderjet) (TaaS)', + { tags: ['extendedPathFlaky', 'thunderjet', 'C357551'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/check-duplicate-POL.cy.js b/cypress/e2e/orders/check-duplicate-POL.cy.js index fdc63bb949..b565b2a067 100644 --- a/cypress/e2e/orders/check-duplicate-POL.cy.js +++ b/cypress/e2e/orders/check-duplicate-POL.cy.js @@ -92,7 +92,7 @@ describe('Orders', () => { it( 'C347860 Check duplicate POL (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C347860'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/close-order.cy.js b/cypress/e2e/orders/close-order.cy.js index 7afebc8f6d..12035bcdfb 100644 --- a/cypress/e2e/orders/close-order.cy.js +++ b/cypress/e2e/orders/close-order.cy.js @@ -41,7 +41,7 @@ describe('orders: Close Order', () => { it( 'C667 Close an existing order (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C667'] }, () => { Orders.createOrderWithOrderLineViaApi(order, orderLine).then(({ poNumber }) => { Orders.searchByParameter('PO number', poNumber); diff --git a/cypress/e2e/orders/connected-pol.cy.js b/cypress/e2e/orders/connected-pol.cy.js index 534b71906e..106f94f827 100644 --- a/cypress/e2e/orders/connected-pol.cy.js +++ b/cypress/e2e/orders/connected-pol.cy.js @@ -37,7 +37,7 @@ describe('Orders', () => { it( 'C10926 Populate POL details from Inventory instance (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'C10926'] }, () => { Orders.createOrder(order).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/copy-icon-present-on-po-and-pol-panes.cy.js b/cypress/e2e/orders/copy-icon-present-on-po-and-pol-panes.cy.js index 14a665a594..5cb7e82e18 100644 --- a/cypress/e2e/orders/copy-icon-present-on-po-and-pol-panes.cy.js +++ b/cypress/e2e/orders/copy-icon-present-on-po-and-pol-panes.cy.js @@ -45,7 +45,7 @@ describe('Orders', () => { it( 'C353661 "Copy" icon is added to PO and POL number (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353661'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/correct-validation-of-total-fund-distribution-amount.cy.js b/cypress/e2e/orders/correct-validation-of-total-fund-distribution-amount.cy.js index 49451768d5..c037f2e476 100644 --- a/cypress/e2e/orders/correct-validation-of-total-fund-distribution-amount.cy.js +++ b/cypress/e2e/orders/correct-validation-of-total-fund-distribution-amount.cy.js @@ -129,7 +129,7 @@ describe('Orders', () => { it( 'C359009 Correct validation of total "Fund distribution" amount (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C359009'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/create-one-time-order-with-pol.cy.js b/cypress/e2e/orders/create-one-time-order-with-pol.cy.js index 2208d32b02..928e5c1d99 100644 --- a/cypress/e2e/orders/create-one-time-order-with-pol.cy.js +++ b/cypress/e2e/orders/create-one-time-order-with-pol.cy.js @@ -101,7 +101,7 @@ describe('Orders: Inventory interaction', () => { it( 'C662 Create an order and at least one order line for a one-time order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C662'] }, () => { Orders.createApprovedOrderForRollover(firstOrder, true).then((firstOrderResponse) => { firstOrder.id = firstOrderResponse.id; diff --git a/cypress/e2e/orders/create-ongoing-order.cy.js b/cypress/e2e/orders/create-ongoing-order.cy.js index b19457bfd6..baf8d85b33 100644 --- a/cypress/e2e/orders/create-ongoing-order.cy.js +++ b/cypress/e2e/orders/create-ongoing-order.cy.js @@ -47,7 +47,7 @@ describe('Orders', () => { it( 'C663 Create an order and at least one order line for an ongoing order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'C663'] }, () => { Orders.createOrder(order, true, false).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/create-order-line-for-PEMix.cy.js b/cypress/e2e/orders/create-order-line-for-PEMix.cy.js index 0760f472d3..c77dc72833 100644 --- a/cypress/e2e/orders/create-order-line-for-PEMix.cy.js +++ b/cypress/e2e/orders/create-order-line-for-PEMix.cy.js @@ -36,7 +36,7 @@ describe('orders: Test PO search', () => { it( 'C343242 Create an order line for format = P/E mix (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C343242'] }, () => { cy.wait(4000); Orders.resetFilters(); diff --git a/cypress/e2e/orders/create-order-withPol-different-formats.cy.js b/cypress/e2e/orders/create-order-withPol-different-formats.cy.js index 594dc6a939..a70ddf2ac5 100644 --- a/cypress/e2e/orders/create-order-withPol-different-formats.cy.js +++ b/cypress/e2e/orders/create-order-withPol-different-formats.cy.js @@ -74,7 +74,7 @@ describe('ui-orders: Orders and Order lines', () => { it( 'C658 Create an order and at least one order line for format = electronic resource (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C658'] }, () => { Orders.createOrder(order).then((orderId) => { order.id = orderId; @@ -89,7 +89,7 @@ describe('ui-orders: Orders and Order lines', () => { it( 'C659 Create an order and at least one order line for format = physical resource with multiple copies (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C659'] }, () => { Orders.createOrder(order).then((orderId) => { order.id = orderId; @@ -104,7 +104,7 @@ describe('ui-orders: Orders and Order lines', () => { it( 'C661 Create an order and at least one order line for format = other (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C661'] }, () => { Orders.createOrder(order).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/create-order.cy.js b/cypress/e2e/orders/create-order.cy.js index 11fb30d892..1eabe801a9 100644 --- a/cypress/e2e/orders/create-order.cy.js +++ b/cypress/e2e/orders/create-order.cy.js @@ -27,7 +27,7 @@ describe('Orders', () => { it( 'C660 Create an order (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C660'] }, () => { Orders.createOrder(order); Orders.checkCreatedOrder(order); diff --git a/cypress/e2e/orders/delete-fund-in-POL.cy.js b/cypress/e2e/orders/delete-fund-in-POL.cy.js index 310d4275e5..6a2452924c 100644 --- a/cypress/e2e/orders/delete-fund-in-POL.cy.js +++ b/cypress/e2e/orders/delete-fund-in-POL.cy.js @@ -160,7 +160,7 @@ describe('Orders', () => { it( 'C374192 Deleting fund distribution in PO line when related Open invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C374192'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/delete-fund-in-pol-w-reviewed-invoice.cy.js b/cypress/e2e/orders/delete-fund-in-pol-w-reviewed-invoice.cy.js index a524419382..1d2cc9d10e 100644 --- a/cypress/e2e/orders/delete-fund-in-pol-w-reviewed-invoice.cy.js +++ b/cypress/e2e/orders/delete-fund-in-pol-w-reviewed-invoice.cy.js @@ -93,7 +93,7 @@ describe('Orders', () => { it( 'C374191 Deleting fund distribution in PO line when related Reviewed invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374191'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/deleting-manually-assigned-donor-from-pol.cy.js b/cypress/e2e/orders/deleting-manually-assigned-donor-from-pol.cy.js index 49185851be..da76bf4b7a 100644 --- a/cypress/e2e/orders/deleting-manually-assigned-donor-from-pol.cy.js +++ b/cypress/e2e/orders/deleting-manually-assigned-donor-from-pol.cy.js @@ -118,7 +118,7 @@ describe('Orders', () => { it( 'C423399 Deleting manually assigned donor from POL while assigned fund exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C423399'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/duplicate-order.cy.js b/cypress/e2e/orders/duplicate-order.cy.js index bbfd6ba0a2..a92cb1b781 100644 --- a/cypress/e2e/orders/duplicate-order.cy.js +++ b/cypress/e2e/orders/duplicate-order.cy.js @@ -104,7 +104,7 @@ describe('Orders', () => { it( 'C9220 Duplicate purchase order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'C9220'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edifact-export-to-a-vendor.cy.js b/cypress/e2e/orders/edifact-export-to-a-vendor.cy.js index 91587833d9..eb123cef4a 100644 --- a/cypress/e2e/orders/edifact-export-to-a-vendor.cy.js +++ b/cypress/e2e/orders/edifact-export-to-a-vendor.cy.js @@ -133,7 +133,7 @@ describe('Export Manager', () => { it( 'C350402 Verify that an Order is exported to a definite Vendors Account specified in one of several Integration configurations (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350402'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edifact-exports/create-order-to-edifact-export.cy.js b/cypress/e2e/orders/edifact-exports/create-order-to-edifact-export.cy.js index f5f31a3a8d..c154613ec8 100644 --- a/cypress/e2e/orders/edifact-exports/create-order-to-edifact-export.cy.js +++ b/cypress/e2e/orders/edifact-exports/create-order-to-edifact-export.cy.js @@ -4,6 +4,7 @@ import OrderLines from '../../../support/fragments/orders/orderLines'; import Orders from '../../../support/fragments/orders/orders'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import NewLocation from '../../../support/fragments/settings/tenant/locations/newLocation'; import ServicePoints from '../../../support/fragments/settings/tenant/servicePoints/servicePoints'; import TopMenu from '../../../support/fragments/topMenu'; @@ -58,7 +59,7 @@ describe('Export Manager', () => { order.orderType = 'One-time'; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -106,7 +107,7 @@ describe('Export Manager', () => { it( 'C350395 Verify that Orders can be created for the selected Vendors EDIFACT export (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350395'] }, () => { cy.visit(TopMenu.ordersPath); Orders.createOrder(order, true, false).then((orderId) => { diff --git a/cypress/e2e/orders/edifact-exports/delete-order-by-user.cy.js b/cypress/e2e/orders/edifact-exports/delete-order-by-user.cy.js index 69697bfb33..372afd4918 100644 --- a/cypress/e2e/orders/edifact-exports/delete-order-by-user.cy.js +++ b/cypress/e2e/orders/edifact-exports/delete-order-by-user.cy.js @@ -6,6 +6,7 @@ import OrderLines from '../../../support/fragments/orders/orderLines'; import Orders from '../../../support/fragments/orders/orders'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import MaterialTypes from '../../../support/fragments/settings/inventory/materialTypes'; import NewLocation from '../../../support/fragments/settings/tenant/locations/newLocation'; import ServicePoints from '../../../support/fragments/settings/tenant/servicePoints/servicePoints'; @@ -85,7 +86,7 @@ describe('orders: Edifact export', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -138,7 +139,7 @@ describe('orders: Edifact export', () => { it( 'C350404 Verify that User can delete created Order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350404'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edifact-exports/exported-order-does-not-display-export-details.cy.js b/cypress/e2e/orders/edifact-exports/exported-order-does-not-display-export-details.cy.js index f64d273102..6aab888f5f 100644 --- a/cypress/e2e/orders/edifact-exports/exported-order-does-not-display-export-details.cy.js +++ b/cypress/e2e/orders/edifact-exports/exported-order-does-not-display-export-details.cy.js @@ -13,6 +13,7 @@ import getRandomPostfix from '../../../support/utils/stringTools'; import { ACQUISITION_METHOD_NAMES_IN_PROFILE, ORDER_STATUSES } from '../../../support/constants'; import BasicOrderLine from '../../../support/fragments/orders/basicOrderLine'; import MaterialTypes from '../../../support/fragments/settings/inventory/materialTypes'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; Cypress.on('uncaught:exception', () => false); @@ -84,7 +85,7 @@ describe('orders: Edifact export', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -142,7 +143,7 @@ describe('orders: Edifact export', () => { it( 'C350550 NOT exported order DOES NOT display export details (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350550'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edit-account-number-in-po-line.cy.js b/cypress/e2e/orders/edit-account-number-in-po-line.cy.js index b3865a9114..6db3bcad76 100644 --- a/cypress/e2e/orders/edit-account-number-in-po-line.cy.js +++ b/cypress/e2e/orders/edit-account-number-in-po-line.cy.js @@ -50,7 +50,7 @@ describe('Orders', () => { it( 'C358545 A user can select account number when creating/editing PO line (Organization-vendor has more than one active account number) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C358545'] }, () => { // Click on order from Preconditions const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-an-existing-PO.cy.js b/cypress/e2e/orders/edit-an-existing-PO.cy.js index c4897ef26f..32ebbb2e6f 100644 --- a/cypress/e2e/orders/edit-an-existing-PO.cy.js +++ b/cypress/e2e/orders/edit-an-existing-PO.cy.js @@ -49,7 +49,7 @@ describe('Orders', () => { it( 'C664 Edit an existing PO (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C664'] }, () => { cy.login(user.username, user.password, { path: TopMenu.ordersPath, diff --git a/cypress/e2e/orders/edit-dates-for-ongoing-open-order.cy.js b/cypress/e2e/orders/edit-dates-for-ongoing-open-order.cy.js index a62348d003..d165e9451f 100644 --- a/cypress/e2e/orders/edit-dates-for-ongoing-open-order.cy.js +++ b/cypress/e2e/orders/edit-dates-for-ongoing-open-order.cy.js @@ -67,7 +67,7 @@ describe('Orders', () => { it( 'C418593 Adding and editing "subscription to" date for ongoing open order (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C418593'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -134,7 +134,7 @@ describe('Orders', () => { it( 'C418597 Adding and editing "renewal date" option for ongoing open order (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C418597'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-fund-and-decrease-cost-in-po-line-for-paid-invoice.cy.js b/cypress/e2e/orders/edit-fund-and-decrease-cost-in-po-line-for-paid-invoice.cy.js index 4a8670bf17..0e0d742516 100644 --- a/cypress/e2e/orders/edit-fund-and-decrease-cost-in-po-line-for-paid-invoice.cy.js +++ b/cypress/e2e/orders/edit-fund-and-decrease-cost-in-po-line-for-paid-invoice.cy.js @@ -129,7 +129,7 @@ describe('Orders', () => { it( 'C404443 Editing fund distribution and decreasing cost in PO line when related Paid invoice exists ("Release encumbrance" option in invoice line is NOT active) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C404443'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-fund-when-invoice-are-cancelled.cy.js b/cypress/e2e/orders/edit-fund-when-invoice-are-cancelled.cy.js index a8b2cf57a8..6132f34513 100644 --- a/cypress/e2e/orders/edit-fund-when-invoice-are-cancelled.cy.js +++ b/cypress/e2e/orders/edit-fund-when-invoice-are-cancelled.cy.js @@ -138,7 +138,7 @@ describe('ui-orders: Orders', () => { it( 'C368478 Editing fund distribution in PO line when related Cancelled from approved invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C368478'] }, () => { Orders.resetFiltersIfActive(); Orders.searchByParameter('PO number', orderNumber); diff --git a/cypress/e2e/orders/edit-fund-when-invoice-are-open.cy.js b/cypress/e2e/orders/edit-fund-when-invoice-are-open.cy.js index 4f40a4bc7f..03ca059647 100644 --- a/cypress/e2e/orders/edit-fund-when-invoice-are-open.cy.js +++ b/cypress/e2e/orders/edit-fund-when-invoice-are-open.cy.js @@ -166,7 +166,7 @@ describe('ui-orders: Orders', () => { it( 'C374190 Editing fund distribution in PO line when related Open invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C374190'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edit-fund-when-invoice-has-multiple-fund-distributions.cy.js b/cypress/e2e/orders/edit-fund-when-invoice-has-multiple-fund-distributions.cy.js index 7fb9d1c0c2..59efd802d7 100644 --- a/cypress/e2e/orders/edit-fund-when-invoice-has-multiple-fund-distributions.cy.js +++ b/cypress/e2e/orders/edit-fund-when-invoice-has-multiple-fund-distributions.cy.js @@ -143,7 +143,7 @@ describe('Orders', () => { it( 'C375227 Editing fund distribution in PO line when PO line has more than one fund distributions and related Paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375227'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368477.cy.js b/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368477.cy.js index 6a0c38aa11..f74942697e 100644 --- a/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368477.cy.js +++ b/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368477.cy.js @@ -135,7 +135,7 @@ describe('Orders', () => { it( 'C368477 Editing fund distribution in PO line when related Paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C368477'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368484.cy.js b/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368484.cy.js index 95ea62bd10..0dcbc31b30 100644 --- a/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368484.cy.js +++ b/cypress/e2e/orders/edit-fund-when-invoice-paid-cancelled-C368484.cy.js @@ -141,7 +141,7 @@ describe('Orders', () => { it( 'C368484 Editing fund distribution in PO line when related Cancelled from paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C368484'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js b/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js index 464c71a087..b51e19cc55 100644 --- a/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js +++ b/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js @@ -169,7 +169,7 @@ describe('ui-orders: Orders', () => { it( 'C368486 Editing fund distribution in PO line when related Reviewed invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C368486'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edit-open-order-with-2-product-ids-and-approve-invoice.cy.js b/cypress/e2e/orders/edit-open-order-with-2-product-ids-and-approve-invoice.cy.js index 0299101c59..bc14f6b586 100644 --- a/cypress/e2e/orders/edit-open-order-with-2-product-ids-and-approve-invoice.cy.js +++ b/cypress/e2e/orders/edit-open-order-with-2-product-ids-and-approve-invoice.cy.js @@ -92,7 +92,7 @@ describe('Orders', () => { it( 'C369069 Edit open order with two product IDs and approve related invoice (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C369069'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edit-pol-in-open-order.cy.js b/cypress/e2e/orders/edit-pol-in-open-order.cy.js index 8ca1010326..f443927bcd 100644 --- a/cypress/e2e/orders/edit-pol-in-open-order.cy.js +++ b/cypress/e2e/orders/edit-pol-in-open-order.cy.js @@ -102,7 +102,7 @@ describe('ui-orders: Orders', () => { it( 'C16984 Edit cost/fund distribution of POL on an "Open" order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C16984'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/edit-pol-renewal-note.cy.js b/cypress/e2e/orders/edit-pol-renewal-note.cy.js index cd7275b0ef..ae2cb56dbf 100644 --- a/cypress/e2e/orders/edit-pol-renewal-note.cy.js +++ b/cypress/e2e/orders/edit-pol-renewal-note.cy.js @@ -49,7 +49,7 @@ describe('Orders', () => { it( 'C353968 A user can edit "Renewal note" field on POL (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353968'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/edit-pol.cy.js b/cypress/e2e/orders/edit-pol.cy.js index 1e97be2bf7..af1a90e445 100644 --- a/cypress/e2e/orders/edit-pol.cy.js +++ b/cypress/e2e/orders/edit-pol.cy.js @@ -87,7 +87,7 @@ describe('orders: create', () => { it( 'C665 Edit an existing PO Line on a "Pending" order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeftBroken', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C665'] }, () => { Orders.selectPendingStatusFilter(); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/editing-and-adding-fund-in-pol-when-pol-has-more-than-one-fund-and-paid-invoice.cy.js b/cypress/e2e/orders/editing-and-adding-fund-in-pol-when-pol-has-more-than-one-fund-and-paid-invoice.cy.js index 230db98000..da43bff1d8 100644 --- a/cypress/e2e/orders/editing-and-adding-fund-in-pol-when-pol-has-more-than-one-fund-and-paid-invoice.cy.js +++ b/cypress/e2e/orders/editing-and-adding-fund-in-pol-when-pol-has-more-than-one-fund-and-paid-invoice.cy.js @@ -168,7 +168,7 @@ describe('Orders', () => { it( 'C376957 Editing and adding fund distribution in PO line when PO line has more than one fund distributions and related Paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C376957'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/editing-fund-and-increasing-cost-in-pol.cy.js b/cypress/e2e/orders/editing-fund-and-increasing-cost-in-pol.cy.js index 23f10e652a..0188dc9c00 100644 --- a/cypress/e2e/orders/editing-fund-and-increasing-cost-in-pol.cy.js +++ b/cypress/e2e/orders/editing-fund-and-increasing-cost-in-pol.cy.js @@ -177,7 +177,7 @@ describe('ui-orders: Orders', () => { it( 'C375290 Editing fund distribution and increasing cost in PO line when related Paid invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C375290'] }, + { tags: ['criticalPath', 'thunderjet', 'C375290'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(); diff --git a/cypress/e2e/orders/editing-fund-distribution-and-decreasing-cost-in-pol.cy.js b/cypress/e2e/orders/editing-fund-distribution-and-decreasing-cost-in-pol.cy.js index d3e0bb36f9..7d0bbd1c63 100644 --- a/cypress/e2e/orders/editing-fund-distribution-and-decreasing-cost-in-pol.cy.js +++ b/cypress/e2e/orders/editing-fund-distribution-and-decreasing-cost-in-pol.cy.js @@ -131,8 +131,8 @@ describe('Orders', () => { }); it( - 'C375291: Editing fund distribution and decreasing cost in PO line when related Paid invoice exists ("Release encumbrance" option in invoice line is active) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C375291 Editing fund distribution and decreasing cost in PO line when related Paid invoice exists ("Release encumbrance" option in invoice line is active) (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C375291'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/editing-fund-distribution-from-funds-and-back.cy.js b/cypress/e2e/orders/editing-fund-distribution-from-funds-and-back.cy.js index 726456b20e..03a39606cc 100644 --- a/cypress/e2e/orders/editing-fund-distribution-from-funds-and-back.cy.js +++ b/cypress/e2e/orders/editing-fund-distribution-from-funds-and-back.cy.js @@ -149,7 +149,7 @@ describe('Orders', () => { it( 'C375260 Editing fund distribution from Fund A to Fund B and back to Fund A when related Paid invoices exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375260'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/electronic-format-fields-cleared-when-change-format-to-physical.cy.js b/cypress/e2e/orders/electronic-format-fields-cleared-when-change-format-to-physical.cy.js index 0cbf9c7121..c951dc638b 100644 --- a/cypress/e2e/orders/electronic-format-fields-cleared-when-change-format-to-physical.cy.js +++ b/cypress/e2e/orders/electronic-format-fields-cleared-when-change-format-to-physical.cy.js @@ -94,7 +94,7 @@ describe('Orders', () => { it( 'C354281 “Electronic” format specific fields are cleared when changing order format from "P/E Mix" to "Physical Resource" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C354281'] }, () => { // Click on the Order record from preconditions const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed-C375986.cy.js b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed-C375986.cy.js index e2f2abc95c..be7d3f72dc 100644 --- a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed-C375986.cy.js +++ b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed-C375986.cy.js @@ -143,7 +143,7 @@ describe('Orders', () => { it( 'C375986 Encumbered amount is not changed after deleting received piece when related paid invoice exists and order is closed (thunderjet) (TaaS)', - { tags: ['extendedPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathBroken', 'thunderjet', 'C375986'] }, () => { cy.getAdminToken().then(() => { Invoices.changeInvoiceStatusViaApi({ diff --git a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed.cy.js b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed.cy.js index fccc894c2b..50c5e596ef 100644 --- a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed.cy.js +++ b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-when-order-closed.cy.js @@ -142,7 +142,7 @@ describe('Orders', () => { it( 'C375985 Encumbered amount is not changed after deleting received piece when related approved invoice exists and order is closed (thunderjet) (TaaS)', - { tags: ['extendedPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathBroken', 'thunderjet', 'C375985'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-with-paid-invoice.cy.js b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-with-paid-invoice.cy.js index 0f8ff77c2c..54382d6b56 100644 --- a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-with-paid-invoice.cy.js +++ b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece-with-paid-invoice.cy.js @@ -129,8 +129,8 @@ describe('Orders', () => { }); it( - 'C375111: Encumbered amount is not changed after deleting received piece when related paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C375111 Encumbered amount is not changed after deleting received piece when related paid invoice exists (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C375111'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece.cy.js b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece.cy.js index 8706f0d9d9..da66d16cd9 100644 --- a/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece.cy.js +++ b/cypress/e2e/orders/encumbered-amount-is-not-changed-after-deleting-received-piece.cy.js @@ -129,7 +129,7 @@ describe('Orders', () => { it( 'C375110 Encumbered amount is not changed after deleting received piece when related approved invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C375110'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/encumbrance-released-when-order-closed.cy.js b/cypress/e2e/orders/encumbrance-released-when-order-closed.cy.js index 04e045aafb..c1d1ac63d3 100644 --- a/cypress/e2e/orders/encumbrance-released-when-order-closed.cy.js +++ b/cypress/e2e/orders/encumbrance-released-when-order-closed.cy.js @@ -66,7 +66,7 @@ describe('Orders', () => { it( 'C380392 Encumbrance is released when an Order was closed automatically (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C380392'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/encumbrance-transaction-updates-when-fund-name-is-changed.cy.js b/cypress/e2e/orders/encumbrance-transaction-updates-when-fund-name-is-changed.cy.js index ca12c52805..440eb730b6 100644 --- a/cypress/e2e/orders/encumbrance-transaction-updates-when-fund-name-is-changed.cy.js +++ b/cypress/e2e/orders/encumbrance-transaction-updates-when-fund-name-is-changed.cy.js @@ -174,7 +174,7 @@ describe('Orders', () => { it( 'C357540 Encumbrance transaction updates when fund name is changed in Open ongoing order and Open invoice related to POL exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C357540'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-active.cy.js b/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-active.cy.js index f2005837ff..4fc819ab82 100644 --- a/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-active.cy.js +++ b/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-active.cy.js @@ -108,7 +108,7 @@ describe('Orders', () => { it( 'C350545 "Purchase order" and "PO Line Details" display export details accordion for 2 exported order lines (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350545'] }, () => { // Search for exported order and click on it const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-not-active.cy.js b/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-not-active.cy.js index 38f237990c..b71157e727 100644 --- a/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-not-active.cy.js +++ b/cypress/e2e/orders/export-order-with-two-order-lines-automatic-export-not-active.cy.js @@ -105,7 +105,7 @@ describe('Orders', () => { it( 'C350546 Verify if "Purchase order" and "PO Line Details" DO NOT display export details accordion for NOT exported order lines (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350546'] }, () => { // Search for exported order and click on it const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/export/export-orders.cy.js b/cypress/e2e/orders/export/export-orders.cy.js index 8869577b49..7ae2c730a5 100644 --- a/cypress/e2e/orders/export/export-orders.cy.js +++ b/cypress/e2e/orders/export/export-orders.cy.js @@ -117,7 +117,7 @@ describe('Orders', () => { it( 'C196749 Export orders based on orders search (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C196749'] }, () => { Orders.waitLoading(); Orders.selectOpenStatusFilter(); diff --git a/cypress/e2e/orders/export/organization-type-present-in-exported-file.cy.js b/cypress/e2e/orders/export/organization-type-present-in-exported-file.cy.js index c6dfc7f35a..a2b49ae227 100644 --- a/cypress/e2e/orders/export/organization-type-present-in-exported-file.cy.js +++ b/cypress/e2e/orders/export/organization-type-present-in-exported-file.cy.js @@ -69,7 +69,7 @@ describe('Orders', () => { it( 'C353621 "Organization type" is present in exported .csv order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353621'] }, () => { // Search for the order from Preconditions Orders.searchByParameter('PO number', testData.order.poNumber); diff --git a/cypress/e2e/orders/export/pol-export-by-filters.cy.js b/cypress/e2e/orders/export/pol-export-by-filters.cy.js index 6c5791c120..b349c40e4e 100644 --- a/cypress/e2e/orders/export/pol-export-by-filters.cy.js +++ b/cypress/e2e/orders/export/pol-export-by-filters.cy.js @@ -157,7 +157,7 @@ describe('Orders', () => { it( 'C196751 Export orders based on orders lines search (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C196751'] }, () => { Orders.searchByParameter('PO line number', firstOrderNumber); cy.wait(5000); diff --git a/cypress/e2e/orders/export/renewal-note-present-in-exported-file.cy.js b/cypress/e2e/orders/export/renewal-note-present-in-exported-file.cy.js index df29aca05d..03819b000b 100644 --- a/cypress/e2e/orders/export/renewal-note-present-in-exported-file.cy.js +++ b/cypress/e2e/orders/export/renewal-note-present-in-exported-file.cy.js @@ -60,7 +60,7 @@ describe('Orders', () => { it( 'C353977 "Renewal note" field is added to .csv export file (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353977'] }, () => { // Search for the order from Preconditions Orders.searchByParameter('PO number', testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-electronic-resource-format.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-electronic-resource-format.cy.js index 7acf4a1f49..1240a3de44 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-electronic-resource-format.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-electronic-resource-format.cy.js @@ -96,7 +96,7 @@ describe('Orders', () => { it( 'C402353 Holdings records creation when open order with "Electronic Resource" format PO line and Independent workflow (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402353'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-other-format.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-other-format.cy.js index c00097bbd7..6db176e7f4 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-other-format.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-other-format.cy.js @@ -93,7 +93,7 @@ describe('Orders', () => { it( 'C402354 Holdings records creation when open order with "Other" format PO line and Independent workflow (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402354'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-i.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-i.cy.js index 5fca9f19a5..fba5f53d68 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-i.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-i.cy.js @@ -107,7 +107,7 @@ describe('Orders', () => { it( 'C402384 Holdings records creation when open order with "P/E mix" format PO line and Independent workflow, "Create inventory" in "E-resources details" = Instance (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402384'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ih.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ih.cy.js index 30628d898b..79515beba1 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ih.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ih.cy.js @@ -107,7 +107,7 @@ describe('Orders', () => { it( 'C402383 Holdings records creation when open order with "P/E mix" format PO line and Independent workflow, "Create inventory" in "E-resources details" = Instance, holdings (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402383'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ihi.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ihi.cy.js index cdd08db495..b1f9c22137 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ihi.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-ihi.cy.js @@ -108,7 +108,7 @@ describe('Orders', () => { it( 'C402382 Holdings records creation when open order with "P/E mix" format PO line and Independent workflow, "Create inventory" in "E-resources details" = Instance, holdings, item (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402382'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-none.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-none.cy.js index 70de325dfe..4e5627642a 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-none.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-pe-mix-format-eresource-none.cy.js @@ -107,7 +107,7 @@ describe('Orders', () => { it( 'C402351 Holdings records creation when open order with "P/E mix" format PO line and Independent workflow, "Create inventory" in "E-resources details" = None (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402351'] }, () => { // Open Order Orders.resetFiltersIfActive(); diff --git a/cypress/e2e/orders/holdings-records creation-for-order-with-physical-resource-format.cy.js b/cypress/e2e/orders/holdings-records creation-for-order-with-physical-resource-format.cy.js index 3bab56ef70..78dd5c6cb0 100644 --- a/cypress/e2e/orders/holdings-records creation-for-order-with-physical-resource-format.cy.js +++ b/cypress/e2e/orders/holdings-records creation-for-order-with-physical-resource-format.cy.js @@ -93,7 +93,7 @@ describe('Orders', () => { it( 'C402352 Holdings records creation when open order with "Physical Resource" format PO line and Independent workflow (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C402352'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/independent-order-and-receipt-quantity.cy.js b/cypress/e2e/orders/independent-order-and-receipt-quantity.cy.js index 8ce01ff9c5..317f36229d 100644 --- a/cypress/e2e/orders/independent-order-and-receipt-quantity.cy.js +++ b/cypress/e2e/orders/independent-order-and-receipt-quantity.cy.js @@ -74,7 +74,7 @@ describe('Orders', () => { it( 'C389465 Receiving workflow is automatically set to "Independent order and receipt quantity" if a user selects "Receipt not required" receipt status (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C389465'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-existing-order.cy.js b/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-existing-order.cy.js index fa6b2be1df..120944ace2 100644 --- a/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-existing-order.cy.js +++ b/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-existing-order.cy.js @@ -62,7 +62,7 @@ describe('Orders', () => { it( 'C353993 Cancelling creation PO line from instance record for existing order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353993'] }, () => { // Navigate to the instance from preconditions InventorySearchAndFilter.searchInstanceByTitle(instance.instanceName); diff --git a/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-new-order.cy.js b/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-new-order.cy.js index 3edb2fbb57..db58b5fc6c 100644 --- a/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-new-order.cy.js +++ b/cypress/e2e/orders/inventory-interaction/cancelling-creation-PO-line-from-instance-record-for-new-order.cy.js @@ -61,7 +61,7 @@ describe('Orders', () => { it( 'C353996 Cancelling creation PO line from instance record for new order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353996'] }, () => { // Navigate to the instance from preconditions InventorySearchAndFilter.searchInstanceByTitle(instance.instanceName); diff --git a/cypress/e2e/orders/inventory-interaction/cancelling-creation-order-from-instance-record.cy.js b/cypress/e2e/orders/inventory-interaction/cancelling-creation-order-from-instance-record.cy.js index c8b81eb18f..2a2ad44a47 100644 --- a/cypress/e2e/orders/inventory-interaction/cancelling-creation-order-from-instance-record.cy.js +++ b/cypress/e2e/orders/inventory-interaction/cancelling-creation-order-from-instance-record.cy.js @@ -39,7 +39,7 @@ describe('Orders', () => { it( 'C353992 Cancelling creation an order from instance record (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353992'] }, () => { // Navigate to the instance from preconditions InventorySearchAndFilter.searchInstanceByTitle(instance.instanceName); diff --git a/cypress/e2e/orders/inventory-interaction/create-new-holdings-for-existing-location.cy.js b/cypress/e2e/orders/inventory-interaction/create-new-holdings-for-existing-location.cy.js index a4ef04ad25..d4bed4c7db 100644 --- a/cypress/e2e/orders/inventory-interaction/create-new-holdings-for-existing-location.cy.js +++ b/cypress/e2e/orders/inventory-interaction/create-new-holdings-for-existing-location.cy.js @@ -16,112 +16,114 @@ import ServicePoints from '../../../support/fragments/settings/tenant/servicePoi import TopMenu from '../../../support/fragments/topMenu'; import Users from '../../../support/fragments/users/users'; -describe('Orders: Inventory interaction', () => { - const testData = { - organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), - servicePoint: ServicePoints.defaultServicePoint, - instance: {}, - location: {}, - order: {}, - user: {}, - }; +describe('Orders', () => { + describe('Inventory interaction', () => { + const testData = { + organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), + servicePoint: ServicePoints.defaultServicePoint, + instance: {}, + location: {}, + order: {}, + user: {}, + }; - before('Create test data', () => { - cy.getAdminToken() - .then(() => { - InventoryInstance.createInstanceViaApi().then(({ instanceData }) => { - testData.instance = instanceData; + before('Create test data', () => { + cy.getAdminToken() + .then(() => { + InventoryInstance.createInstanceViaApi().then(({ instanceData }) => { + testData.instance = instanceData; - Organizations.createOrganizationViaApi(testData.organization); - }); - }) - .then(() => { - ServicePoints.createViaApi(testData.servicePoint).then(() => { - testData.location = Locations.getDefaultLocation({ - servicePointId: testData.servicePoint.id, - }).location; + Organizations.createOrganizationViaApi(testData.organization); + }); + }) + .then(() => { + ServicePoints.createViaApi(testData.servicePoint).then(() => { + testData.location = Locations.getDefaultLocation({ + servicePointId: testData.servicePoint.id, + }).location; - Locations.createViaApi(testData.location).then(() => { - Orders.createOrderViaApi( - NewOrder.getDefaultOrder({ vendorId: testData.organization.id }), - ).then((order) => { - testData.order = order; + Locations.createViaApi(testData.location).then(() => { + Orders.createOrderViaApi( + NewOrder.getDefaultOrder({ vendorId: testData.organization.id }), + ).then((order) => { + testData.order = order; - InventoryHoldings.getHoldingsFolioSource().then((folioSource) => { - InventoryHoldings.createHoldingRecordViaApi({ - instanceId: testData.instance.instanceId, - permanentLocationId: testData.location.id, - sourceId: folioSource.id, - }).then(({ id: holdingId }) => { - testData.instance.holdingId = holdingId; + InventoryHoldings.getHoldingsFolioSource().then((folioSource) => { + InventoryHoldings.createHoldingRecordViaApi({ + instanceId: testData.instance.instanceId, + permanentLocationId: testData.location.id, + sourceId: folioSource.id, + }).then(({ id: holdingId }) => { + testData.instance.holdingId = holdingId; + }); }); }); }); }); }); - }); - cy.createTempUser([ - Permissions.uiInventoryViewInstances.gui, - Permissions.uiOrdersApprovePurchaseOrders.gui, - Permissions.uiOrdersCreate.gui, - ]).then((userProperties) => { - testData.user = userProperties; + cy.createTempUser([ + Permissions.uiInventoryViewInstances.gui, + Permissions.uiOrdersApprovePurchaseOrders.gui, + Permissions.uiOrdersCreate.gui, + ]).then((userProperties) => { + testData.user = userProperties; - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - after('Delete test data', () => { - cy.getAdminToken(); - InventoryHoldings.deleteHoldingRecordViaApi(testData.instance.holdingId); - Organizations.deleteOrganizationViaApi(testData.organization.id); - Orders.deleteOrderViaApi(testData.order.id); - InventoryInstance.deleteInstanceViaApi(testData.instance.instanceId); - Locations.deleteViaApi(testData.location); - ServicePoints.deleteViaApi(testData.servicePoint.id); - Users.deleteViaApi(testData.user.userId); - }); + after('Delete test data', () => { + cy.getAdminToken(); + InventoryHoldings.deleteHoldingRecordViaApi(testData.instance.holdingId); + Organizations.deleteOrganizationViaApi(testData.organization.id); + Orders.deleteOrderViaApi(testData.order.id); + InventoryInstance.deleteInstanceViaApi(testData.instance.instanceId); + Locations.deleteViaApi(testData.location); + ServicePoints.deleteViaApi(testData.servicePoint.id); + Users.deleteViaApi(testData.user.userId); + }); - it( - 'C375232 Create new holdings for already existing location when creating an order line (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - // Click on "PO number" link on "Orders" pane - Orders.selectOrderByPONumber(testData.order.poNumber); + it( + 'C375232 Create new holdings for already existing location when creating an order line (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C375232'] }, + () => { + // Click on "PO number" link on "Orders" pane + Orders.selectOrderByPONumber(testData.order.poNumber); - // Select "Add PO line" option & fill the fields - OrderLines.addPolToOrder( - { - title: testData.instance.instanceTitle, - method: ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM, - format: ORDER_FORMAT_NAMES.PHYSICAL_RESOURCE, - price: '20', - quantity: '1', - inventory: 'Instance, holdings, item', - materialType: MATERIAL_TYPE_NAMES.BOOK, - }, - false, - ); + // Select "Add PO line" option & fill the fields + OrderLines.addPolToOrder( + { + title: testData.instance.instanceTitle, + method: ACQUISITION_METHOD_NAMES_IN_PROFILE.PURCHASE_AT_VENDOR_SYSTEM, + format: ORDER_FORMAT_NAMES.PHYSICAL_RESOURCE, + price: '20', + quantity: '1', + inventory: 'Instance, holdings, item', + materialType: MATERIAL_TYPE_NAMES.BOOK, + }, + false, + ); - // Click "Create new holdings for location" link in "Location" accordion - const SelectLocationModal = OrderLines.openCreateHoldingForLocation(); - SelectLocationModal.verifyModalView(); + // Click "Create new holdings for location" link in "Location" accordion + const SelectLocationModal = OrderLines.openCreateHoldingForLocation(); + SelectLocationModal.verifyModalView(); - // Select permanent location from Preconditions item #1 - SelectLocationModal.selectLocation(testData.location.name); + // Select permanent location from Preconditions item #1 + SelectLocationModal.selectLocation(testData.location.name); - // Fill the following fields & click "Save" - OrderLines.setPhysicalQuantity('1'); - OrderLines.savePol(); - OrderLines.checkTitle(testData.instance.instanceTitle); + // Fill the following fields & click "Save" + OrderLines.setPhysicalQuantity('1'); + OrderLines.savePol(); + OrderLines.checkTitle(testData.instance.instanceTitle); - // Click back arrow on- the top left of the third "PO Line details - OrderLines.backToEditingOrder(); - OrderLines.selectPOLInOrder(0); - }, - ); + // Click back arrow on- the top left of the third "PO Line details + OrderLines.backToEditingOrder(); + OrderLines.selectPOLInOrder(0); + }, + ); + }); }); diff --git a/cypress/e2e/orders/inventory-interaction/create-new-holdings.cy.js b/cypress/e2e/orders/inventory-interaction/create-new-holdings.cy.js index 1758531480..eaa0937b82 100644 --- a/cypress/e2e/orders/inventory-interaction/create-new-holdings.cy.js +++ b/cypress/e2e/orders/inventory-interaction/create-new-holdings.cy.js @@ -17,148 +17,150 @@ import ServicePoints from '../../../support/fragments/settings/tenant/servicePoi import TopMenu from '../../../support/fragments/topMenu'; import Users from '../../../support/fragments/users/users'; -describe('Orders: Inventory interaction', () => { - const barcodeForFirstItem = Helper.getRandomBarcode(); - const barcodeForSecondItem = Helper.getRandomBarcode(); +describe('Orders', () => { + describe('Inventory interaction', () => { + const barcodeForFirstItem = Helper.getRandomBarcode(); + const barcodeForSecondItem = Helper.getRandomBarcode(); - const testData = { - organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), - servicePoint: ServicePoints.defaultServicePoint, - instance: {}, - locations: [], - orderNumber: '', - user: {}, - }; + const testData = { + organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), + servicePoint: ServicePoints.defaultServicePoint, + instance: {}, + locations: [], + orderNumber: '', + user: {}, + }; - before('Create test data', () => { - cy.getAdminToken() - .then(() => { - InventoryInstance.createInstanceViaApi().then(({ instanceData }) => { - testData.instance = { - ...instanceData, - quantity: '2', - vendorAccount: testData.organization.accounts[0].accountNo, - listUnitPrice: '10', - poLineEstimatedPrice: '20', - eresource: null, - }; - Organizations.createOrganizationViaApi(testData.organization); - }); - }) - .then(() => { - ServicePoints.createViaApi(testData.servicePoint).then(() => { - Locations.createViaApi( - Locations.getDefaultLocation({ servicePointId: testData.servicePoint.id }).location, - ).then((location) => { - testData.locations.push(location); - - // create the first PO with POL - Orders.createOrderWithOrderLineViaApi( - NewOrder.getDefaultOrder({ vendorId: testData.organization.id }), - BasicOrderLine.getDefaultOrderLine({ - quantity: testData.instance.quantity, - title: testData.instance.instanceTitle, - instanceId: testData.instance.instanceId, - specialLocationId: testData.locations[0].id, - listUnitPrice: testData.instance.listUnitPrice, - poLineEstimatedPrice: testData.instance.poLineEstimatedPrice, - eresource: testData.instance.eresource, - vendorAccount: testData.instance.vendorAccount, - }), - ).then((order) => { - testData.orderNumber = order.poNumber; + before('Create test data', () => { + cy.getAdminToken() + .then(() => { + InventoryInstance.createInstanceViaApi().then(({ instanceData }) => { + testData.instance = { + ...instanceData, + quantity: '2', + vendorAccount: testData.organization.accounts[0].accountNo, + listUnitPrice: '10', + poLineEstimatedPrice: '20', + eresource: null, + }; + Organizations.createOrganizationViaApi(testData.organization); + }); + }) + .then(() => { + ServicePoints.createViaApi(testData.servicePoint).then(() => { + Locations.createViaApi( + Locations.getDefaultLocation({ servicePointId: testData.servicePoint.id }).location, + ).then((location) => { + testData.locations.push(location); - InventoryHoldings.getHoldingsFolioSource().then((folioSource) => { - InventoryHoldings.createHoldingRecordViaApi({ + // create the first PO with POL + Orders.createOrderWithOrderLineViaApi( + NewOrder.getDefaultOrder({ vendorId: testData.organization.id }), + BasicOrderLine.getDefaultOrderLine({ + quantity: testData.instance.quantity, + title: testData.instance.instanceTitle, instanceId: testData.instance.instanceId, - permanentLocationId: location.id, - sourceId: folioSource.id, - }).then(({ id: holdingId }) => { - testData.instance.holdingId = holdingId; + specialLocationId: testData.locations[0].id, + listUnitPrice: testData.instance.listUnitPrice, + poLineEstimatedPrice: testData.instance.poLineEstimatedPrice, + eresource: testData.instance.eresource, + vendorAccount: testData.instance.vendorAccount, + }), + ).then((order) => { + testData.orderNumber = order.poNumber; + + InventoryHoldings.getHoldingsFolioSource().then((folioSource) => { + InventoryHoldings.createHoldingRecordViaApi({ + instanceId: testData.instance.instanceId, + permanentLocationId: location.id, + sourceId: folioSource.id, + }).then(({ id: holdingId }) => { + testData.instance.holdingId = holdingId; + }); }); }); - }); - Locations.createViaApi( - Locations.getDefaultLocation({ servicePointId: testData.servicePoint.id }).location, - ).then((secondLocation) => { - testData.locations.push(secondLocation); + Locations.createViaApi( + Locations.getDefaultLocation({ servicePointId: testData.servicePoint.id }).location, + ).then((secondLocation) => { + testData.locations.push(secondLocation); + }); }); }); }); - }); - cy.createTempUser([ - Permissions.uiInventoryViewCreateEditInstances.gui, - Permissions.uiInventoryViewCreateEditItems.gui, - Permissions.uiInventoryViewInstances.gui, - Permissions.uiOrdersApprovePurchaseOrders.gui, - Permissions.uiOrdersEdit.gui, - ]).then((userProperties) => { - testData.user = userProperties; - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + cy.createTempUser([ + Permissions.uiInventoryViewCreateEditInstances.gui, + Permissions.uiInventoryViewCreateEditItems.gui, + Permissions.uiInventoryViewInstances.gui, + Permissions.uiOrdersApprovePurchaseOrders.gui, + Permissions.uiOrdersEdit.gui, + ]).then((userProperties) => { + testData.user = userProperties; + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - after('Delete test data', () => { - cy.getAdminToken(); - InventoryHoldings.deleteHoldingRecordViaApi(testData.instance.holdingId); - Organizations.deleteOrganizationViaApi(testData.organization.id); - Orders.deleteOrderByOrderNumberViaApi(testData.orderNumber); - ServicePoints.deleteViaApi(testData.servicePoint.id); - Users.deleteViaApi(testData.user.userId); - }); + after('Delete test data', () => { + cy.getAdminToken(); + InventoryHoldings.deleteHoldingRecordViaApi(testData.instance.holdingId); + Organizations.deleteOrganizationViaApi(testData.organization.id); + Orders.deleteOrderByOrderNumberViaApi(testData.orderNumber); + ServicePoints.deleteViaApi(testData.servicePoint.id); + Users.deleteViaApi(testData.user.userId); + }); - it( - 'C375238 Create new holdings for already existing location when editing an order line (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - Orders.selectOrderByPONumber(testData.orderNumber); - OrderLines.selectPOLInOrder(0); - OrderLines.editPOLInOrder(); - OrderLines.selectRandomInstanceInTitleLookUP(`${testData.instance.instanceTitle}`, 0); - OrderLines.editPOLineInfoAndChangeLocation(testData.locations[1].name, '2'); - OrderLines.backToEditingOrder(); - Orders.openOrder(); - OrderLines.selectPOLInOrder(0); - OrderLines.openLinkedInstance(); - InventoryInstance.checkIsHoldingsCreated([`${testData.locations[0].name} >`]); - InventoryInstance.checkIsHoldingsCreated([`${testData.locations[1].name} >`]); - InventoryInstance.openHoldingsAccordion(testData.locations[1].name); - InventoryInstance.openItemByBarcodeAndIndex('No barcode'); - InventoryItems.edit(); - ItemRecordEdit.addBarcode(barcodeForFirstItem); - ItemRecordEdit.saveAndClose(); - // Need to wait,while instance will be saved - cy.wait(7000); - InventoryItems.closeItemInHeader(); - InventoryInstance.openHoldingsAccordion(testData.locations[1].name); - InventoryInstance.openItemByBarcodeAndIndex('No barcode'); - InventoryItems.edit(); - ItemRecordEdit.addBarcode(barcodeForSecondItem); - ItemRecordEdit.saveAndClose(); - // Need to wait,while instance will be saved - cy.wait(7000); - InventoryItems.closeItemInHeader(); - InventoryInstance.openHoldingsAccordion(testData.locations[1].name); - InventoryInstance.openItemByBarcodeAndIndex(barcodeForFirstItem); - ItemRecordView.checkItemDetails( - testData.locations[1].name, - barcodeForFirstItem, - ITEM_STATUS_NAMES.ON_ORDER, - ); - InventoryItems.closeItemInHeader(); - InventoryInstance.openHoldingsAccordion(testData.locations[1].name); - InventoryInstance.openItemByBarcodeAndIndex(barcodeForSecondItem); - ItemRecordView.checkItemDetails( - testData.locations[1].name, - barcodeForSecondItem, - ITEM_STATUS_NAMES.ON_ORDER, - ); - InventoryItems.closeItemInHeader(); - }, - ); + it( + 'C375238 Create new holdings for already existing location when editing an order line (thunderjet)', + { tags: ['criticalPath', 'thunderjet', 'C375238'] }, + () => { + Orders.selectOrderByPONumber(testData.orderNumber); + OrderLines.selectPOLInOrder(0); + OrderLines.editPOLInOrder(); + OrderLines.selectRandomInstanceInTitleLookUP(`${testData.instance.instanceTitle}`, 0); + OrderLines.editPOLineInfoAndChangeLocation(testData.locations[1].name, '2'); + OrderLines.backToEditingOrder(); + Orders.openOrder(); + OrderLines.selectPOLInOrder(0); + OrderLines.openLinkedInstance(); + InventoryInstance.checkIsHoldingsCreated([`${testData.locations[0].name} >`]); + InventoryInstance.checkIsHoldingsCreated([`${testData.locations[1].name} >`]); + InventoryInstance.openHoldingsAccordion(testData.locations[1].name); + InventoryInstance.openItemByBarcodeAndIndex('No barcode'); + InventoryItems.edit(); + ItemRecordEdit.addBarcode(barcodeForFirstItem); + ItemRecordEdit.saveAndClose(); + // Need to wait,while instance will be saved + cy.wait(7000); + InventoryItems.closeItemInHeader(); + InventoryInstance.openHoldingsAccordion(testData.locations[1].name); + InventoryInstance.openItemByBarcodeAndIndex('No barcode'); + InventoryItems.edit(); + ItemRecordEdit.addBarcode(barcodeForSecondItem); + ItemRecordEdit.saveAndClose(); + // Need to wait,while instance will be saved + cy.wait(7000); + InventoryItems.closeItemInHeader(); + InventoryInstance.openHoldingsAccordion(testData.locations[1].name); + InventoryInstance.openItemByBarcodeAndIndex(barcodeForFirstItem); + ItemRecordView.checkItemDetails( + testData.locations[1].name, + barcodeForFirstItem, + ITEM_STATUS_NAMES.ON_ORDER, + ); + InventoryItems.closeItemInHeader(); + InventoryInstance.openHoldingsAccordion(testData.locations[1].name); + InventoryInstance.openItemByBarcodeAndIndex(barcodeForSecondItem); + ItemRecordView.checkItemDetails( + testData.locations[1].name, + barcodeForSecondItem, + ITEM_STATUS_NAMES.ON_ORDER, + ); + InventoryItems.closeItemInHeader(); + }, + ); + }); }); diff --git a/cypress/e2e/orders/inventory-interaction/create-open-order-and-order-line-from-instance.cy.js b/cypress/e2e/orders/inventory-interaction/create-open-order-and-order-line-from-instance.cy.js index 987cf10d18..a0eeab0dbc 100644 --- a/cypress/e2e/orders/inventory-interaction/create-open-order-and-order-line-from-instance.cy.js +++ b/cypress/e2e/orders/inventory-interaction/create-open-order-and-order-line-from-instance.cy.js @@ -61,7 +61,7 @@ describe('Orders', () => { it( 'C353987 A user can create and open new order and PO line from instance record (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353987'] }, () => { // Click on instance from preconditions InventoryInstances.searchByTitle(testData.instance.instanceTitle); diff --git a/cypress/e2e/orders/inventory-interaction/create-save-order-and-order-line-from-instance.cy.js b/cypress/e2e/orders/inventory-interaction/create-save-order-and-order-line-from-instance.cy.js index e9e0bf818e..2ed99206ef 100644 --- a/cypress/e2e/orders/inventory-interaction/create-save-order-and-order-line-from-instance.cy.js +++ b/cypress/e2e/orders/inventory-interaction/create-save-order-and-order-line-from-instance.cy.js @@ -61,7 +61,7 @@ describe('Orders', () => { it( 'C353988 A user can create and save new order and PO line from instance record (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353988'] }, () => { // Click on instance from preconditions InventoryInstances.searchByTitle(testData.instance.instanceTitle); diff --git a/cypress/e2e/orders/inventory-interaction/edit-instance-connection.cy.js b/cypress/e2e/orders/inventory-interaction/edit-instance-connection.cy.js index 66fb6f090d..91a5bbef5f 100644 --- a/cypress/e2e/orders/inventory-interaction/edit-instance-connection.cy.js +++ b/cypress/e2e/orders/inventory-interaction/edit-instance-connection.cy.js @@ -84,7 +84,7 @@ describe('Orders', () => { it( 'C353576 Edit instance connection of POL - create inventory set to "Instance, holding" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353576'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-created-pol.cy.js b/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-created-pol.cy.js index e4159497d7..7d52492a15 100644 --- a/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-created-pol.cy.js +++ b/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-created-pol.cy.js @@ -104,7 +104,7 @@ describe('Orders', () => { it( 'C374119 Instance reference is NOT removed when user does not confirm changing that will remove the instance UUID from the POL when creating PO line (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374119'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-edited-pol.cy.js b/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-edited-pol.cy.js index 36398907a8..b1dcf0bfce 100644 --- a/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-edited-pol.cy.js +++ b/cypress/e2e/orders/inventory-interaction/instance-reference-is-not-removed-when-edited-pol.cy.js @@ -116,7 +116,7 @@ describe('Orders', () => { it( 'C374120 Instance reference is NOT removed when user does not confirm changing that will remove the instance UUID from the POL when editing PO line (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374120'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-created-pol.cy.js b/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-created-pol.cy.js index e517684099..5f5aab6b46 100644 --- a/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-created-pol.cy.js +++ b/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-created-pol.cy.js @@ -130,7 +130,7 @@ describe('Orders', () => { it( 'C374113 Instance reference is removed when user confirms changing that will remove the instance UUID from the POL when creating PO line (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C374113'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-edited-pol.cy.js b/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-edited-pol.cy.js index fd37869393..a4a905eb92 100644 --- a/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-edited-pol.cy.js +++ b/cypress/e2e/orders/inventory-interaction/instance-reference-is-removed-when-edited-pol.cy.js @@ -128,7 +128,7 @@ describe('Orders', () => { it( 'C374118 Instance reference is removed when user confirms changing that will remove the instance UUID from the POL when editing PO line (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C374118'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/permission-does-not-grant-delete-polpermission.cy.js b/cypress/e2e/orders/inventory-interaction/permission-does-not-grant-delete-polpermission.cy.js index 77489e52cf..76b72e5486 100644 --- a/cypress/e2e/orders/inventory-interaction/permission-does-not-grant-delete-polpermission.cy.js +++ b/cypress/e2e/orders/inventory-interaction/permission-does-not-grant-delete-polpermission.cy.js @@ -215,7 +215,7 @@ describe('Orders: Inventory interaction', () => { it( 'C367948 "Inventory: Create order from instance" permission does not grant delete POL permission (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C367948'] }, () => { Orders.searchByParameter('PO number', firstOrderNumber); Orders.selectFromResultsList(firstOrderNumber); diff --git a/cypress/e2e/orders/inventory-interaction/select-existing-order-from-instance-record-on-creation.cy.js b/cypress/e2e/orders/inventory-interaction/select-existing-order-from-instance-record-on-creation.cy.js index 0ec26814f6..3bb52533dc 100644 --- a/cypress/e2e/orders/inventory-interaction/select-existing-order-from-instance-record-on-creation.cy.js +++ b/cypress/e2e/orders/inventory-interaction/select-existing-order-from-instance-record-on-creation.cy.js @@ -62,7 +62,7 @@ describe('Orders', () => { it( 'C353989 A user can select existing order when creating an order from instance record (Thunderjet)(TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353989'] }, () => { InventorySearchAndFilter.byKeywords(testData.instanceName); InventoryInstance.checkInstanceTitle(testData.instanceName); diff --git a/cypress/e2e/orders/item-status-changed-to-order-closed.cy.js b/cypress/e2e/orders/item-status-changed-to-order-closed.cy.js index e506281cbd..accfebeb3a 100644 --- a/cypress/e2e/orders/item-status-changed-to-order-closed.cy.js +++ b/cypress/e2e/orders/item-status-changed-to-order-closed.cy.js @@ -103,7 +103,7 @@ describe('Orders', () => { it( 'C367963 Linked items status is updated to "Order closed" when cancelling one PO line in the order with multiple PO lines (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C367963'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/location-dd-in-order-line-allows-parentheses.cy.js b/cypress/e2e/orders/location-dd-in-order-line-allows-parentheses.cy.js index c0b0bb0d87..438b006c86 100644 --- a/cypress/e2e/orders/location-dd-in-order-line-allows-parentheses.cy.js +++ b/cypress/e2e/orders/location-dd-in-order-line-allows-parentheses.cy.js @@ -54,7 +54,7 @@ describe('Orders', () => { it( 'C367957 Orders POL location dropdown search textbox allows use of parentheses characters (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C367957'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/one-tiem-pol-can-not-be-saved-without-expense-class.cy.js b/cypress/e2e/orders/one-tiem-pol-can-not-be-saved-without-expense-class.cy.js index 73230ec609..1affaec9a8 100644 --- a/cypress/e2e/orders/one-tiem-pol-can-not-be-saved-without-expense-class.cy.js +++ b/cypress/e2e/orders/one-tiem-pol-can-not-be-saved-without-expense-class.cy.js @@ -117,7 +117,7 @@ describe('Orders', () => { it( 'C402773 PO line for "One-time" order can not be saved when "Expense class" field is empty (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C402773'] }, () => { Orders.createApprovedOrderForRollover(order, true).then((firstOrderResponse) => { order.id = firstOrderResponse.id; diff --git a/cypress/e2e/orders/ongoing-pol-can-not-be-saved-without-expense-class.cy.js b/cypress/e2e/orders/ongoing-pol-can-not-be-saved-without-expense-class.cy.js index 17d1434e28..5285b5444e 100644 --- a/cypress/e2e/orders/ongoing-pol-can-not-be-saved-without-expense-class.cy.js +++ b/cypress/e2e/orders/ongoing-pol-can-not-be-saved-without-expense-class.cy.js @@ -117,7 +117,7 @@ describe('Orders', () => { it( 'C402774 PO line for "Ongoing" order can not be saved when "Expense class" field is empty (thunderjet) (TaaS)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C402774'] }, () => { Orders.createApprovedOrderForRollover(order, true).then((firstOrderResponse) => { order.id = firstOrderResponse.id; diff --git a/cypress/e2e/orders/open-order-from-pol-edit-form.cy.js b/cypress/e2e/orders/open-order-from-pol-edit-form.cy.js index b31c17b8d3..45f11ac4e7 100644 --- a/cypress/e2e/orders/open-order-from-pol-edit-form.cy.js +++ b/cypress/e2e/orders/open-order-from-pol-edit-form.cy.js @@ -58,7 +58,7 @@ describe('Orders', () => { it( 'C6531 Save and open PO from POL create or edit form (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C6531'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/open-order-having-po-line-with-two-fund-distributions.cy.js b/cypress/e2e/orders/open-order-having-po-line-with-two-fund-distributions.cy.js index 72f86526da..d75fb57e6e 100644 --- a/cypress/e2e/orders/open-order-having-po-line-with-two-fund-distributions.cy.js +++ b/cypress/e2e/orders/open-order-having-po-line-with-two-fund-distributions.cy.js @@ -143,7 +143,7 @@ describe('Orders', () => { it( 'C407711 Open order having PO line with two fund distributions related to different ledgers and same fiscal year after executing rollover (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C407711'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/open-order-w-not-unique-po-line-title.cy.js b/cypress/e2e/orders/open-order-w-not-unique-po-line-title.cy.js index f9c55bb864..82abad8654 100644 --- a/cypress/e2e/orders/open-order-w-not-unique-po-line-title.cy.js +++ b/cypress/e2e/orders/open-order-w-not-unique-po-line-title.cy.js @@ -65,7 +65,7 @@ describe('Orders', () => { it( 'C353562 User is able to open purchase order with NOT unique PO line title when "Disable duplicate check" option is enabled (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353562'] }, () => { // Search for the Order #1 from Preconditions and click on its record const OrderDetails = Orders.selectOrderByPONumber(testData.orders[0].poNumber); diff --git a/cypress/e2e/orders/open-order-when-ledger-has-separate-aq-unit.cy.js b/cypress/e2e/orders/open-order-when-ledger-has-separate-aq-unit.cy.js index 5313f59bf9..30bb27b363 100644 --- a/cypress/e2e/orders/open-order-when-ledger-has-separate-aq-unit.cy.js +++ b/cypress/e2e/orders/open-order-when-ledger-has-separate-aq-unit.cy.js @@ -66,7 +66,7 @@ describe('Orders', () => { it( 'C407655 Open order when ledger has separate acquisition unit (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C407655'] }, () => { // Open Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/orders-export-to-a-vendor-with-open-order.cy.js b/cypress/e2e/orders/orders-export-to-a-vendor-with-open-order.cy.js index 55d3a62f6f..b734b41528 100644 --- a/cypress/e2e/orders/orders-export-to-a-vendor-with-open-order.cy.js +++ b/cypress/e2e/orders/orders-export-to-a-vendor-with-open-order.cy.js @@ -5,6 +5,7 @@ import OrderLines from '../../support/fragments/orders/orderLines'; import Orders from '../../support/fragments/orders/orders'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; @@ -45,7 +46,7 @@ describe('Export Manager', () => { order.orderType = 'One-time'; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -85,7 +86,7 @@ describe('Export Manager', () => { it( 'C350398 Verify that Order is not exported to a definite Vendor if Automatic export option in Order PO Line is disabled (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350398'] }, () => { Orders.createOrder(order, true, true).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/orders-export-to-a-vendor.cy.js b/cypress/e2e/orders/orders-export-to-a-vendor.cy.js index ba09d2096c..338621c3b8 100644 --- a/cypress/e2e/orders/orders-export-to-a-vendor.cy.js +++ b/cypress/e2e/orders/orders-export-to-a-vendor.cy.js @@ -4,6 +4,7 @@ import OrderLines from '../../support/fragments/orders/orderLines'; import Orders from '../../support/fragments/orders/orders'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; @@ -44,7 +45,7 @@ describe('Export Manager', () => { order.orderType = 'One-time'; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -84,7 +85,7 @@ describe('Export Manager', () => { it( 'C350396 Verify that Order is not exported to a definite Vendor if Acquisition method selected in the Order line DOES NOT match Organization Integration configs (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350396'] }, () => { Orders.createOrder(order, true, false).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/orders.unreceivePiece.cy.js b/cypress/e2e/orders/orders.unreceivePiece.cy.js index 0714c02365..f22ec6f0dd 100644 --- a/cypress/e2e/orders/orders.unreceivePiece.cy.js +++ b/cypress/e2e/orders/orders.unreceivePiece.cy.js @@ -13,68 +13,70 @@ import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; import InventoryInstance from '../../support/fragments/inventory/inventoryInstance'; import TopMenu from '../../support/fragments/topMenu'; -describe('orders: Unreceive piece from Order', () => { - const order = { ...NewOrder.defaultOneTimeOrder }; - const orderLine = { ...BasicOrderLine.defaultOrderLine }; - const organization = { ...NewOrganization.defaultUiOrganizations }; +describe('Orders', () => { + describe('Receiving and Check-in', () => { + const order = { ...NewOrder.defaultOneTimeOrder }; + const orderLine = { ...BasicOrderLine.defaultOrderLine }; + const organization = { ...NewOrganization.defaultUiOrganizations }; - before(() => { - cy.getAdminToken(); - Organizations.createOrganizationViaApi(organization).then((response) => { - organization.id = response; - order.vendor = response; - orderLine.physical.materialSupplier = response; - orderLine.eresource.accessProvider = response; - }); - cy.getLocations({ query: `name="${OrdersHelper.mainLibraryLocation}"` }).then((location) => { - orderLine.locations[0].locationId = location.id; - }); - cy.getBookMaterialType().then((materialType) => { - orderLine.physical.materialType = materialType.id; - }); - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + before(() => { + cy.getAdminToken(); + Organizations.createOrganizationViaApi(organization).then((response) => { + organization.id = response; + order.vendor = response; + orderLine.physical.materialSupplier = response; + orderLine.eresource.accessProvider = response; + }); + cy.getLocations({ query: `name="${OrdersHelper.mainLibraryLocation}"` }).then((location) => { + orderLine.locations[0].locationId = location.id; + }); + cy.getBookMaterialType().then((materialType) => { + orderLine.physical.materialType = materialType.id; + }); + cy.waitForAuthRefresh(() => { + cy.loginAsAdmin({ + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - after(() => { - Orders.deleteOrderViaApi(order.id); - Organizations.deleteOrganizationViaApi(organization.id); - }); + after(() => { + Orders.deleteOrderViaApi(order.id); + Organizations.deleteOrganizationViaApi(organization.id); + }); - it( - 'C10925 Unreceive piece using "Actions" button (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, - () => { - const barcode = Helper.getRandomBarcode(); - const enumeration = 'autotestCaption'; - Orders.createOrderWithOrderLineViaApi(order, orderLine).then(({ poNumber }) => { - Orders.searchByParameter('PO number', poNumber); - Orders.selectFromResultsList(poNumber); - Orders.openOrder(); - InteractorsTools.checkCalloutMessage( - `The Purchase order - ${poNumber} has been successfully opened`, - ); - Orders.receiveOrderViaActions(); - // Receive piece - Receiving.selectPOLInReceive(orderLine.titleOrPackage); - Receiving.receivePiece(0, enumeration, barcode); - Receiving.checkReceivedPiece(0, enumeration, barcode); - // Unreceive piece - Receiving.unreceivePiece(); - // inventory part - TopMenuNavigation.openAppFromDropdown('Inventory'); - InventorySearchAndFilter.switchToItem(); - InventorySearchAndFilter.searchByParameter('Barcode', barcode); - cy.wait(5000); - InventorySearchAndFilter.clickOnCloseIcon(); - InventoryInstance.openHoldingsAccordion(OrdersHelper.mainLibraryLocation); - InventoryInstance.openItemByBarcodeAndIndex(barcode); - ItemRecordView.verifyItemStatus('On order'); - }); - }, - ); + it( + 'C10925 Unreceive piece using "Actions" button (thunderjet)', + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C10925'] }, + () => { + const barcode = Helper.getRandomBarcode(); + const enumeration = 'autotestCaption'; + Orders.createOrderWithOrderLineViaApi(order, orderLine).then(({ poNumber }) => { + Orders.searchByParameter('PO number', poNumber); + Orders.selectFromResultsList(poNumber); + Orders.openOrder(); + InteractorsTools.checkCalloutMessage( + `The Purchase order - ${poNumber} has been successfully opened`, + ); + Orders.receiveOrderViaActions(); + // Receive piece + Receiving.selectPOLInReceive(orderLine.titleOrPackage); + Receiving.receivePiece(0, enumeration, barcode); + Receiving.checkReceivedPiece(0, enumeration, barcode); + // Unreceive piece + Receiving.unreceivePiece(); + // inventory part + TopMenuNavigation.openAppFromDropdown('Inventory'); + InventorySearchAndFilter.switchToItem(); + InventorySearchAndFilter.searchByParameter('Barcode', barcode); + cy.wait(5000); + InventorySearchAndFilter.clickOnCloseIcon(); + InventoryInstance.openHoldingsAccordion(OrdersHelper.mainLibraryLocation); + InventoryInstance.openItemByBarcodeAndIndex(barcode); + ItemRecordView.verifyItemStatus('On order'); + }); + }, + ); + }); }); diff --git a/cypress/e2e/orders/po-filters-with-cLose-order.cy.js b/cypress/e2e/orders/po-filters-with-cLose-order.cy.js index a8ebd38c92..69ea045483 100644 --- a/cypress/e2e/orders/po-filters-with-cLose-order.cy.js +++ b/cypress/e2e/orders/po-filters-with-cLose-order.cy.js @@ -79,7 +79,7 @@ describe('orders: Test PO filters', { retries: { runMode: 1 } }, () => { ].forEach((filter) => { it( 'C350906 Test the PO filters with closed Order [except tags] (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C350906'] }, () => { filter.filterActions(); Orders.checkSearchResultsWithClosedOrder(orderNumber); diff --git a/cypress/e2e/orders/po-filters.cy.js b/cypress/e2e/orders/po-filters.cy.js index 52bbd8d1f8..c6bce2a45d 100644 --- a/cypress/e2e/orders/po-filters.cy.js +++ b/cypress/e2e/orders/po-filters.cy.js @@ -92,7 +92,7 @@ describe('orders: Test PO filters', () => { ].forEach((filter) => { it( 'C6718 Test the PO filters with open Order [except tags] (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C6718'] }, () => { filter.filterActions(); Orders.checkSearchResults(orderNumber); diff --git a/cypress/e2e/orders/po-search.cy.js b/cypress/e2e/orders/po-search.cy.js index 95d19e0349..9e6637cdd3 100644 --- a/cypress/e2e/orders/po-search.cy.js +++ b/cypress/e2e/orders/po-search.cy.js @@ -45,7 +45,7 @@ describe('orders: Test PO search', () => { it( 'C6717 Test the PO searches (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C6717'] }, () => { Orders.createOrderWithOrderLineViaApi(order, orderLine).then(({ poNumber }) => { orderNumber = poNumber; diff --git a/cypress/e2e/orders/pol-filters.cy.js b/cypress/e2e/orders/pol-filters.cy.js index 79ca56a9c9..8f70c0afa4 100644 --- a/cypress/e2e/orders/pol-filters.cy.js +++ b/cypress/e2e/orders/pol-filters.cy.js @@ -11,7 +11,7 @@ import DateTools from '../../support/utils/dateTools'; import getRandomPostfix from '../../support/utils/stringTools'; import OrderLines from '../../support/fragments/orders/orderLines'; -describe('orders: Test Po line filters', () => { +describe('Orders', () => { const organization = { ...NewOrganization.defaultUiOrganizations }; const today = new Date(); const subcriptionDate = DateTools.getFormattedDate({ date: today }, 'MM/DD/YYYY'); @@ -136,7 +136,7 @@ describe('orders: Test Po line filters', () => { ].forEach((filter) => { it( `C6720 Test the POL filters [except tags]: ${filter.name} (thunderjet)`, - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C6720'] }, () => { Orders.searchByParameter('PO line number', orderLineNumber); Orders.resetFilters(); diff --git a/cypress/e2e/orders/pol-search-am-filter.cy.js b/cypress/e2e/orders/pol-search-am-filter.cy.js index 46d7dcd1e3..856fca405b 100644 --- a/cypress/e2e/orders/pol-search-am-filter.cy.js +++ b/cypress/e2e/orders/pol-search-am-filter.cy.js @@ -9,6 +9,7 @@ import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; import getRandomPostfix from '../../support/utils/stringTools'; import OrderLinesLimit from '../../support/fragments/settings/orders/orderLinesLimit'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; Cypress.on('uncaught:exception', () => false); @@ -46,7 +47,7 @@ describe('Export Manager', () => { organization.id = organizationResponse; order.vendor = organization.name; order.orderType = 'One-time'; - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); @@ -107,7 +108,7 @@ describe('Export Manager', () => { it( 'C350603 Searching POL by specifying acquisition method (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C350603'] }, () => { Orders.selectOrderLines(); Orders.resetFiltersIfActive(); diff --git a/cypress/e2e/orders/pol-search.cy.js b/cypress/e2e/orders/pol-search.cy.js index 4130d9f2df..b27fb1078c 100644 --- a/cypress/e2e/orders/pol-search.cy.js +++ b/cypress/e2e/orders/pol-search.cy.js @@ -123,7 +123,7 @@ describe('orders: Test Po line search', () => { // TODO: add extra TC in testrail about it it( 'C6719 Test the POL searches(Only test POL name search) (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C6719'] }, () => { Orders.searchByParameter('PO line number', orderLineNumber); Orders.checkOrderlineSearchResults(orderLineNumber); diff --git a/cypress/e2e/orders/populate-claiming-interval-from-organization.cy.js b/cypress/e2e/orders/populate-claiming-interval-from-organization.cy.js index 05f1f70075..0262125801 100644 --- a/cypress/e2e/orders/populate-claiming-interval-from-organization.cy.js +++ b/cypress/e2e/orders/populate-claiming-interval-from-organization.cy.js @@ -51,7 +51,7 @@ describe('Orders', () => { it( 'C423436 Populate claiming interval in PO line from Organization record for ongoing order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C423436'] }, () => { // Go to order from "Preconditions" details pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/populate-claiming-interval-in-pol-from-organization-for-one-time-order.cy.js b/cypress/e2e/orders/populate-claiming-interval-in-pol-from-organization-for-one-time-order.cy.js index c8f7f39161..ec6f80220c 100644 --- a/cypress/e2e/orders/populate-claiming-interval-in-pol-from-organization-for-one-time-order.cy.js +++ b/cypress/e2e/orders/populate-claiming-interval-in-pol-from-organization-for-one-time-order.cy.js @@ -113,7 +113,7 @@ describe('Orders', () => { it( 'C423438 Populate claiming interval in PO line from Organization record for one-time order (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C423438'] }, () => { Orders.resetFiltersIfActive(); Orders.searchByParameter('PO number', orderNumber); diff --git a/cypress/e2e/orders/receive-piece-from-order.cy.js b/cypress/e2e/orders/receive-piece-from-order.cy.js index c61ce6f10d..e4ce9f12dd 100644 --- a/cypress/e2e/orders/receive-piece-from-order.cy.js +++ b/cypress/e2e/orders/receive-piece-from-order.cy.js @@ -16,92 +16,98 @@ import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; describe( - 'orders: Receive piece from Order', + 'Orders', { retries: { runMode: 1, }, }, () => { - let order; - let organization; - let orderLineTitle; - let orderNumber; - let user; - const barcode = Helper.getRandomBarcode(); - const enumeration = 'autotestCaption'; + describe('Receiving and Check-in', () => { + let order; + let organization; + let orderLineTitle; + let orderNumber; + let user; + const barcode = Helper.getRandomBarcode(); + const enumeration = 'autotestCaption'; - beforeEach(() => { - order = { - ...NewOrder.defaultOneTimeOrder, - approved: true, - }; - organization = { ...NewOrganization.defaultUiOrganizations }; - orderLineTitle = BasicOrderLine.defaultOrderLine.titleOrPackage; - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, - }); - }); - Organizations.createOrganizationViaApi(organization).then((response) => { - organization.id = response; - order.vendor = response; - }); - cy.createOrderApi(order).then((orderResponse) => { - orderNumber = orderResponse.body.poNumber; - Orders.resetFiltersIfActive(); - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - OrderLines.addPOLine(); - cy.wait(4000); - OrderLines.POLineInfodorPhysicalMaterial(orderLineTitle); - }); - cy.createTempUser([ - permissions.uiOrdersView.gui, - permissions.uiOrdersApprovePurchaseOrders.gui, - permissions.uiOrdersReopenPurchaseOrders.gui, - permissions.uiInventoryViewInstances.gui, - permissions.uiReceivingViewEditCreate.gui, - ]).then((userProperties) => { - user = userProperties; + beforeEach(() => { + order = { + ...NewOrder.defaultOneTimeOrder, + approved: true, + }; + organization = { ...NewOrganization.defaultUiOrganizations }; + orderLineTitle = BasicOrderLine.defaultOrderLine.titleOrPackage; cy.waitForAuthRefresh(() => { - cy.login(userProperties.username, userProperties.password, { + cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading, }); }); + Organizations.createOrganizationViaApi(organization).then((response) => { + organization.id = response; + order.vendor = response; + }); + cy.createOrderApi(order).then((orderResponse) => { + orderNumber = orderResponse.body.poNumber; + Orders.resetFiltersIfActive(); + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + OrderLines.addPOLine(); + cy.wait(4000); + OrderLines.POLineInfodorPhysicalMaterial(orderLineTitle); + }); + cy.createTempUser([ + permissions.uiOrdersView.gui, + permissions.uiOrdersApprovePurchaseOrders.gui, + permissions.uiOrdersReopenPurchaseOrders.gui, + permissions.uiInventoryViewInstances.gui, + permissions.uiReceivingViewEditCreate.gui, + ]).then((userProperties) => { + user = userProperties; + cy.waitForAuthRefresh(() => { + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); + }); + }); }); - }); - afterEach(() => { - cy.getAdminToken(); - Orders.deleteOrderViaApi(order.id); - Organizations.deleteOrganizationViaApi(organization.id); - Users.deleteViaApi(user.userId); - }); + afterEach(() => { + cy.getAdminToken(); + Orders.deleteOrderViaApi(order.id); + Organizations.deleteOrganizationViaApi(organization.id); + Users.deleteViaApi(user.userId); + }); - it( - 'C735 Receiving pieces from an order for physical material that is set to create Items in inventory (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, - () => { - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.openOrder(); - InteractorsTools.checkCalloutMessage( - `The Purchase order - ${orderNumber} has been successfully opened`, - ); - Orders.receiveOrderViaActions(); - // Receiving part - Receiving.selectPOLInReceive(orderLineTitle); - Receiving.receivePiece(0, enumeration, barcode); - Receiving.checkReceivedPiece(0, enumeration, barcode); - // inventory part - TopMenuNavigation.navigateToApp('Inventory'); - InventorySearchAndFilter.switchToItem(); - InventorySearchAndFilter.searchByParameter('Barcode', barcode); - ItemRecordView.checkItemDetails(OrdersHelper.onlineLibraryLocation, barcode, 'In process'); - }, - ); + it( + 'C735 Receiving pieces from an order for physical material that is set to create Items in inventory (thunderjet)', + { tags: ['smoke', 'thunderjet', 'shiftLeft', 'C735'] }, + () => { + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + Orders.openOrder(); + InteractorsTools.checkCalloutMessage( + `The Purchase order - ${orderNumber} has been successfully opened`, + ); + Orders.receiveOrderViaActions(); + // Receiving part + Receiving.selectPOLInReceive(orderLineTitle); + Receiving.receivePiece(0, enumeration, barcode); + Receiving.checkReceivedPiece(0, enumeration, barcode); + // inventory part + TopMenuNavigation.navigateToApp('Inventory'); + InventorySearchAndFilter.switchToItem(); + InventorySearchAndFilter.searchByParameter('Barcode', barcode); + ItemRecordView.checkItemDetails( + OrdersHelper.onlineLibraryLocation, + barcode, + 'In process', + ); + }, + ); + }); }, ); diff --git a/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-quick-receive-option.cy.js b/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-quick-receive-option.cy.js index 6ea715fe55..79dd9147ee 100644 --- a/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-quick-receive-option.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-quick-receive-option.cy.js @@ -13,101 +13,103 @@ import ServicePoints from '../../../support/fragments/settings/tenant/servicePoi import TopMenu from '../../../support/fragments/topMenu'; import getRandomPostfix from '../../../support/utils/stringTools'; -describe('orders: Receiving and Check-in', () => { - const order = { - ...NewOrder.defaultOneTimeOrder, - approved: true, - }; - const organization = { - ...NewOrganization.defaultUiOrganizations, - accounts: [ - { - accountNo: getRandomPostfix(), - accountStatus: 'Active', - acqUnitIds: [], - appSystemNo: '', - description: 'Main library account', - libraryCode: 'COB', - libraryEdiCode: getRandomPostfix(), - name: 'TestAccout1', - notes: '', - paymentMethod: 'Cash', - }, - ], - }; - const copyNumber = Helper.getRandomBarcode(); - let orderLineTitle; - let orderNumber; - let circ2LocationServicePoint; - let location; +describe('Orders', () => { + describe('Receiving and Check-in', () => { + const order = { + ...NewOrder.defaultOneTimeOrder, + approved: true, + }; + const organization = { + ...NewOrganization.defaultUiOrganizations, + accounts: [ + { + accountNo: getRandomPostfix(), + accountStatus: 'Active', + acqUnitIds: [], + appSystemNo: '', + description: 'Main library account', + libraryCode: 'COB', + libraryEdiCode: getRandomPostfix(), + name: 'TestAccout1', + notes: '', + paymentMethod: 'Cash', + }, + ], + }; + const copyNumber = Helper.getRandomBarcode(); + let orderLineTitle; + let orderNumber; + let circ2LocationServicePoint; + let location; - before(() => { - cy.getAdminToken(); + before(() => { + cy.getAdminToken(); - ServicePoints.getCircDesk2ServicePointViaApi().then((servicePoint) => { - circ2LocationServicePoint = servicePoint; - NewLocation.createViaApi(NewLocation.getDefaultLocation(circ2LocationServicePoint.id)).then( - (locationResponse) => { - location = locationResponse; - Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { - organization.id = organizationsResponse; - order.vendor = organizationsResponse; - }); + ServicePoints.getCircDesk2ServicePointViaApi().then((servicePoint) => { + circ2LocationServicePoint = servicePoint; + NewLocation.createViaApi(NewLocation.getDefaultLocation(circ2LocationServicePoint.id)).then( + (locationResponse) => { + location = locationResponse; + Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { + organization.id = organizationsResponse; + order.vendor = organizationsResponse; + }); - cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading }); - cy.createOrderApi(order).then((response) => { - orderNumber = response.body.poNumber; - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.createPOLineViaActions(); - OrderLines.selectRandomInstanceInTitleLookUP('*', 17); - OrderLines.fillInPOLineInfoForExportWithLocationForPhysicalResource( - 'Purchase', - locationResponse.name, - '1', - ); - OrderLines.backToEditingOrder(); - Orders.openOrder(); - OrderLines.getOrderLineViaApi({ - query: `poLineNumber=="*${orderNumber}*"`, - }).then((orderLinesResponse) => { - orderLineTitle = orderLinesResponse[0].titleOrPackage; + cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading }); + cy.createOrderApi(order).then((response) => { + orderNumber = response.body.poNumber; + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + Orders.createPOLineViaActions(); + OrderLines.selectRandomInstanceInTitleLookUP('*', 17); + OrderLines.fillInPOLineInfoForExportWithLocationForPhysicalResource( + 'Purchase', + locationResponse.name, + '1', + ); + OrderLines.backToEditingOrder(); + Orders.openOrder(); + OrderLines.getOrderLineViaApi({ + query: `poLineNumber=="*${orderNumber}*"`, + }).then((orderLinesResponse) => { + orderLineTitle = orderLinesResponse[0].titleOrPackage; + }); }); - }); - }, - ); - }); + }, + ); + }); - cy.createTempUser([ - permissions.uiInventoryViewInstances.gui, - permissions.uiReceivingViewEditCreate.gui, - permissions.uiOrdersView.gui, - ]).then((userProperties) => { - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + cy.createTempUser([ + permissions.uiInventoryViewInstances.gui, + permissions.uiReceivingViewEditCreate.gui, + permissions.uiOrdersView.gui, + ]).then((userProperties) => { + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - // TODO: Need to find solution to delete all data, because now i cant delete location and user - it( - 'C374134 Copy number applies to the item when receiving through "Quick receive" option (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.receiveOrderViaActions(); - Receiving.selectLinkFromResultsList(); - Receiving.selectPieceByIndexInExpected(); - Receiving.fillInCopyNumberInAddPieceModal(copyNumber); - Receiving.openDropDownInEditPieceModal(); - Receiving.quickReceivePieceAdd(); - Receiving.selectInstanceInReceive(orderLineTitle); - InventoryInstance.openHoldingsAccordion(location.name); - InventoryInstance.openItemByBarcodeAndIndex('No barcode'); - ItemRecordView.verifyEffectiveLocation(location.name); - ItemRecordView.checkCopyNumber(copyNumber); - }, - ); + // TODO: Need to find solution to delete all data, because now i cant delete location and user + it( + 'C374134 Copy number applies to the item when receiving through "Quick receive" option (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C374134'] }, + () => { + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + Orders.receiveOrderViaActions(); + Receiving.selectLinkFromResultsList(); + Receiving.selectPieceByIndexInExpected(); + Receiving.fillInCopyNumberInAddPieceModal(copyNumber); + Receiving.openDropDownInEditPieceModal(); + Receiving.quickReceivePieceAdd(); + Receiving.selectInstanceInReceive(orderLineTitle); + InventoryInstance.openHoldingsAccordion(location.name); + InventoryInstance.openItemByBarcodeAndIndex('No barcode'); + ItemRecordView.verifyEffectiveLocation(location.name); + ItemRecordView.checkCopyNumber(copyNumber); + }, + ); + }); }); diff --git a/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-receive-option.cy.js b/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-receive-option.cy.js index d18345f5a7..6a6d33e549 100644 --- a/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-receive-option.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/copy-number-applies-receive-option.cy.js @@ -13,100 +13,102 @@ import ServicePoints from '../../../support/fragments/settings/tenant/servicePoi import TopMenu from '../../../support/fragments/topMenu'; import getRandomPostfix from '../../../support/utils/stringTools'; -describe('orders: Receiving and Check-in', () => { - const order = { - ...NewOrder.defaultOneTimeOrder, - approved: true, - }; - const organization = { - ...NewOrganization.defaultUiOrganizations, - accounts: [ - { - accountNo: getRandomPostfix(), - accountStatus: 'Active', - acqUnitIds: [], - appSystemNo: '', - description: 'Main library account', - libraryCode: 'COB', - libraryEdiCode: getRandomPostfix(), - name: 'TestAccout1', - notes: '', - paymentMethod: 'Cash', - }, - ], - }; - const copyNumber = Helper.getRandomBarcode(); +describe('Orders', () => { + describe('Receiving and Check-in', () => { + const order = { + ...NewOrder.defaultOneTimeOrder, + approved: true, + }; + const organization = { + ...NewOrganization.defaultUiOrganizations, + accounts: [ + { + accountNo: getRandomPostfix(), + accountStatus: 'Active', + acqUnitIds: [], + appSystemNo: '', + description: 'Main library account', + libraryCode: 'COB', + libraryEdiCode: getRandomPostfix(), + name: 'TestAccout1', + notes: '', + paymentMethod: 'Cash', + }, + ], + }; + const copyNumber = Helper.getRandomBarcode(); - let orderNumber; - let circ2LocationServicePoint; - let location; - let orderLineTitleName; + let orderNumber; + let circ2LocationServicePoint; + let location; + let orderLineTitleName; - before(() => { - cy.getAdminToken(); + before(() => { + cy.getAdminToken(); - ServicePoints.getCircDesk2ServicePointViaApi().then((servicePoint) => { - circ2LocationServicePoint = servicePoint; - NewLocation.createViaApi(NewLocation.getDefaultLocation(circ2LocationServicePoint.id)).then( - (locationResponse) => { - location = locationResponse; - Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { - organization.id = organizationsResponse; - order.vendor = organizationsResponse; - }); + ServicePoints.getCircDesk2ServicePointViaApi().then((servicePoint) => { + circ2LocationServicePoint = servicePoint; + NewLocation.createViaApi(NewLocation.getDefaultLocation(circ2LocationServicePoint.id)).then( + (locationResponse) => { + location = locationResponse; + Organizations.createOrganizationViaApi(organization).then((organizationsResponse) => { + organization.id = organizationsResponse; + order.vendor = organizationsResponse; + }); - cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading }); - cy.createOrderApi(order).then((response) => { - orderNumber = response.body.poNumber; - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.createPOLineViaActions(); - OrderLines.selectRandomInstanceInTitleLookUP('*', 17); - OrderLines.fillInPOLineInfoForExportWithLocationForPhysicalResource( - 'Purchase', - locationResponse.name, - '1', - ); - OrderLines.backToEditingOrder(); - OrderLines.getOrderLineViaApi({ - query: `poLineNumber=="*${response.body.poNumber}*"`, - }).then((orderLines) => { - orderLineTitleName = orderLines[0]; + cy.loginAsAdmin({ path: TopMenu.ordersPath, waiter: Orders.waitLoading }); + cy.createOrderApi(order).then((response) => { + orderNumber = response.body.poNumber; + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + Orders.createPOLineViaActions(); + OrderLines.selectRandomInstanceInTitleLookUP('*', 17); + OrderLines.fillInPOLineInfoForExportWithLocationForPhysicalResource( + 'Purchase', + locationResponse.name, + '1', + ); + OrderLines.backToEditingOrder(); + OrderLines.getOrderLineViaApi({ + query: `poLineNumber=="*${response.body.poNumber}*"`, + }).then((orderLines) => { + orderLineTitleName = orderLines[0]; + }); + Orders.openOrder(); }); - Orders.openOrder(); - }); - }, - ); - }); + }, + ); + }); - cy.createTempUser([ - permissions.uiInventoryViewInstances.gui, - permissions.uiReceivingViewEditCreate.gui, - permissions.uiOrdersView.gui, - ]).then((userProperties) => { - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + cy.createTempUser([ + permissions.uiInventoryViewInstances.gui, + permissions.uiReceivingViewEditCreate.gui, + permissions.uiOrdersView.gui, + ]).then((userProperties) => { + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - // // TODO: Need to find solution to delete all data, becouse now i cant delete location and user + // // TODO: Need to find solution to delete all data, becouse now i cant delete location and user - it( - 'C374133 Copy number applies to the item when receiving through "Receive" option (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - Orders.searchByParameter('PO number', orderNumber); - Orders.selectFromResultsList(orderNumber); - Orders.receiveOrderViaActions(); - Receiving.selectLinkFromResultsList(); - Receiving.receivePieceWithOnlyCopyNumber(0, copyNumber); - Receiving.selectInstanceInReceive(orderLineTitleName.titleOrPackage); - InventoryInstance.openHoldingsAccordion(location.name); - InventoryInstance.openItemByBarcodeAndIndex('No barcode'); - ItemRecordView.verifyEffectiveLocation(location.name); - ItemRecordView.checkCopyNumber(copyNumber); - }, - ); + it( + 'C374133 Copy number applies to the item when receiving through "Receive" option (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C374133'] }, + () => { + Orders.searchByParameter('PO number', orderNumber); + Orders.selectFromResultsList(orderNumber); + Orders.receiveOrderViaActions(); + Receiving.selectLinkFromResultsList(); + Receiving.receivePieceWithOnlyCopyNumber(0, copyNumber); + Receiving.selectInstanceInReceive(orderLineTitleName.titleOrPackage); + InventoryInstance.openHoldingsAccordion(location.name); + InventoryInstance.openItemByBarcodeAndIndex('No barcode'); + ItemRecordView.verifyEffectiveLocation(location.name); + ItemRecordView.checkCopyNumber(copyNumber); + }, + ); + }); }); diff --git a/cypress/e2e/orders/receiving-and-check-in/copy-number-not-shown-in-receiving.cy.js b/cypress/e2e/orders/receiving-and-check-in/copy-number-not-shown-in-receiving.cy.js index dd99fd8e68..4f5b014069 100644 --- a/cypress/e2e/orders/receiving-and-check-in/copy-number-not-shown-in-receiving.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/copy-number-not-shown-in-receiving.cy.js @@ -86,7 +86,7 @@ describe('Orders', () => { it( 'C374137 "Copy number" value applied to the inventory item record is NOT shown in receiving (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C374137'] }, () => { // Click on Instance name from PO line from preconditions InventoryInstances.searchByTitle(testData.orderLine.titleOrPackage); diff --git a/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-quick-receive-option.cy.js b/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-quick-receive-option.cy.js index b4f1d0cd9d..38254286b2 100644 --- a/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-quick-receive-option.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-quick-receive-option.cy.js @@ -90,7 +90,7 @@ describe('Orders', () => { describe('Receiving and Check-in', () => { it( 'C375242 Create new holdings for already existing location when receiving item by "Quick receive" option (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375242'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-receive-option.cy.js b/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-receive-option.cy.js index 7336667bdf..6b708cfce7 100644 --- a/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-receive-option.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/create-new-holding-for-existing-location-receive-option.cy.js @@ -88,7 +88,7 @@ describe('Orders', () => { describe('Receiving and Check-in', () => { it( 'C375241 Create new holdings for already existing location when receiving item by "Receive" option (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C375241'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/edit-item-in-receiving-app.cy.js b/cypress/e2e/orders/receiving-and-check-in/edit-item-in-receiving-app.cy.js index cab415f851..a1f211868a 100644 --- a/cypress/e2e/orders/receiving-and-check-in/edit-item-in-receiving-app.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/edit-item-in-receiving-app.cy.js @@ -80,7 +80,7 @@ describe('Orders', () => { it( 'C374122 Editing title in "Receiving" app (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374122'] }, () => { // Search for selected title from Preconditions item #2 Receivings.searchByParameter({ diff --git a/cypress/e2e/orders/receiving-and-check-in/receive-piece-with-payment-not-required-status.cy.js b/cypress/e2e/orders/receiving-and-check-in/receive-piece-with-payment-not-required-status.cy.js index acbd4a535b..1e0f862fb5 100644 --- a/cypress/e2e/orders/receiving-and-check-in/receive-piece-with-payment-not-required-status.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/receive-piece-with-payment-not-required-status.cy.js @@ -157,7 +157,7 @@ describe('Orders: Receiving and Check-in', () => { it( 'C378899 Encumbrance releases when receive piece for order with payment status "Payment Not Required" (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C378899'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/receive-pieces-for-package-order.cy.js b/cypress/e2e/orders/receiving-and-check-in/receive-pieces-for-package-order.cy.js index 6c4ef72075..b46ecd3375 100644 --- a/cypress/e2e/orders/receiving-and-check-in/receive-pieces-for-package-order.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/receive-pieces-for-package-order.cy.js @@ -94,7 +94,7 @@ describe('Orders', () => { it( 'C343213 Receive pieces for package order (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C343213'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/receiving-item-with-open-title-level-request.cy.js b/cypress/e2e/orders/receiving-and-check-in/receiving-item-with-open-title-level-request.cy.js index 52e0dbef66..36c266e8f0 100644 --- a/cypress/e2e/orders/receiving-and-check-in/receiving-item-with-open-title-level-request.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/receiving-item-with-open-title-level-request.cy.js @@ -18,159 +18,164 @@ import TopMenu from '../../../support/fragments/topMenu'; import UserEdit from '../../../support/fragments/users/userEdit'; import Users from '../../../support/fragments/users/users'; -describe('Orders: Receiving and Check-in', () => { - const testData = { - servicePointName: 'Circ Desk 2', - organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), - order: {}, - orderLine: {}, - integration: {}, - integrationName: '', - user: {}, - enumeration: 'autotestCaption', - itemBarcode: uuid(), - }; +describe('Orders', () => { + describe('Receiving and Check-in', () => { + const testData = { + servicePointName: 'Circ Desk 2', + organization: NewOrganization.getDefaultOrganization({ accounts: 1 }), + order: {}, + orderLine: {}, + integration: {}, + integrationName: '', + user: {}, + enumeration: 'autotestCaption', + itemBarcode: uuid(), + }; - before(() => { - cy.getAdminToken().then(() => { - ServicePoints.getViaApi({ limit: 1, query: `name=="${testData.servicePointName}"` }).then( - (servicePoints) => { - testData.effectiveLocationServicePoint = servicePoints[0]; - NewLocation.createViaApi( - NewLocation.getDefaultLocation(testData.effectiveLocationServicePoint.id), - ) - .then((locationResponse) => { - testData.location = locationResponse; - Organizations.createOrganizationViaApi(testData.organization).then( - (organizationsResponse) => { - testData.organization.id = organizationsResponse; - testData.order.vendor = organizationsResponse; - }, - ); - }) - .then(() => { - cy.getDefaultMaterialType().then(({ id: materialTypeId }) => { - testData.order = NewOrder.getDefaultOrder({ - vendorId: testData.organization.id, - manualPo: false, - }); - testData.orderLine = { - ...BasicOrderLine.getDefaultOrderLine(), - cost: { - listUnitPrice: 10, - currency: 'USD', - discountType: 'percentage', - quantityPhysical: 1, - }, - orderFormat: 'Other', - physical: { - createInventory: 'Instance, Holding, Item', - materialType: materialTypeId, + before(() => { + cy.getAdminToken().then(() => { + ServicePoints.getViaApi({ limit: 1, query: `name=="${testData.servicePointName}"` }).then( + (servicePoints) => { + testData.effectiveLocationServicePoint = servicePoints[0]; + NewLocation.createViaApi( + NewLocation.getDefaultLocation(testData.effectiveLocationServicePoint.id), + ) + .then((locationResponse) => { + testData.location = locationResponse; + Organizations.createOrganizationViaApi(testData.organization).then( + (organizationsResponse) => { + testData.organization.id = organizationsResponse; + testData.order.vendor = organizationsResponse; }, - locations: [{ locationId: testData.location.id, quantityPhysical: 1 }], - }; + ); + }) + .then(() => { + cy.getDefaultMaterialType().then(({ id: materialTypeId }) => { + testData.order = NewOrder.getDefaultOrder({ + vendorId: testData.organization.id, + manualPo: false, + }); + testData.orderLine = { + ...BasicOrderLine.getDefaultOrderLine(), + cost: { + listUnitPrice: 10, + currency: 'USD', + discountType: 'percentage', + quantityPhysical: 1, + }, + orderFormat: 'Other', + physical: { + createInventory: 'Instance, Holding, Item', + materialType: materialTypeId, + }, + locations: [{ locationId: testData.location.id, quantityPhysical: 1 }], + }; - Orders.createOrderWithOrderLineViaApi(testData.order, testData.orderLine).then( - (order) => { - testData.order = order; + Orders.createOrderWithOrderLineViaApi(testData.order, testData.orderLine).then( + (order) => { + testData.order = order; - Orders.updateOrderViaApi({ ...testData.order, workflowStatus: 'Open' }); - }, - ); + Orders.updateOrderViaApi({ ...testData.order, workflowStatus: 'Open' }); + }, + ); + }); }); - }); - }, - ); - TitleLevelRequests.enableTLRViaApi(); - }); + }, + ); + TitleLevelRequests.enableTLRViaApi(); + }); - cy.createTempUser([ - permissions.uiInventoryViewInstances.gui, - permissions.uiOrdersView.gui, - permissions.uiReceivingViewEditCreate.gui, - permissions.uiRequestsCreate.gui, - ]).then((userProperties) => { - testData.user = userProperties; + cy.createTempUser([ + permissions.uiInventoryViewInstances.gui, + permissions.uiOrdersView.gui, + permissions.uiReceivingViewEditCreate.gui, + permissions.uiRequestsCreate.gui, + ]).then((userProperties) => { + testData.user = userProperties; - UserEdit.addServicePointViaApi( - testData.effectiveLocationServicePoint.id, - testData.user.userId, - testData.effectiveLocationServicePoint.id, - ); - cy.login(userProperties.username, userProperties.password, { - path: TopMenu.ordersPath, - waiter: Orders.waitLoading, + UserEdit.addServicePointViaApi( + testData.effectiveLocationServicePoint.id, + testData.user.userId, + testData.effectiveLocationServicePoint.id, + ); + cy.login(userProperties.username, userProperties.password, { + path: TopMenu.ordersPath, + waiter: Orders.waitLoading, + }); }); }); - }); - after(() => { - cy.getAdminToken(); - Organizations.deleteOrganizationViaApi(testData.organization.id); - CheckInActions.checkinItemViaApi({ - itemBarcode: testData.itemBarcode, - servicePointId: testData.effectiveLocationServicePoint.id, - checkInDate: new Date().toISOString(), + after(() => { + cy.getAdminToken(); + Organizations.deleteOrganizationViaApi(testData.organization.id); + CheckInActions.checkinItemViaApi({ + itemBarcode: testData.itemBarcode, + servicePointId: testData.effectiveLocationServicePoint.id, + checkInDate: new Date().toISOString(), + }); + UserEdit.changeServicePointPreferenceViaApi(testData.user.userId, [ + testData.effectiveLocationServicePoint.id, + ]); + Orders.deleteOrderViaApi(testData.order.id); + Requests.deleteRequestViaApi(testData.requestId); + InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(testData.itemBarcode); + Users.deleteViaApi(testData.user.userId); }); - UserEdit.changeServicePointPreferenceViaApi(testData.user.userId, [ - testData.effectiveLocationServicePoint.id, - ]); - Orders.deleteOrderViaApi(testData.order.id); - Requests.deleteRequestViaApi(testData.requestId); - InventoryInstances.deleteInstanceAndHoldingRecordAndAllItemsViaApi(testData.itemBarcode); - Users.deleteViaApi(testData.user.userId); - }); - it( - 'C402758 Receiving an item with open title level request (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet'] }, - () => { - const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); - OrderDetails.checkOrderStatus(ORDER_STATUSES.OPEN); + it( + 'C402758 Receiving an item with open title level request (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet'] }, + () => { + const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); + OrderDetails.checkOrderStatus(ORDER_STATUSES.OPEN); - const OrderLineDetails = OrderDetails.openPolDetails(testData.orderLine.titleOrPackage); - OrderLines.verifyPOLDetailsIsOpened(); + const OrderLineDetails = OrderDetails.openPolDetails(testData.orderLine.titleOrPackage); + OrderLines.verifyPOLDetailsIsOpened(); - const InventoryInstanceDetails = OrderLineDetails.openInventoryItem(); - InventoryInstanceDetails.openHoldings(testData.location.name); - InventoryInstanceDetails.verifyItemStatus(ITEM_STATUS_NAMES.ON_ORDER); - InventoryInstanceDetails.getAssignedHRID().then((hrid) => { - testData.instanceHrid = hrid; + const InventoryInstanceDetails = OrderLineDetails.openInventoryItem(); + InventoryInstanceDetails.openHoldings(testData.location.name); + InventoryInstanceDetails.verifyItemStatus(ITEM_STATUS_NAMES.ON_ORDER); + InventoryInstanceDetails.getAssignedHRID().then((hrid) => { + testData.instanceHrid = hrid; - InventoryInstanceDetails.openItemByBarcode('No barcode'); - ItemRecordView.createNewRequest(); - NewRequest.checkRequestsFields(); - NewRequest.waitLoadingNewRequestPage(); - NewRequest.enableTitleLevelRequest(); - NewRequest.checkTLRRequestsFields(testData.instanceHrid); - NewRequest.enterRequesterInfoWithRequestType( - { - requesterBarcode: testData.user.barcode, - pickupServicePoint: testData.effectiveLocationServicePoint.name, - }, - REQUEST_TYPES.RECALL, - ); - NewRequest.saveRequestAndClose(); - cy.wait('@createRequest').then((intercept) => { - testData.requestId = intercept.response.body.id; - cy.location('pathname').should('eq', `/requests/view/${testData.requestId}`); + InventoryInstanceDetails.openItemByBarcode('No barcode'); + ItemRecordView.createNewRequest(); + NewRequest.checkRequestsFields(); + NewRequest.waitLoadingNewRequestPage(); + NewRequest.enableTitleLevelRequest(); + NewRequest.checkTLRRequestsFields(testData.instanceHrid); + NewRequest.enterRequesterInfoWithRequestType( + { + requesterBarcode: testData.user.barcode, + pickupServicePoint: testData.effectiveLocationServicePoint.name, + }, + REQUEST_TYPES.RECALL, + ); + NewRequest.saveRequestAndClose(); + cy.wait('@createRequest').then((intercept) => { + testData.requestId = intercept.response.body.id; + cy.location('pathname').should('eq', `/requests/view/${testData.requestId}`); + }); + NewRequest.waitLoading(); + NewRequest.verifyRequestSuccessfullyCreated(testData.user.username); }); - NewRequest.waitLoading(); - NewRequest.verifyRequestSuccessfullyCreated(testData.user.username); - }); - cy.visit(TopMenu.ordersPath); - Orders.selectOrderByPONumber(testData.order.poNumber); - OrderDetails.openPolDetails(testData.orderLine.titleOrPackage); - OrderLines.openReceiving(); - Receiving.waitLoading(); - Receiving.selectReceivingItem(); - Receiving.verifyDetailsOpened(); - Receiving.verifyRequestIsCreated(); - Receiving.receivePiece(0, testData.enumeration, testData.itemBarcode); - Receiving.verifyOpenedRequestsModal(testData.orderLine.titleOrPackage, testData.itemBarcode); - Receiving.closeOpenedRequestModal(); - Receiving.checkReceivedPiece(0, testData.enumeration, testData.itemBarcode); - }, - ); + cy.visit(TopMenu.ordersPath); + Orders.selectOrderByPONumber(testData.order.poNumber); + OrderDetails.openPolDetails(testData.orderLine.titleOrPackage); + OrderLines.openReceiving(); + Receiving.waitLoading(); + Receiving.selectReceivingItem(); + Receiving.verifyDetailsOpened(); + Receiving.verifyRequestIsCreated(); + Receiving.receivePiece(0, testData.enumeration, testData.itemBarcode); + Receiving.verifyOpenedRequestsModal( + testData.orderLine.titleOrPackage, + testData.itemBarcode, + ); + Receiving.closeOpenedRequestModal(); + Receiving.checkReceivedPiece(0, testData.enumeration, testData.itemBarcode); + }, + ); + }); }); diff --git a/cypress/e2e/orders/receiving-and-check-in/receiving-pieces-from-order-for-PE-mix.cy.js b/cypress/e2e/orders/receiving-and-check-in/receiving-pieces-from-order-for-PE-mix.cy.js index 883266cf2a..3d6a0a0d93 100644 --- a/cypress/e2e/orders/receiving-and-check-in/receiving-pieces-from-order-for-PE-mix.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/receiving-pieces-from-order-for-PE-mix.cy.js @@ -100,7 +100,7 @@ describe('Orders', () => { it( 'C738 Receiving pieces from an order for P/E MIx that is set to create Items in inventory (items for receiving includes "Order closed" statuses) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C738'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/serials-receiving.cy.js b/cypress/e2e/orders/receiving-and-check-in/serials-receiving.cy.js index dd601d6939..3d406dfc48 100644 --- a/cypress/e2e/orders/receiving-and-check-in/serials-receiving.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/serials-receiving.cy.js @@ -90,7 +90,7 @@ describe('Orders', () => { it( 'C739 Serials receiving - "Receiving workflow" and create items in inventory from receiving area (items for receiving includes "Order closed" statuses) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C739'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/receiving-and-check-in/status-is-updated-from-n-order.cy.js b/cypress/e2e/orders/receiving-and-check-in/status-is-updated-from-n-order.cy.js index 8a61e312db..1693b39bf9 100644 --- a/cypress/e2e/orders/receiving-and-check-in/status-is-updated-from-n-order.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/status-is-updated-from-n-order.cy.js @@ -69,7 +69,7 @@ describe('Orders', () => { it( 'C737 Validate when receiving a piece that the item status is updated from "On order" (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C737'] }, () => { TopMenuNavigation.navigateToApp('Orders'); Orders.selectOrdersPane(); diff --git a/cypress/e2e/orders/receiving-and-check-in/update-barcode.cy.js b/cypress/e2e/orders/receiving-and-check-in/update-barcode.cy.js index dd3fdc3a4a..ddf2fea08d 100644 --- a/cypress/e2e/orders/receiving-and-check-in/update-barcode.cy.js +++ b/cypress/e2e/orders/receiving-and-check-in/update-barcode.cy.js @@ -124,7 +124,7 @@ describe('Orders', () => { it( 'C736 Update Barcode and call number information when receiving (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C736'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/release-encumbrances-when-pol-payment-status-set-to-canceled.cy.js b/cypress/e2e/orders/release-encumbrances-when-pol-payment-status-set-to-canceled.cy.js index 8ccfe73084..b3c097793f 100644 --- a/cypress/e2e/orders/release-encumbrances-when-pol-payment-status-set-to-canceled.cy.js +++ b/cypress/e2e/orders/release-encumbrances-when-pol-payment-status-set-to-canceled.cy.js @@ -122,7 +122,7 @@ describe('Orders', () => { it( 'C350945 Release encumbrances when POL payment status is set to canceled (no related invoices) (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C350945'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/removing-donor-from-polafter-removing-fund.cy.js b/cypress/e2e/orders/removing-donor-from-polafter-removing-fund.cy.js index b147cebbbb..a3aa81ecef 100644 --- a/cypress/e2e/orders/removing-donor-from-polafter-removing-fund.cy.js +++ b/cypress/e2e/orders/removing-donor-from-polafter-removing-fund.cy.js @@ -108,8 +108,8 @@ describe('Orders', () => { }); it( - 'C423401: Removing donor record from PO line after removing fund distribution (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C423401 Removing donor record from PO line after removing fund distribution (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C423401'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/renewal-date-are-not-requaired.cy.js b/cypress/e2e/orders/renewal-date-are-not-requaired.cy.js index 4dc2dfb1f7..46d3be6b2a 100644 --- a/cypress/e2e/orders/renewal-date-are-not-requaired.cy.js +++ b/cypress/e2e/orders/renewal-date-are-not-requaired.cy.js @@ -70,7 +70,7 @@ describe('Orders', () => { it( 'C353627 "Renewal date" and "Renewal interval" are not required for opening, unopening, closing, reopening ongoing order (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C353627'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/renewal-field-prefilled-from-template.cy.js b/cypress/e2e/orders/renewal-field-prefilled-from-template.cy.js index 89e5618872..bf12c7c409 100644 --- a/cypress/e2e/orders/renewal-field-prefilled-from-template.cy.js +++ b/cypress/e2e/orders/renewal-field-prefilled-from-template.cy.js @@ -53,7 +53,7 @@ describe('Orders', () => { it( 'C353575 Renewal note field is prefilled in POL when create order from specific template (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353575'] }, () => { // Click "Actions" button on "Orders" pane and select "New" option const OrderEditForm = Orders.clickCreateNewOrder(); diff --git a/cypress/e2e/orders/reopen-order-w-multiple-order-lines.cy.js b/cypress/e2e/orders/reopen-order-w-multiple-order-lines.cy.js index d9a9b95064..925fe7e0ee 100644 --- a/cypress/e2e/orders/reopen-order-w-multiple-order-lines.cy.js +++ b/cypress/e2e/orders/reopen-order-w-multiple-order-lines.cy.js @@ -86,7 +86,7 @@ describe('Orders', () => { it( 'C366113 Order can be reopened when one PO line has a fund distribution and one PO line does not (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C366113'] }, () => { // Search for order and click on it const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -206,7 +206,7 @@ describe('Orders', () => { it( 'C366114 Order can be reopened when PO lines have different fund distributions (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C366114'] }, () => { // Search for order and click on it const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/reopen-order-with-changed-fund.cy.js b/cypress/e2e/orders/reopen-order-with-changed-fund.cy.js index b2a4b35658..8947d9526b 100644 --- a/cypress/e2e/orders/reopen-order-with-changed-fund.cy.js +++ b/cypress/e2e/orders/reopen-order-with-changed-fund.cy.js @@ -138,7 +138,7 @@ describe('Orders', () => { it( 'C375226 Reopen order with changed Fund distribution when related paid invoice exists (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375226'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/search-instance-results-cleared-after-click-reset.cy.js b/cypress/e2e/orders/search-instance-results-cleared-after-click-reset.cy.js index e74fed7533..b352d76e67 100644 --- a/cypress/e2e/orders/search-instance-results-cleared-after-click-reset.cy.js +++ b/cypress/e2e/orders/search-instance-results-cleared-after-click-reset.cy.js @@ -52,7 +52,7 @@ describe('Orders', () => { it( 'C377043 Plugin search result list is cleared and all filters are reset by clicking "Reset all" button while adding PO line to "Purchase order" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C377043'] }, () => { // Click on the record with Order name from precondition const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/search-order-w-special-symbols.cy.js b/cypress/e2e/orders/search-order-w-special-symbols.cy.js index 6235e8c22a..3e13cb0ee4 100644 --- a/cypress/e2e/orders/search-order-w-special-symbols.cy.js +++ b/cypress/e2e/orders/search-order-w-special-symbols.cy.js @@ -68,7 +68,7 @@ describe('Orders', () => { it( 'C380409 Search for order title with special characters (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C380409'] }, () => { // Enter full title name from Preconditions item #2 in "Search" field on "Search & filter" pane // Click "Search" button diff --git a/cypress/e2e/orders/section-w-validation-errors-remains-expanded.cy.js b/cypress/e2e/orders/section-w-validation-errors-remains-expanded.cy.js index 84959d7e9a..39363d5852 100644 --- a/cypress/e2e/orders/section-w-validation-errors-remains-expanded.cy.js +++ b/cypress/e2e/orders/section-w-validation-errors-remains-expanded.cy.js @@ -38,7 +38,7 @@ describe('Orders', () => { it( 'C353592 Verify if Accordion with validation errors fields remains expanded fields after "collapse all" command (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353592'] }, () => { // Click "Actions" button on "Orders" pane and select "New" option const OrderEditForm = Orders.clickCreateNewOrder(); diff --git a/cypress/e2e/orders/select-acquisition-method-from-POL.cy.js b/cypress/e2e/orders/select-acquisition-method-from-POL.cy.js index 784cda77fd..089814ac88 100644 --- a/cypress/e2e/orders/select-acquisition-method-from-POL.cy.js +++ b/cypress/e2e/orders/select-acquisition-method-from-POL.cy.js @@ -77,7 +77,7 @@ describe('Export Manager', () => { it( 'C350601 Select Acquisition method from controlled vocabulary list [except tags] (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350601'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/select-random-currancy-in-order.cy.js b/cypress/e2e/orders/select-random-currancy-in-order.cy.js index 9b0d335251..95d06c22a8 100644 --- a/cypress/e2e/orders/select-random-currancy-in-order.cy.js +++ b/cypress/e2e/orders/select-random-currancy-in-order.cy.js @@ -80,7 +80,7 @@ describe('Orders', () => { it( 'C8357 Create purchase order in foreign currency (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C8357'] }, () => { Orders.createOrder(order).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/orders/set-claiming-interval-in-pol-for-one-time-order.cy.js b/cypress/e2e/orders/set-claiming-interval-in-pol-for-one-time-order.cy.js index ddf41e55e9..b81f42fc4c 100644 --- a/cypress/e2e/orders/set-claiming-interval-in-pol-for-one-time-order.cy.js +++ b/cypress/e2e/orders/set-claiming-interval-in-pol-for-one-time-order.cy.js @@ -101,7 +101,7 @@ describe('Orders', () => { it( 'C423444 Set claiming interval in PO line for one-time order (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C423444'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/set-claiming-interval-in-pol-for-ongoing-order.cy.js b/cypress/e2e/orders/set-claiming-interval-in-pol-for-ongoing-order.cy.js index 11a73b3856..8e68191fdb 100644 --- a/cypress/e2e/orders/set-claiming-interval-in-pol-for-ongoing-order.cy.js +++ b/cypress/e2e/orders/set-claiming-interval-in-pol-for-ongoing-order.cy.js @@ -103,7 +103,7 @@ describe('Orders', () => { it( 'C423440 Set claiming interval in PO line for ongoing order (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C423440'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/orders/settings/order-template-can-not-be-saved-wo-title.cy.js b/cypress/e2e/orders/settings/order-template-can-not-be-saved-wo-title.cy.js index 9c7839de18..cfe864b8bb 100644 --- a/cypress/e2e/orders/settings/order-template-can-not-be-saved-wo-title.cy.js +++ b/cypress/e2e/orders/settings/order-template-can-not-be-saved-wo-title.cy.js @@ -31,7 +31,7 @@ describe('Orders', () => { it( 'C353609 Order template can not be saved, empty field is highlighted, and corresponding accordion is expanded when required field is not filled (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353609'] }, () => { // Click "New" button const OrderTemplateForm = OrderTemplate.clickNewOrderTemplateButton(); diff --git a/cypress/e2e/orders/test-acquisition-unit-for-orders.cy.js b/cypress/e2e/orders/test-acquisition-unit-for-orders.cy.js index 58b3deaff3..10abfe387a 100644 --- a/cypress/e2e/orders/test-acquisition-unit-for-orders.cy.js +++ b/cypress/e2e/orders/test-acquisition-unit-for-orders.cy.js @@ -49,7 +49,7 @@ describe('Orders', () => { it( 'C163929 Test acquisition unit restrictions for Order records (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C163929'] }, () => { cy.loginAsAdmin({ path: SettingsMenu.acquisitionUnitsPath, diff --git a/cypress/e2e/orders/unopen-order-with-changed-fund-distribution.cy.js b/cypress/e2e/orders/unopen-order-with-changed-fund-distribution.cy.js index 2ac57f49d1..42ade91267 100644 --- a/cypress/e2e/orders/unopen-order-with-changed-fund-distribution.cy.js +++ b/cypress/e2e/orders/unopen-order-with-changed-fund-distribution.cy.js @@ -214,7 +214,7 @@ describe('orders: Unopen order', { retries: { runMode: 1 } }, () => { it( 'C375106 Unopen order with changed Fund distribution when related paid invoice exists (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'shiftLeft', 'C375106'] }, () => { /* Orders app */ Orders.searchByParameter('PO number', orderNumber); diff --git a/cypress/e2e/orders/unopen-order-with-receiving-workflow.cy.js b/cypress/e2e/orders/unopen-order-with-receiving-workflow.cy.js index 2b94c41953..156aa796e3 100644 --- a/cypress/e2e/orders/unopen-order-with-receiving-workflow.cy.js +++ b/cypress/e2e/orders/unopen-order-with-receiving-workflow.cy.js @@ -104,7 +104,7 @@ describe('Orders', { retries: { runMode: 1 } }, () => { it( 'C377037 Select "Delete Holdings and items" option when unopening an order with receiving workflow of "Synchronized order and receipt quantity" (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C377037'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -130,7 +130,7 @@ describe('Orders', { retries: { runMode: 1 } }, () => { it( 'C377040 Select "Delete items" option when unopening an order with receiving workflow of "Synchronized order and receipt quantity" (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C377040'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -200,7 +200,7 @@ describe('Orders', { retries: { runMode: 1 } }, () => { it( 'C377041 Select "Keep Holdings" option when unopening an order with receiving workflow of "Independent order and receipt quantity" (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C377041'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); @@ -236,7 +236,7 @@ describe('Orders', { retries: { runMode: 1 } }, () => { it( 'C377042 Select "Delete Holdings" option when unopening an order with receiving workflow of "Independent order and receipt quantity" (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C377042'] }, () => { // Click on "PO number" link on "Orders" pane const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/unrelease-encumbrances-when-reopen-one-time-order.cy.js b/cypress/e2e/orders/unrelease-encumbrances-when-reopen-one-time-order.cy.js index 41a2b39347..af9248fc09 100644 --- a/cypress/e2e/orders/unrelease-encumbrances-when-reopen-one-time-order.cy.js +++ b/cypress/e2e/orders/unrelease-encumbrances-when-reopen-one-time-order.cy.js @@ -68,7 +68,7 @@ describe('Orders', () => { it( 'C354279 Unrelease encumbrances when reopen one-time order without related invoices and receiving (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C354279'] }, () => { // Click on the Order const OrderDetails = Orders.selectOrderByPONumber(testData.order.poNumber); diff --git a/cypress/e2e/orders/unrelease-encumbrances-when-reopen-unreceived-order.cy.js b/cypress/e2e/orders/unrelease-encumbrances-when-reopen-unreceived-order.cy.js index c973f8768d..a9812b58cc 100644 --- a/cypress/e2e/orders/unrelease-encumbrances-when-reopen-unreceived-order.cy.js +++ b/cypress/e2e/orders/unrelease-encumbrances-when-reopen-unreceived-order.cy.js @@ -167,7 +167,7 @@ describe('Orders', () => { it( 'C358539 Unrelease encumbrances when reopen unreceived ongoing order with related paid invoice (Release encumbrance =true) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C358539'] }, () => { /* Orders app */ Orders.searchByParameter('PO number', orderNumber); diff --git a/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js b/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js index 76434c89a7..223a0b905c 100644 --- a/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js +++ b/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js @@ -70,8 +70,8 @@ describe('Orders', () => { }); it( - 'C369087 - Orders| Results List | Verify that value in "PO number" and "POL number" columns are hyperlinks (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C369087 Orders| Results List | Verify that value in "PO number" and "POL number" columns are hyperlinks (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C369087'] }, () => { Orders.selectPendingStatusFilter(); Orders.waitLoading(); diff --git a/cypress/e2e/orders/version-history-card-without-changes-is-not-displayed-in-log.cy.js b/cypress/e2e/orders/version-history-card-without-changes-is-not-displayed-in-log.cy.js index 82d912c661..7f9228352d 100644 --- a/cypress/e2e/orders/version-history-card-without-changes-is-not-displayed-in-log.cy.js +++ b/cypress/e2e/orders/version-history-card-without-changes-is-not-displayed-in-log.cy.js @@ -80,7 +80,7 @@ describe('Orders', () => { it( 'C375995 Version history card without changes is not displayed in "Version history" log (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C375995'] }, () => { const poNumber = testData.order.poNumber; diff --git a/cypress/e2e/orders/warning-message-when-creating-non-existent-order.cy.js b/cypress/e2e/orders/warning-message-when-creating-non-existent-order.cy.js index 6e7e75dc49..e108d901b7 100644 --- a/cypress/e2e/orders/warning-message-when-creating-non-existent-order.cy.js +++ b/cypress/e2e/orders/warning-message-when-creating-non-existent-order.cy.js @@ -41,8 +41,8 @@ describe('Orders', () => { }); it( - 'C353991 - Warning message appears when creating order from instance record and select not existing order (Thunderjet)(TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C353991 Warning message appears when creating order from instance record and select not existing order (Thunderjet)(TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C353991'] }, () => { InventorySearchAndFilter.switchToInstance(); InventorySearchAndFilter.byKeywords(item.instanceName); diff --git a/cypress/e2e/organizations/add-contact-to-organization.cy.js b/cypress/e2e/organizations/add-contact-to-organization.cy.js index 206ecb2db5..eab1d9717b 100644 --- a/cypress/e2e/organizations/add-contact-to-organization.cy.js +++ b/cypress/e2e/organizations/add-contact-to-organization.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; const testData = { user: null, @@ -40,7 +41,7 @@ describe('Organizations: Add new contact and assign to an organization record', 'C725 Add new contact and assign to an organization record (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', testData.organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organization.name); Organizations.selectOrganization(testData.organization.name); Organizations.editOrganization(); Organizations.addNewContact(testData.contact); diff --git a/cypress/e2e/organizations/add-kosovo-country.cy.js b/cypress/e2e/organizations/add-kosovo-country.cy.js index 3cda96fc86..33064d4481 100644 --- a/cypress/e2e/organizations/add-kosovo-country.cy.js +++ b/cypress/e2e/organizations/add-kosovo-country.cy.js @@ -3,6 +3,7 @@ import NewOrganization from '../../support/fragments/organizations/newOrganizati import getRandomPostfix from '../../support/utils/stringTools'; import permissions from '../../support/dictionary/permissions'; import TopMenu from '../../support/fragments/topMenu'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization1 = { @@ -55,7 +56,7 @@ describe('Organizations', () => { }); }); Organizations.deleteOrganizationViaApi(organization2.id); - Organizations.searchByParameters('Name', organization1.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization1.name); Organizations.selectOrganization(organization1.name); Organizations.deleteOrganization(organization1.name); }); @@ -70,13 +71,13 @@ describe('Organizations', () => { Organizations.clickAddAdressButton(); Organizations.addAdressToOrganization(adress, 0); Organizations.saveOrganization(); - Organizations.searchByParameters('Name', organization2.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization2.name); Organizations.selectOrganization(organization2.name); Organizations.editOrganization(); Organizations.addAdressToOrganization(adress, 0); Organizations.saveOrganization(); - Organizations.resetFilters(); - Organizations.selectCountryFilter('Kosovo'); + OrganizationsSearchAndFilter.resetFilters(); + OrganizationsSearchAndFilter.filterByCountry('Kosovo'); Organizations.checkSearchResults(organization1); Organizations.checkSearchResults(organization2); }, diff --git a/cypress/e2e/organizations/add-note-to-contact-people-list.cy.js b/cypress/e2e/organizations/add-note-to-contact-people-list.cy.js index b0d52b386b..8292700e8d 100644 --- a/cypress/e2e/organizations/add-note-to-contact-people-list.cy.js +++ b/cypress/e2e/organizations/add-note-to-contact-people-list.cy.js @@ -1,6 +1,7 @@ import permissions from '../../support/dictionary/permissions'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -16,7 +17,7 @@ describe('Organizations', () => { organization.id = response; cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewContact(contact); @@ -41,9 +42,9 @@ describe('Organizations', () => { it( 'C380642 Add a note to "Contact people" list in "Organization" app (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C380642'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.selectContact(contact); Organizations.clickEdit(); diff --git a/cypress/e2e/organizations/add-privileged-donor-information-in-not-a-vendor-organization-record.cy.js b/cypress/e2e/organizations/add-privileged-donor-information-in-not-a-vendor-organization-record.cy.js index 95512e81ea..5f70691ffb 100644 --- a/cypress/e2e/organizations/add-privileged-donor-information-in-not-a-vendor-organization-record.cy.js +++ b/cypress/e2e/organizations/add-privileged-donor-information-in-not-a-vendor-organization-record.cy.js @@ -5,6 +5,7 @@ import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { @@ -28,7 +29,7 @@ describe('Organizations', () => { organization.id = response; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewDonorContact(firstContact); @@ -60,7 +61,7 @@ describe('Organizations', () => { { tags: ['criticalPath', 'thunderjet'] }, () => { TopMenuNavigation.navigateToApp('Organizations'); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewDonorContact(secondContact); diff --git a/cypress/e2e/organizations/add-tags-to-organization.cy.js b/cypress/e2e/organizations/add-tags-to-organization.cy.js index af438c898d..1b906e192f 100644 --- a/cypress/e2e/organizations/add-tags-to-organization.cy.js +++ b/cypress/e2e/organizations/add-tags-to-organization.cy.js @@ -4,6 +4,7 @@ import permissions from '../../support/dictionary/permissions'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let user; @@ -31,9 +32,9 @@ describe('Organizations', () => { after('Delete test data', () => { cy.getAdminToken(); - Organizations.getTagByLabel(tag.name).then((tags) => { + Organizations.getTagByLabelViaApi(tag.name).then((tags) => { if (tags) tag.id = tags.id; - Organizations.deleteTagById(tag.id, { failOnStatusCode: false }); + Organizations.deleteTagByIdViaApi(tag.id, { failOnStatusCode: false }); }); Organizations.deleteOrganizationViaApi(organization.id); Users.deleteViaApi(user.userId); @@ -43,7 +44,7 @@ describe('Organizations', () => { 'C6710 Add tags to an Organization record (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyTagsCount(0); Organizations.organizationTagDetails(); diff --git a/cypress/e2e/organizations/assign-categories-to-contact.cy.js b/cypress/e2e/organizations/assign-categories-to-contact.cy.js index 0255080ede..ef5f47920b 100644 --- a/cypress/e2e/organizations/assign-categories-to-contact.cy.js +++ b/cypress/e2e/organizations/assign-categories-to-contact.cy.js @@ -6,6 +6,7 @@ import SettingsOrganizations from '../../support/fragments/settings/organization import permissions from '../../support/dictionary/permissions'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const category1 = { ...SettingsOrganizations.defaultCategories }; @@ -47,7 +48,7 @@ describe('Organizations', () => { 'C732 Assign categories to contact person (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openContactPeopleSectionInEditCard(); diff --git a/cypress/e2e/organizations/assign-existing-contact.cy.js b/cypress/e2e/organizations/assign-existing-contact.cy.js index 34ba7d499c..7c2058233a 100644 --- a/cypress/e2e/organizations/assign-existing-contact.cy.js +++ b/cypress/e2e/organizations/assign-existing-contact.cy.js @@ -1,6 +1,6 @@ -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -19,7 +19,7 @@ describe('Organizations', () => { Organizations.createContactViaApi(contact).then((contactId) => { contact.id = contactId; }); - cy.createTempUser([permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -38,7 +38,7 @@ describe('Organizations', () => { 'C676 Assign existing contact to an organization record (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addContactToOrganization(contact); diff --git a/cypress/e2e/organizations/check-organizations-table-content.cy.js b/cypress/e2e/organizations/check-organizations-table-content.cy.js index f3bc62465c..ace6dfcc47 100644 --- a/cypress/e2e/organizations/check-organizations-table-content.cy.js +++ b/cypress/e2e/organizations/check-organizations-table-content.cy.js @@ -1,5 +1,6 @@ import { Permissions } from '../../support/dictionary'; import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -40,14 +41,14 @@ describe('Organizations', () => { it( 'C369086 Organizations | Results List | Verify that value in "Name" column is hyperlink (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C369086'] }, () => { // Check "Active" checkbox in "Organizations status" accordion on "Search & filter" pane - Organizations.selectActiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); testData.organizations.forEach((organization) => { // Search for organizations from Preconditions - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); // Click on the hyperlink in "Name" column diff --git a/cypress/e2e/organizations/correct-page-title.cy.js b/cypress/e2e/organizations/correct-page-title.cy.js index 63721b42af..708ee9c34a 100644 --- a/cypress/e2e/organizations/correct-page-title.cy.js +++ b/cypress/e2e/organizations/correct-page-title.cy.js @@ -1,8 +1,8 @@ -import permissions from '../../support/dictionary/permissions'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; import getRandomPostfix from '../../support/utils/stringTools'; describe('Organizations', () => { @@ -10,12 +10,12 @@ describe('Organizations', () => { const resetFiltersMessage = 'Choose a filter or enter a search query to show results.'; const organizations = [ { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, name: `Test Organization 1 ${Date.now()}`, code: `${getRandomPostfix()}_1`, }, { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, name: `Test Organization 2 ${Date.now()}`, code: `${getRandomPostfix()}_2`, }, @@ -28,7 +28,7 @@ describe('Organizations', () => { org.id = orgId; }); }); - cy.createTempUser([permissions.uiOrganizationsView.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsView.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -47,20 +47,20 @@ describe('Organizations', () => { it( 'C451606 Correct page title when Organization details pane is opened (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C451606'] }, () => { Organizations.verifyNoResultMessage(resetFiltersMessage); - Organizations.searchByParameters('Name', organizations[0].name); + OrganizationsSearchAndFilter.searchByParameters('Name', organizations[0].name); Organizations.selectOrganization(organizations[0].name); Organizations.closeDetailsPane(); Organizations.resetFilters(); Organizations.verifyNoResultMessage(resetFiltersMessage); - Organizations.selectActiveStatus(); - Organizations.searchByParameters('Name', organizations[0].name); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); + OrganizationsSearchAndFilter.searchByParameters('Name', organizations[0].name); Organizations.checkSearchResults(organizations[0]); Organizations.selectOrganization(organizations[0].name); Organizations.checkOrganizationInfo(organizations[0]); - Organizations.searchByParameters('Name', organizations[1].name); + OrganizationsSearchAndFilter.searchByParameters('Name', organizations[1].name); Organizations.checkSearchResults(organizations[1]); Organizations.selectOrganization(organizations[1].name); Organizations.checkOrganizationInfo(organizations[1]); diff --git a/cypress/e2e/organizations/create-a-donor-organization.cy.js b/cypress/e2e/organizations/create-a-donor-organization.cy.js index 4441ff2769..43427b2609 100644 --- a/cypress/e2e/organizations/create-a-donor-organization.cy.js +++ b/cypress/e2e/organizations/create-a-donor-organization.cy.js @@ -1,5 +1,6 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; @@ -16,7 +17,7 @@ describe('Organizations', () => { before(() => { cy.getAdminToken(); - cy.createTempUser([permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -41,14 +42,13 @@ describe('Organizations', () => { () => { Organizations.createDonorOrganization(organization); Organizations.closeDetailsPane(); - Organizations.selectIsDonorFilter('Yes'); + OrganizationsSearchAndFilter.filterByIsDonor('Yes'); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); Organizations.closeDetailsPane(); - Organizations.resetFilters(); - Organizations.selectIsDonorFilter('No'); + OrganizationsSearchAndFilter.filterByIsDonor('No'); Organizations.organizationIsAbsent(organization.name); - Organizations.resetFilters(); + OrganizationsSearchAndFilter.resetFiltersIfActive(); }, ); }); diff --git a/cypress/e2e/organizations/create-and-add-privileged-donor-information.cy.js b/cypress/e2e/organizations/create-and-add-privileged-donor-information.cy.js index 2a67e5f92c..1626dfc41d 100644 --- a/cypress/e2e/organizations/create-and-add-privileged-donor-information.cy.js +++ b/cypress/e2e/organizations/create-and-add-privileged-donor-information.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import newOrganization from '../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let user; @@ -54,7 +55,7 @@ describe('Organizations', () => { 'C423618 Create and add privileged donor information in Organization (vendor) record (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.selectDonorCheckbox(); diff --git a/cypress/e2e/organizations/create-edit-autosuggested-fields.cy.js b/cypress/e2e/organizations/create-edit-autosuggested-fields.cy.js index f0a36fb0ca..2e418cb33c 100644 --- a/cypress/e2e/organizations/create-edit-autosuggested-fields.cy.js +++ b/cypress/e2e/organizations/create-edit-autosuggested-fields.cy.js @@ -1,18 +1,17 @@ -import permissions from '../../support/dictionary/permissions'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; describe('Organizations', () => { let user; - const organization = { ...newOrganization.defaultUiOrganizations }; + const organization = { ...NewOrganization.defaultUiOrganizations }; before('Create user and organization', () => { cy.getAdminToken(); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewEditCreate.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewEditCreate.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -24,14 +23,10 @@ describe('Organizations', () => { }); after('Delete test data', () => { - cy.loginAsAdmin({ - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - authRefresh: true, + cy.getAdminToken(); + Organizations.getOrganizationViaApi({ name: organization.name }).then((response) => { + Organizations.deleteOrganizationViaApi(response.id); }); - Organizations.searchByParameters('Name', organization.name); - Organizations.selectOrganizationInCurrentPage(organization.name); - Organizations.deleteOrganization(); Users.deleteViaApi(user.userId); }); @@ -51,7 +46,7 @@ describe('Organizations', () => { Organizations.clickAddAdressButton(); Organizations.addAdressToOrganization({ addressLine1: 'Test Address 4' }, 3); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); Organizations.editOrganization(); Organizations.openContactInformationSection(); Organizations.addAdressToOrganization({ addressLine1: 'Test Address Edited' }, 0); @@ -62,7 +57,7 @@ describe('Organizations', () => { Organizations.clickAddPhoneNumberButton(); Organizations.addPhoneNumberToOrganization({ phoneNum: '123456' }, 1); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); }, ); }); diff --git a/cypress/e2e/organizations/create-organization.cy.js b/cypress/e2e/organizations/create-organization.cy.js index 7903250f99..b6a4a18ab2 100644 --- a/cypress/e2e/organizations/create-organization.cy.js +++ b/cypress/e2e/organizations/create-organization.cy.js @@ -27,9 +27,9 @@ describe( it( 'C675 Create new organization record (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C675', 'shiftLeft'] }, () => { - Organizations.createOrganizationViaUi(organization); + Organizations.createOrganization(organization); Organizations.checkOrganizationInfo(organization); }, ); diff --git a/cypress/e2e/organizations/delete-contact-person.cy.js b/cypress/e2e/organizations/delete-contact-person.cy.js index d2eb58484b..c47617cbcb 100644 --- a/cypress/e2e/organizations/delete-contact-person.cy.js +++ b/cypress/e2e/organizations/delete-contact-person.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { @@ -37,13 +38,13 @@ describe('Organizations', () => { }); it('C729 Delete a contact person (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openContactPeopleSectionInEditCard(); Organizations.deleteContactFromContactPeople(); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); Organizations.openContactPeopleSection(); Organizations.checkContactSectionIsEmpty(); }); diff --git a/cypress/e2e/organizations/delete-existing-organization-record.cy.js b/cypress/e2e/organizations/delete-existing-organization-record.cy.js index 8a4e1a9e06..b873129aa1 100644 --- a/cypress/e2e/organizations/delete-existing-organization-record.cy.js +++ b/cypress/e2e/organizations/delete-existing-organization-record.cy.js @@ -8,6 +8,7 @@ import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import ConfirmDeleteOrganizationModal from '../../support/fragments/organizations/modals/confirmDeleteOrganizationModal'; import InteractorsTools from '../../support/utils/interactorsTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { ...NewOrganization.defaultUiOrganizations }; @@ -34,10 +35,10 @@ describe('Organizations', () => { it( 'C674 Delete existing organization record (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C674'] }, () => { // Step 1: Open organization from "Preconditions" details pane - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); // Step 2: Click "Actions" button on organization from "Preconditions" details pane and select "Delete" option @@ -60,7 +61,7 @@ describe('Organizations', () => { `The organization ${organization.name} was successfully deleted`, ); OrganizationDetails.organizationDetailsSectionIsAbsent(); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkZeroSearchResultsHeader(); }, ); diff --git a/cypress/e2e/organizations/edit-contact-of-organization.cy.js b/cypress/e2e/organizations/edit-contact-of-organization.cy.js index d86cf31965..16b2a06614 100644 --- a/cypress/e2e/organizations/edit-contact-of-organization.cy.js +++ b/cypress/e2e/organizations/edit-contact-of-organization.cy.js @@ -1,6 +1,7 @@ import permissions from '../../support/dictionary/permissions'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -31,9 +32,9 @@ describe('Organizations', () => { it( 'C726 Edit contact from an organization record (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C726'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewContact(contact); diff --git a/cypress/e2e/organizations/edit-note-in-contact-people-list.cy.js b/cypress/e2e/organizations/edit-note-in-contact-people-list.cy.js index 0b6f9bda30..2c317d9a0f 100644 --- a/cypress/e2e/organizations/edit-note-in-contact-people-list.cy.js +++ b/cypress/e2e/organizations/edit-note-in-contact-people-list.cy.js @@ -1,6 +1,7 @@ import permissions from '../../support/dictionary/permissions'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -38,7 +39,7 @@ describe('Organizations', () => { 'C380639 Edit note (enter more than 30 characters) in "Contact people" list in "Organization" app (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openContactPeopleSectionInEditCard(); diff --git a/cypress/e2e/organizations/edit-organization.cy.js b/cypress/e2e/organizations/edit-organization.cy.js index 1f99da21d2..fede8d17b2 100644 --- a/cypress/e2e/organizations/edit-organization.cy.js +++ b/cypress/e2e/organizations/edit-organization.cy.js @@ -1,6 +1,7 @@ import permissions from '../../support/dictionary/permissions'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -30,12 +31,13 @@ describe('Organizations', () => { it( 'C673 Edit existing organization record (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C673'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.editOrganizationName(organization); + organization.name = `${organization.name}-edited`; Organizations.checkOrganizationInfo(organization); }, diff --git a/cypress/e2e/organizations/filter-by-created-by.cy.js b/cypress/e2e/organizations/filter-by-created-by.cy.js index 64e4877ac4..3253095f21 100644 --- a/cypress/e2e/organizations/filter-by-created-by.cy.js +++ b/cypress/e2e/organizations/filter-by-created-by.cy.js @@ -1,8 +1,8 @@ import { Permissions } from '../../support/dictionary'; import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; import getRandomPostfix from '../../support/utils/stringTools'; describe('Organizations', () => { @@ -10,13 +10,13 @@ describe('Organizations', () => { users: [], organizations: { org1: { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, name: `autotest_name_${getRandomPostfix()}_1`, code: `${getRandomPostfix()}_1`, erpCode: `ERP-${getRandomPostfix()}_1`, }, org2: { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, name: `autotest_name_${getRandomPostfix()}_2`, code: `${getRandomPostfix()}_2`, erpCode: `ERP-${getRandomPostfix()}_2`, @@ -38,7 +38,6 @@ describe('Organizations', () => { NewOrganization.createViaApi(testData.organizations.org1).then((responseOrganization) => { testData.organizations.org1.id = responseOrganization.id; }); - cy.logout(); cy.login(user2.username, user2.password, { path: TopMenu.organizationsPath, @@ -65,11 +64,11 @@ describe('Organizations', () => { { tags: ['criticalPath', 'thunderjet'] }, () => { Organizations.resetFiltersIfActive(); - Organizations.selectCreatedByFiler(testData.users[0].username); + OrganizationsSearchAndFilter.filterByCreator(testData.users[0].username); Organizations.selectOrganization(testData.organizations.org1.name); Organizations.checkOrganizationInfo(testData.organizations.org1); Organizations.resetFilters(); - Organizations.selectCreatedByFiler(testData.users[1].username); + OrganizationsSearchAndFilter.filterByCreator(testData.users[1].username); Organizations.selectOrganization(testData.organizations.org2.name); Organizations.checkOrganizationInfo(testData.organizations.org2); }, diff --git a/cypress/e2e/organizations/filter-by-date-updated.cy.js b/cypress/e2e/organizations/filter-by-date-updated.cy.js index aa6c92839d..46bedc901e 100644 --- a/cypress/e2e/organizations/filter-by-date-updated.cy.js +++ b/cypress/e2e/organizations/filter-by-date-updated.cy.js @@ -4,6 +4,7 @@ import NewOrganization from '../../support/fragments/organizations/newOrganizati import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import DateTools from '../../support/utils/dateTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; const testData = { user: null, @@ -18,18 +19,15 @@ const yesterday = DateTools.getFormattedDate({ date: d }, 'MM/DD/YYYY'); describe('Organizations', () => { before('Create user and organization', () => { - cy.waitForAuthRefresh(() => { + cy.getAdminToken(); + NewOrganization.createViaApi(testData.organization).then((responseOrganization) => { + testData.organization.id = responseOrganization.id; + cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - }, 20_000); - cy.createTempUser([Permissions.uiOrganizationsView.gui]).then((user) => { - testData.user = user; - NewOrganization.createViaApi(testData.organization).then((responseOrganization) => { - testData.organization.id = responseOrganization.id; - }); - Organizations.searchByParameters('Name', testData.organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organization.name); Organizations.checkSearchResults(testData.organization); Organizations.selectOrganization(testData.organization.name); Organizations.editOrganization(); @@ -39,12 +37,15 @@ describe('Organizations', () => { name: `${testData.organization.name}-edited`, code: testData.organization.code, }); - cy.waitForAuthRefresh(() => { - cy.login(user.username, user.password, { - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); - }, 20_000); + }); + + cy.createTempUser([Permissions.uiOrganizationsView.gui]).then((user) => { + testData.user = user; + + cy.login(user.username, user.password, { + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, + }); }); }); @@ -58,16 +59,16 @@ describe('Organizations', () => { 'C466131 Organizations can be found by "Date updated" filter (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.filterByDateUpdated(today, today); - Organizations.searchByParameters('Name', testData.organization.name); + OrganizationsSearchAndFilter.filterByDateUpdated(today, today); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organization.name); Organizations.checkSearchResults({ name: `${testData.organization.name}-edited` }); - Organizations.resetFilters(); - Organizations.filterByDateUpdated('01/01/2000', '12/31/2000'); + OrganizationsSearchAndFilter.resetFilters(); + OrganizationsSearchAndFilter.filterByDateUpdated('01/01/2000', '12/31/2000'); Organizations.checkZeroSearchResultsHeader(); - Organizations.filterByDateUpdated(today, yesterday); + OrganizationsSearchAndFilter.filterByDateUpdated(today, yesterday); Organizations.checkInvalidDateRangeMessage(); - Organizations.filterByDateUpdated(yesterday, today); - Organizations.searchByParameters('Name', testData.organization.name); + OrganizationsSearchAndFilter.filterByDateUpdated(yesterday, today); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organization.name); Organizations.checkSearchResults({ name: `${testData.organization.name}-edited` }); }, ); diff --git a/cypress/e2e/organizations/filter-by-updated-by.cy.js b/cypress/e2e/organizations/filter-by-updated-by.cy.js index 787e493900..7db088299c 100644 --- a/cypress/e2e/organizations/filter-by-updated-by.cy.js +++ b/cypress/e2e/organizations/filter-by-updated-by.cy.js @@ -1,7 +1,7 @@ -import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; @@ -25,61 +25,59 @@ const testData = { describe('Organizations', () => { before('Create users and organizations', () => { - cy.getAdminToken().then(() => { - cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((user1) => { - testData.users[0] = user1; - cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((user2) => { - testData.users[1] = user2; - NewOrganization.createViaApi(testData.organizations.org1).then((responseOrganization) => { - testData.organizations.org1.id = responseOrganization.id; - }); - NewOrganization.createViaApi(testData.organizations.org2).then((responseOrganization) => { - testData.organizations.org2.id = responseOrganization.id; - }); - cy.login(user2.username, user2.password, { - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); - Organizations.searchByParameters('Name', testData.organizations.org1.name); - Organizations.checkSearchResults(testData.organizations.org1); - Organizations.selectOrganization(testData.organizations.org1.name); - Organizations.editOrganization(); - Organizations.editOrganizationName(testData.organizations.org1); - Organizations.saveOrganization(); - Organizations.checkOrganizationInfo({ - name: `${testData.organizations.org1.name}-edited`, - code: testData.organizations.org1.code, - }); + cy.getAdminToken(); + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((user1) => { + testData.users[0] = user1; + }); + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((user2) => { + testData.users[1] = user2; + }); + NewOrganization.createViaApi(testData.organizations.org1).then((responseOrganization) => { + testData.organizations.org1.id = responseOrganization.id; + }); + NewOrganization.createViaApi(testData.organizations.org2).then((responseOrganization) => { + testData.organizations.org2.id = responseOrganization.id; + }); - Organizations.searchByParameters('Name', testData.organizations.org2.name); - Organizations.checkSearchResults(testData.organizations.org2); - Organizations.selectOrganizationInCurrentPage(testData.organizations.org2.name); - Organizations.editOrganization(); - Organizations.editOrganizationName(testData.organizations.org2); - Organizations.saveOrganization(); - Organizations.checkOrganizationInfo({ - name: `${testData.organizations.org2.name}-edited`, - code: testData.organizations.org2.code, - }); + cy.login(testData.users[1].username, testData.users[1].password, { + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, + }); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organizations.org1.name); + Organizations.checkSearchResults(testData.organizations.org1); + Organizations.selectOrganization(testData.organizations.org1.name); + Organizations.editOrganization(); + Organizations.editOrganizationName(testData.organizations.org1); + Organizations.saveOrganization(); + Organizations.checkOrganizationInfo({ + name: `${testData.organizations.org1.name}-edited`, + code: testData.organizations.org1.code, + }); - cy.login(user1.username, user1.password, { - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); - Organizations.searchByParameters('Name', testData.organizations.org1.name); - Organizations.checkSearchResults({ name: `${testData.organizations.org1.name}-edited` }); - Organizations.selectOrganizationInCurrentPage( - `${testData.organizations.org1.name}-edited`, - ); - Organizations.editOrganization(); - Organizations.editOrganizationName({ name: `${testData.organizations.org1.name}-twice` }); - Organizations.saveOrganization(); - Organizations.checkOrganizationInfo({ - name: `${testData.organizations.org1.name}-twice-edited`, - code: testData.organizations.org1.code, - }); - }); - }); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organizations.org2.name); + Organizations.checkSearchResults(testData.organizations.org2); + Organizations.selectOrganizationInCurrentPage(testData.organizations.org2.name); + Organizations.editOrganization(); + Organizations.editOrganizationName(testData.organizations.org2); + Organizations.saveOrganization(); + Organizations.checkOrganizationInfo({ + name: `${testData.organizations.org2.name}-edited`, + code: testData.organizations.org2.code, + }); + + cy.login(testData.users[0].username, testData.users[0].password, { + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, + }); + OrganizationsSearchAndFilter.searchByParameters('Name', testData.organizations.org1.name); + Organizations.checkSearchResults({ name: `${testData.organizations.org1.name}-edited` }); + Organizations.selectOrganizationInCurrentPage(`${testData.organizations.org1.name}-edited`); + Organizations.editOrganization(); + Organizations.editOrganizationName({ name: `${testData.organizations.org1.name}-twice` }); + Organizations.saveOrganization(); + Organizations.checkOrganizationInfo({ + name: `${testData.organizations.org1.name}-twice-edited`, + code: testData.organizations.org1.code, }); }); @@ -96,7 +94,7 @@ describe('Organizations', () => { { tags: ['criticalPath', 'thunderjet'] }, () => { Organizations.resetFilters(); - Organizations.selectUpdatedByFiler(testData.users[0].username); + OrganizationsSearchAndFilter.filterByUpdater(testData.users[0].username); Organizations.selectOrganizationInCurrentPage( `${testData.organizations.org1.name}-twice-edited`, ); @@ -105,14 +103,14 @@ describe('Organizations', () => { code: testData.organizations.org1.code, }); Organizations.resetFilters(); - Organizations.selectUpdatedByFiler(testData.users[1].username); + OrganizationsSearchAndFilter.filterByUpdater(testData.users[1].username); Organizations.selectOrganizationInCurrentPage(`${testData.organizations.org2.name}-edited`); Organizations.checkOrganizationInfo({ name: `${testData.organizations.org2.name}-edited`, code: testData.organizations.org2.code, }); Organizations.resetFilters(); - Organizations.selectUpdatedByFiler(testData.users[0].username); + OrganizationsSearchAndFilter.filterByUpdater(testData.users[0].username); Organizations.selectOrganizationInCurrentPage( `${testData.organizations.org1.name}-twice-edited`, ); diff --git a/cypress/e2e/organizations/filter-organization.cy.js b/cypress/e2e/organizations/filter-organization.cy.js index a62bcc48a2..e08429eda2 100644 --- a/cypress/e2e/organizations/filter-organization.cy.js +++ b/cypress/e2e/organizations/filter-organization.cy.js @@ -1,7 +1,7 @@ -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; -import TopMenu from '../../support/fragments/topMenu'; import { Permissions } from '../../support/dictionary'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; describe('Organizations', () => { @@ -32,19 +32,19 @@ describe('Organizations', () => { Users.deleteViaApi(user.id); Organizations.deleteOrganizationViaApi(organization.id); }); + [ - { filterActions: Organizations.selectPendingStatus }, - { filterActions: Organizations.selectNoInIsVendor }, - { filterActions: () => Organizations.selectCountryFilter('United States') }, - { filterActions: Organizations.selectLanguageFilter }, - { filterActions: Organizations.selectCashInPaymentMethod }, + { filterActions: () => OrganizationsSearchAndFilter.filterByStatus('Pending') }, + { filterActions: () => OrganizationsSearchAndFilter.filterByCountry('United States') }, + { filterActions: () => OrganizationsSearchAndFilter.filterByLanguage('English') }, + { filterActions: () => OrganizationsSearchAndFilter.filterByPaymentMethod('Cash') }, ].forEach((filter) => { it( 'C6713 Test the Organizations app filters (except Tags) (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeftBroken', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C6713'] }, () => { filter.filterActions(); - Organizations.checkOrganizationFilter(); + OrganizationsSearchAndFilter.checkSearchAndFilterPaneExists(); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); Organizations.closeDetailsPane(); diff --git a/cypress/e2e/organizations/filter-organizations-by-status.cy.js b/cypress/e2e/organizations/filter-organizations-by-status.cy.js index 8e94d40bd7..73d00765ac 100644 --- a/cypress/e2e/organizations/filter-organizations-by-status.cy.js +++ b/cypress/e2e/organizations/filter-organizations-by-status.cy.js @@ -1,9 +1,9 @@ -import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; describe('Organizations', () => { const orgA = { @@ -59,46 +59,46 @@ describe('Organizations', () => { { tags: ['extendedPath', 'thunderjet'] }, () => { // Step 1: Expand "Organizations status" accordion - Organizations.selectActiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); Organizations.organizationIsAbsent(orgB.name); Organizations.organizationIsAbsent(orgC.name); - Organizations.searchByParameters('Name', orgA.name); + OrganizationsSearchAndFilter.searchByParameters('Name', orgA.name); Organizations.checkSearchResults(orgA); // Step 3: Filter by "Inactive" status Organizations.resetFilters(); - Organizations.selectInactiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Inactive'); Organizations.checkSearchResults(orgB); Organizations.organizationIsAbsent(orgA.name); Organizations.organizationIsAbsent(orgC.name); // Step 4: Filter by "Pending" status Organizations.resetFilters(); - Organizations.selectPendingStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Pending'); Organizations.checkSearchResults(orgC); Organizations.organizationIsAbsent(orgA.name); Organizations.organizationIsAbsent(orgB.name); // Step 5: Filter by "Active" and "Pending" statuses - Organizations.selectActiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); Organizations.organizationIsAbsent(orgB.name); - Organizations.searchByParameters('Name', orgC.name); + OrganizationsSearchAndFilter.searchByParameters('Name', orgC.name); Organizations.checkSearchResults(orgC); - Organizations.searchByParameters('Name', orgA.name); + OrganizationsSearchAndFilter.searchByParameters('Name', orgA.name); Organizations.checkSearchResults(orgA); // Step 6: Filter by all statuses - Organizations.selectInactiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Inactive'); Organizations.checkSearchResults(orgA); - Organizations.searchByParameters('Name', orgB.name); + OrganizationsSearchAndFilter.searchByParameters('Name', orgB.name); Organizations.checkSearchResults(orgB); - Organizations.searchByParameters('Name', orgC.name); + OrganizationsSearchAndFilter.searchByParameters('Name', orgC.name); Organizations.checkSearchResults(orgC); // Step 7: Filter by "Inactive" and "Pending" statuses Organizations.resetFilters(); - Organizations.selectInactiveStatus(); - Organizations.selectPendingStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Inactive'); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Pending'); Organizations.checkSearchResults(orgB); Organizations.checkSearchResults(orgC); Organizations.organizationIsAbsent(orgA.name); diff --git a/cypress/e2e/organizations/filter-organizations-by-tags.cy.js b/cypress/e2e/organizations/filter-organizations-by-tags.cy.js index 783f38c31b..44a4df29e3 100644 --- a/cypress/e2e/organizations/filter-organizations-by-tags.cy.js +++ b/cypress/e2e/organizations/filter-organizations-by-tags.cy.js @@ -60,8 +60,8 @@ describe('Organizations', () => { cy.getAdminToken(); Organizations.deleteOrganizationViaApi(organization1.id); Organizations.deleteOrganizationViaApi(organization2.id); - Organizations.deleteTagById(tag1.id, { failOnStatusCode: false }); - Organizations.deleteTagById(tag2.id, { failOnStatusCode: false }); + Organizations.deleteTagByIdViaApi(tag1.id, { failOnStatusCode: false }); + Organizations.deleteTagByIdViaApi(tag2.id, { failOnStatusCode: false }); Users.deleteViaApi(user.userId); }); diff --git a/cypress/e2e/organizations/integration-claiming.cy.js b/cypress/e2e/organizations/integration-claiming.cy.js index deac15611f..7bcf309891 100644 --- a/cypress/e2e/organizations/integration-claiming.cy.js +++ b/cypress/e2e/organizations/integration-claiming.cy.js @@ -7,6 +7,7 @@ import InteractorsTools from '../../support/utils/interactorsTools'; import getRandomPostfix from '../../support/utils/stringTools'; import TopMenu from '../../support/fragments/topMenu'; import DateTools from '../../support/utils/dateTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let user; @@ -93,9 +94,9 @@ describe('Organizations', () => { it( 'C688767 Create claiming integration, edit, duplicate and delete duplicated integration (thunderjet)', - { tags: ['criticalPath', 'thunderjet'] }, + { tags: ['criticalPath', 'thunderjet', 'C688767'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); diff --git a/cypress/e2e/organizations/integration-day-field-validation.cy.js b/cypress/e2e/organizations/integration-day-field-validation.cy.js index 182dd60c8e..fa9574ce34 100644 --- a/cypress/e2e/organizations/integration-day-field-validation.cy.js +++ b/cypress/e2e/organizations/integration-day-field-validation.cy.js @@ -1,15 +1,15 @@ -import permissions from '../../support/dictionary/permissions'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; -import getRandomPostfix from '../../support/utils/stringTools'; import DateTools from '../../support/utils/dateTools'; +import getRandomPostfix from '../../support/utils/stringTools'; describe('Organizations', () => { let user; const organization = { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, accounts: [ { name: `autotest_name_${getRandomPostfix()}`, @@ -63,7 +63,7 @@ describe('Organizations', () => { Organizations.createOrganizationViaApi(organization).then((orgId) => { organization.id = orgId; }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.addIntegration(); Organizations.fillIntegrationInformationWithoutSchedulingWithDifferentInformation( @@ -71,7 +71,7 @@ describe('Organizations', () => { ); Organizations.saveOrganization(); cy.wait(4000); - cy.createTempUser([permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -90,7 +90,7 @@ describe('Organizations', () => { 'C434063 "Day" field on Integration edit page accepts only numbers less than "31" (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.selectIntegration(informationForIntegration.integrationName); Organizations.editIntegration(); diff --git a/cypress/e2e/organizations/integration-organization.cy.js b/cypress/e2e/organizations/integration-organization.cy.js index 046fe9d74e..b35f5c8f17 100644 --- a/cypress/e2e/organizations/integration-organization.cy.js +++ b/cypress/e2e/organizations/integration-organization.cy.js @@ -5,6 +5,7 @@ import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; import getRandomPostfix from '../../support/utils/stringTools'; import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let userId; @@ -50,9 +51,9 @@ describe('Organizations', () => { it( 'C350758 Verify if a User can not set and edit EDI convention in Organization Integration (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C350758', 'shiftLeft'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); diff --git a/cypress/e2e/organizations/interface-details/add-existing-interface.cy.js b/cypress/e2e/organizations/interface-details/add-existing-interface.cy.js index fe885417dd..b989d9a67f 100644 --- a/cypress/e2e/organizations/interface-details/add-existing-interface.cy.js +++ b/cypress/e2e/organizations/interface-details/add-existing-interface.cy.js @@ -1,6 +1,7 @@ import permissions from '../../../support/dictionary/permissions'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../../support/fragments/topMenu'; import Users from '../../../support/fragments/users/users'; @@ -36,7 +37,7 @@ describe('Organizations --> Interface details', () => { 'C1322 Add an existing interface to an Organization record (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.openInterfaceSection(); Organizations.checkInterfaceSectionIsEmpty(); diff --git a/cypress/e2e/organizations/interface-details/create-interface-to-organization.cy.js b/cypress/e2e/organizations/interface-details/create-interface-to-organization.cy.js index 42e854afc0..21804a7cb6 100644 --- a/cypress/e2e/organizations/interface-details/create-interface-to-organization.cy.js +++ b/cypress/e2e/organizations/interface-details/create-interface-to-organization.cy.js @@ -1,6 +1,7 @@ import permissions from '../../../support/dictionary/permissions'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; import Organizations from '../../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../../support/fragments/topMenu'; import Users from '../../../support/fragments/users/users'; @@ -34,9 +35,9 @@ describe('Organizations --> Interface details', () => { it( 'C3467 Create an interface and Assign to an Organization record (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C3467'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewInterface(defaultInterface); diff --git a/cypress/e2e/organizations/interface-details/delete-interface-details.cy.js b/cypress/e2e/organizations/interface-details/delete-interface-details.cy.js index f8184adb80..20d27ca066 100644 --- a/cypress/e2e/organizations/interface-details/delete-interface-details.cy.js +++ b/cypress/e2e/organizations/interface-details/delete-interface-details.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../../support/fragments/organizations/organization import permissions from '../../../support/dictionary/permissions'; import Users from '../../../support/fragments/users/users'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations --> Interface details', () => { let user; @@ -38,9 +39,9 @@ describe('Organizations --> Interface details', () => { it( 'C1326 Delete interface details (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C1326'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.checkInterfaceIsAdd(defaultInterface); Organizations.editOrganization(); diff --git a/cypress/e2e/organizations/interface-details/edit-interface-details.cy.js b/cypress/e2e/organizations/interface-details/edit-interface-details.cy.js index 264e3de20c..281bfbf7c4 100644 --- a/cypress/e2e/organizations/interface-details/edit-interface-details.cy.js +++ b/cypress/e2e/organizations/interface-details/edit-interface-details.cy.js @@ -3,6 +3,7 @@ import Users from '../../../support/fragments/users/users'; import Organizations from '../../../support/fragments/organizations/organizations'; import permissions from '../../../support/dictionary/permissions'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations --> Interface details', () => { const organization = { @@ -36,25 +37,29 @@ describe('Organizations --> Interface details', () => { Users.deleteViaApi(user.userId); }); - it('C1324 Edit interface details (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); - Organizations.selectOrganization(organization.name); - Organizations.openInterfaceSection(); - Organizations.checkInterfaceIsAdd(defaultInterface); - Organizations.editOrganization(); - Organizations.selectInterface(defaultInterface); - Organizations.clickEdit(); - Organizations.addNoteToInterface('Note for interface'); - Organizations.closeEditInterface(); - Organizations.closeWithoutSaving(); - Organizations.clickEdit(); - Organizations.addNoteToInterface('Note for interface'); - Organizations.closeEditInterface(); - Organizations.keepEditingOrganization(); - Organizations.clickSaveButton(); - Organizations.closeInterface(); - Organizations.closeEditOrganizationPane(); - Organizations.checkInterfaceIsAdd(defaultInterface); - Organizations.checkInterfaceNoteIsAdd('Note for interface'); - }); + it( + 'C1324 Edit interface details (thunderjet)', + { tags: ['extendedPath', 'thunderjet', 'C1324'] }, + () => { + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); + Organizations.selectOrganization(organization.name); + Organizations.openInterfaceSection(); + Organizations.checkInterfaceIsAdd(defaultInterface); + Organizations.editOrganization(); + Organizations.selectInterface(defaultInterface); + Organizations.clickEdit(); + Organizations.addNoteToInterface('Note for interface'); + Organizations.closeEditInterface(); + Organizations.closeWithoutSaving(); + Organizations.clickEdit(); + Organizations.addNoteToInterface('Note for interface'); + Organizations.closeEditInterface(); + Organizations.keepEditingOrganization(); + Organizations.clickSaveButton(); + Organizations.closeInterface(); + Organizations.closeEditOrganizationPane(); + Organizations.checkInterfaceIsAdd(defaultInterface); + Organizations.checkInterfaceNoteIsAdd('Note for interface'); + }, + ); }); diff --git a/cypress/e2e/organizations/interface-details/edit-interface-type.cy.js b/cypress/e2e/organizations/interface-details/edit-interface-type.cy.js index f36e0145d2..34d425d68b 100644 --- a/cypress/e2e/organizations/interface-details/edit-interface-type.cy.js +++ b/cypress/e2e/organizations/interface-details/edit-interface-type.cy.js @@ -3,6 +3,7 @@ import Users from '../../../support/fragments/users/users'; import Organizations from '../../../support/fragments/organizations/organizations'; import permissions from '../../../support/dictionary/permissions'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations --> Interface details', () => { const organization = { @@ -38,9 +39,9 @@ describe('Organizations --> Interface details', () => { it( 'C1323 Edit an existing interface to an Organization record > Assign an interface type (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C1323'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.openInterfaceSection(); Organizations.checkInterfaceIsAdd(defaultInterface); diff --git a/cypress/e2e/organizations/interface-details/verify-password-masking.cy.js b/cypress/e2e/organizations/interface-details/verify-password-masking.cy.js index 28923d58d8..55e0ce5a23 100644 --- a/cypress/e2e/organizations/interface-details/verify-password-masking.cy.js +++ b/cypress/e2e/organizations/interface-details/verify-password-masking.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../../support/fragments/organizations/organization import permissions from '../../../support/dictionary/permissions'; import Users from '../../../support/fragments/users/users'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations --> Interface details', () => { let user; @@ -49,9 +50,9 @@ describe('Organizations --> Interface details', () => { it( 'C3455 Verify that password is masked by default (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C3455'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.checkInterfaceIsAdd(defaultInterface); Organizations.editOrganization(); diff --git a/cypress/e2e/organizations/interface-details/view-interface-details.cy.js b/cypress/e2e/organizations/interface-details/view-interface-details.cy.js index a953cfd76a..62a27b63c1 100644 --- a/cypress/e2e/organizations/interface-details/view-interface-details.cy.js +++ b/cypress/e2e/organizations/interface-details/view-interface-details.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../../support/fragments/organizations/organization import permissions from '../../../support/dictionary/permissions'; import Users from '../../../support/fragments/users/users'; import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations --> Interface details', () => { let user; @@ -36,9 +37,13 @@ describe('Organizations --> Interface details', () => { Users.deleteViaApi(user.userId); }); - it('C1325 View interface details (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); - Organizations.selectOrganization(organization.name); - Organizations.checkInterfaceIsAdd(defaultInterface); - }); + it( + 'C1325 View interface details (thunderjet)', + { tags: ['extendedPath', 'thunderjet', 'C1325'] }, + () => { + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); + Organizations.selectOrganization(organization.name); + Organizations.checkInterfaceIsAdd(defaultInterface); + }, + ); }); diff --git a/cypress/e2e/organizations/make-organization-a-vendor.cy.js b/cypress/e2e/organizations/make-organization-a-vendor.cy.js index 9d0866f888..add8ef74e8 100644 --- a/cypress/e2e/organizations/make-organization-a-vendor.cy.js +++ b/cypress/e2e/organizations/make-organization-a-vendor.cy.js @@ -4,6 +4,7 @@ import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; import getRandomPostfix from '../../support/utils/stringTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { @@ -41,14 +42,14 @@ describe('Organizations', () => { it( 'C730 Make existing organization a Vendor (thunderjet)', - { tags: ['criticalPath', 'thunderjet'] }, + { tags: ['criticalPath', 'thunderjet', 'C730'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.selectVendor(); Organizations.addVendorInformation(vendorInformation); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); }, ); }); diff --git a/cypress/e2e/organizations/making-organization-donor-and-vice-versa.cy.js b/cypress/e2e/organizations/make-organization-donor-and-vice-versa.cy.js similarity index 75% rename from cypress/e2e/organizations/making-organization-donor-and-vice-versa.cy.js rename to cypress/e2e/organizations/make-organization-donor-and-vice-versa.cy.js index 7d53e34756..e8eff24573 100644 --- a/cypress/e2e/organizations/making-organization-donor-and-vice-versa.cy.js +++ b/cypress/e2e/organizations/make-organization-donor-and-vice-versa.cy.js @@ -1,6 +1,6 @@ -import permissions from '../../support/dictionary/permissions'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; @@ -13,7 +13,7 @@ describe('Organizations', { retries: { runMode: 1 } }, () => { Organizations.createOrganizationViaApi(organization).then((response) => { organization.id = response; }); - cy.createTempUser([permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -32,20 +32,20 @@ describe('Organizations', { retries: { runMode: 1 } }, () => { 'C421981 Making existing Organization a Donor and vice versa (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addDonorToOrganization(); Organizations.closeDetailsPane(); Organizations.resetFilters(); - Organizations.selectIsDonorFilter('Yes'); + OrganizationsSearchAndFilter.filterByIsDonor('Yes'); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); Organizations.editOrganization(); Organizations.removeDonorFromOrganization(); Organizations.closeDetailsPane(); Organizations.resetFilters(); - Organizations.selectIsDonorFilter('No'); + OrganizationsSearchAndFilter.filterByIsDonor('No'); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); Organizations.resetFilters(); diff --git a/cypress/e2e/organizations/make-organization-not-a-vendor.cy.js b/cypress/e2e/organizations/make-organization-not-a-vendor.cy.js index b0c5b3e6dc..ea8592914d 100644 --- a/cypress/e2e/organizations/make-organization-not-a-vendor.cy.js +++ b/cypress/e2e/organizations/make-organization-not-a-vendor.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { @@ -33,13 +34,13 @@ describe('Organizations', () => { it( 'C358965 Make existing organization NOT a Vendor (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C358965'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.deselectVendor(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); }, ); }); diff --git a/cypress/e2e/organizations/organizations-settings-banking-information-enabled-flows.cy.js b/cypress/e2e/organizations/organizations-settings-banking-information-enabled-flows.cy.js index 96514b865d..afda86bf0a 100644 --- a/cypress/e2e/organizations/organizations-settings-banking-information-enabled-flows.cy.js +++ b/cypress/e2e/organizations/organizations-settings-banking-information-enabled-flows.cy.js @@ -1,16 +1,16 @@ import uuid from 'uuid'; -import TopMenu from '../../support/fragments/topMenu'; -import SettingsOrganizations from '../../support/fragments/settings/organizations/settingsOrganizations'; -import getRandomPostfix from '../../support/utils/stringTools'; import { CAPABILITY_ACTIONS, CAPABILITY_TYPES } from '../../support/constants'; -import Organizations from '../../support/fragments/organizations/organizations'; -import permissions from '../../support/dictionary/permissions'; -import Users from '../../support/fragments/users/users'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; +import Permissions from '../../support/dictionary/permissions'; import Orders from '../../support/fragments/orders/orders'; -import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; import ConfirmDeleteOrganizationModal from '../../support/fragments/organizations/modals/confirmDeleteOrganizationModal'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import SettingsOrganizations from '../../support/fragments/settings/organizations/settingsOrganizations'; +import TopMenu from '../../support/fragments/topMenu'; +import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; +import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; +import getRandomPostfix from '../../support/utils/stringTools'; describe('Organizations', () => { before('Enable Banking Information', () => { @@ -69,8 +69,8 @@ describe('Organizations', () => { Organizations.createBankingInformationViaApi(bankingInformation); }); cy.createTempUser([ - permissions.uiOrganizationsView.gui, - permissions.uiOrganizationsViewBankingInformation.gui, + Permissions.uiOrganizationsView.gui, + Permissions.uiOrganizationsViewBankingInformation.gui, ]) .then((createdUserProperties) => { userA = createdUserProperties; @@ -112,7 +112,7 @@ describe('Organizations', () => { 'C423503 A user can only view banking information with "Organizations: View banking information" permission (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.checkBankInformationExist(bankingInformation.bankName); @@ -134,7 +134,7 @@ describe('Organizations', () => { }); }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.editOrganization(); @@ -162,7 +162,7 @@ describe('Organizations', () => { }); Organizations.createOrganizationViaApi(firstOrganization).then((responseOrganizations) => { firstOrganization.id = responseOrganizations; - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.editOrganization(); @@ -171,8 +171,8 @@ describe('Organizations', () => { Organizations.resetFilters(); }); cy.createTempUser([ - permissions.uiOrganizationsViewEditCreate.gui, - permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, + Permissions.uiOrganizationsViewEditCreate.gui, + Permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, ]).then((secondUserProperties) => { C423504User = secondUserProperties; }); @@ -180,7 +180,7 @@ describe('Organizations', () => { after(() => { cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganizationInCurrentPage(firstOrganization.name); Organizations.editOrganization(); @@ -199,7 +199,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.checkBankInformationExist(firstBankingInformation.name); @@ -232,8 +232,8 @@ describe('Organizations', () => { }); cy.createTempUser([ - permissions.uiOrganizationsViewEditDelete.gui, - permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, + Permissions.uiOrganizationsViewEditDelete.gui, + Permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, ]).then((userProperties) => { user = userProperties; cy.waitForAuthRefresh(() => { @@ -254,7 +254,7 @@ describe('Organizations', () => { 'C613152 Delete organization with at least one existing Banking information (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.checkBankInformationExist(bankingInformation.bankName); @@ -303,7 +303,7 @@ describe('Organizations', () => { }); Organizations.createOrganizationViaApi(firstOrganization).then((responseOrganizations) => { firstOrganization.id = responseOrganizations; - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganizationInCurrentPage(firstOrganization.name); Organizations.editOrganization(); @@ -314,7 +314,7 @@ describe('Organizations', () => { Organizations.createOrganizationViaApi(secondOrganization).then( (responseSecondOrganizations) => { secondOrganization.id = responseSecondOrganizations; - Organizations.searchByParameters('Name', secondOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', secondOrganization.name); Organizations.checkSearchResults(secondOrganization); Organizations.selectOrganizationInCurrentPage(secondOrganization.name); Organizations.editOrganization(); @@ -322,12 +322,12 @@ describe('Organizations', () => { Organizations.closeDetailsPane(); }, ); - cy.createTempUser([permissions.uiOrdersView.gui]).then((secondUserProperties) => { + cy.createTempUser([Permissions.uiOrdersView.gui]).then((secondUserProperties) => { C423432User = secondUserProperties; }); cy.createTempUser([ - permissions.uiOrdersView.gui, - permissions.uiOrganizationsViewBankingInformation.gui, + Permissions.uiOrdersView.gui, + Permissions.uiOrganizationsViewBankingInformation.gui, ]).then((userProperties) => { user = userProperties; cy.waitForAuthRefresh(() => { @@ -341,14 +341,14 @@ describe('Organizations', () => { after(() => { cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganizationInCurrentPage(firstOrganization.name); Organizations.editOrganization(); Organizations.deleteBankingInformation(); Organizations.closeDetailsPane(); Organizations.resetFilters(); - Organizations.searchByParameters('Name', secondOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', secondOrganization.name); Organizations.checkSearchResults(secondOrganization); Organizations.selectOrganizationInCurrentPage(secondOrganization.name); Organizations.editOrganization(); @@ -459,14 +459,14 @@ describe('Organizations', () => { }); Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { organization.id = responseOrganizations; - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addBankingInformation(bankingInformation); Organizations.closeDetailsPane(); }); - cy.createTempUser([permissions.uiOrganizationsViewEditCreate.gui]) + cy.createTempUser([Permissions.uiOrganizationsViewEditCreate.gui]) .then((u) => { userA = u; role.name = userA.username; @@ -498,7 +498,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); @@ -524,7 +524,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); @@ -589,8 +589,8 @@ describe('Organizations', () => { }); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewEditAndCreateBankingInformation.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewEditAndCreateBankingInformation.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -613,7 +613,7 @@ describe('Organizations', () => { 'C423519 Verifying all fields and "Cancel" option while adding "Banking information" record (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.editOrganization(); @@ -649,8 +649,8 @@ describe('Organizations', () => { }); cy.createTempUser([ - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, - permissions.uiFinanceViewFiscalYear.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, + Permissions.uiFinanceViewFiscalYear.gui, ]).then((userProperties) => { user = userProperties; }); @@ -696,7 +696,7 @@ describe('Organizations', () => { cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); Organizations.createOrganizationViaApi(firstOrganization).then((responseOrganizations) => { firstOrganization.id = responseOrganizations; - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.editOrganization(); @@ -707,7 +707,7 @@ describe('Organizations', () => { Organizations.createOrganizationViaApi(secondOrganization).then( (responseSecondOrganizations) => { secondOrganization.id = responseSecondOrganizations; - Organizations.searchByParameters('Name', secondOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', secondOrganization.name); Organizations.checkSearchResults(secondOrganization); Organizations.selectOrganization(secondOrganization.name); Organizations.editOrganization(); @@ -716,8 +716,8 @@ describe('Organizations', () => { }, ); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewAndEditBankingInformation.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewAndEditBankingInformation.gui, ]).then((secondUserProperties) => { C423504User = secondUserProperties; }); @@ -725,14 +725,14 @@ describe('Organizations', () => { after(() => { cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.editOrganization(); Organizations.deleteBankingInformation(); Organizations.closeDetailsPane(); Organizations.resetFilters(); - Organizations.searchByParameters('Name', secondOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', secondOrganization.name); Organizations.checkSearchResults(secondOrganization); Organizations.selectOrganization(secondOrganization.name); Organizations.editOrganization(); @@ -751,7 +751,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', firstOrganization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', firstOrganization.name); Organizations.checkSearchResults(firstOrganization); Organizations.selectOrganization(firstOrganization.name); Organizations.buttonNewIsAbsent(); @@ -773,7 +773,7 @@ describe('Organizations', () => { before('Create user', () => { cy.getAdminToken(); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + cy.createTempUser([Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( (userProperties) => { user = userProperties; cy.waitForAuthRefresh(() => { @@ -831,8 +831,8 @@ describe('Organizations', () => { Organizations.createBankingInformationViaApi(bankingInformation); }); cy.createTempUser([ - permissions.uiOrganizationsView.gui, - permissions.uiOrganizationsViewAndEditBankingInformation.gui, + Permissions.uiOrganizationsView.gui, + Permissions.uiOrganizationsViewAndEditBankingInformation.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -852,7 +852,7 @@ describe('Organizations', () => { 'C423518 A user cannot edit banking information without organization edit permission (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.checkAvailableActionsInTheActionsField(); @@ -877,7 +877,7 @@ describe('Organizations', () => { bankingInformation.organizationId = orgId; Organizations.createBankingInformationViaApi(bankingInformation); }); - cy.createTempUser([permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -896,13 +896,13 @@ describe('Organizations', () => { 'C434070 Error message related to Banking information does not appear when user without Banking permissions edits Organization details (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsAbsent(); Organizations.editOrganization(); Organizations.selectDonorCheckbox(); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); }, ); }); @@ -937,22 +937,22 @@ describe('Organizations', () => { }); cy.createTempUser([ - permissions.uiOrganizationsAssignAcquisitionUnitsToNewOrganization.gui, - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, - permissions.uiOrganizationsInterfaceUsernamesAndPasswordsView.gui, - permissions.uiOrganizationsInterfaceUsernamesAndPasswordsViewEditCreateDelete.gui, - permissions.uiOrganizationsManageAcquisitionUnits.gui, - permissions.uiOrganizationsView.gui, - permissions.uiOrganizationsViewAndEditBankingInformation.gui, - permissions.uiOrganizationsViewBankingInformation.gui, - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewEditAndCreateBankingInformation.gui, - permissions.uiOrganizationsViewEditCreate.gui, - permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, - permissions.uiOrganizationsViewEditDelete.gui, - permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, - permissions.uiSettingsOrganizationsCanViewOnlySettings.gui, + Permissions.uiOrganizationsAssignAcquisitionUnitsToNewOrganization.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, + Permissions.uiOrganizationsInterfaceUsernamesAndPasswordsView.gui, + Permissions.uiOrganizationsInterfaceUsernamesAndPasswordsViewEditCreateDelete.gui, + Permissions.uiOrganizationsManageAcquisitionUnits.gui, + Permissions.uiOrganizationsView.gui, + Permissions.uiOrganizationsViewAndEditBankingInformation.gui, + Permissions.uiOrganizationsViewBankingInformation.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewEditAndCreateBankingInformation.gui, + Permissions.uiOrganizationsViewEditCreate.gui, + Permissions.uiOrganizationsViewEditCreateAndDeleteBankingInformation.gui, + Permissions.uiOrganizationsViewEditDelete.gui, + Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, + Permissions.uiSettingsOrganizationsCanViewOnlySettings.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -972,7 +972,7 @@ describe('Organizations', () => { 'C423547 A user can not view banking information when "Enable banking information" setting is not active (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsAbsent(); Organizations.editOrganization(); diff --git a/cypress/e2e/organizations/pagination-and-bulk-selection.cy.js b/cypress/e2e/organizations/pagination-and-bulk-selection.cy.js index 50a339a76a..a918ebed94 100644 --- a/cypress/e2e/organizations/pagination-and-bulk-selection.cy.js +++ b/cypress/e2e/organizations/pagination-and-bulk-selection.cy.js @@ -1,13 +1,13 @@ +import Permissions from '../../support/dictionary/permissions'; +import SearchHelper from '../../support/fragments/finance/financeHelper'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; -import permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; -import SearchHelper from '../../support/fragments/finance/financeHelper'; describe('Organizations', () => { let user; - const organization = { ...newOrganization.defaultUiOrganizations }; + const organization = { ...NewOrganization.defaultUiOrganizations }; const contactIds = []; before('Create user, organization, and contacts', () => { @@ -34,7 +34,7 @@ describe('Organizations', () => { contactIds.push(contactId); }); - cy.createTempUser([permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEditCreate.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -56,13 +56,13 @@ describe('Organizations', () => { 'C359169 Next/previous pagination and bulk selection in "Add contacts" dialog (thunderjet)', { tags: ['extendedPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.filterContactsByStatus('Inactive'); Organizations.verifyPaginationInContactList(); Organizations.resetFilters(); - Organizations.selectActiveStatus(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); Organizations.verifyPaginationInContactList(); Organizations.selectAllContactsOnPage(); Organizations.verifyTotalSelected(50); diff --git a/cypress/e2e/organizations/print-organization-details-pane.cy.js b/cypress/e2e/organizations/print-organization-details-pane.cy.js index 8d37b58c46..4746a49273 100644 --- a/cypress/e2e/organizations/print-organization-details-pane.cy.js +++ b/cypress/e2e/organizations/print-organization-details-pane.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import newOrganization from '../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let user; @@ -32,7 +33,7 @@ describe('Organizations', () => { 'C422053 Print organization details pane (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); Organizations.clickExpandAllButton(); diff --git a/cypress/e2e/organizations/privileged-donor-contacts-not-in-lookups.cy.js b/cypress/e2e/organizations/privileged-donor-contacts-not-in-lookups.cy.js index d062d4ce58..10d3a0ced0 100644 --- a/cypress/e2e/organizations/privileged-donor-contacts-not-in-lookups.cy.js +++ b/cypress/e2e/organizations/privileged-donor-contacts-not-in-lookups.cy.js @@ -4,6 +4,7 @@ import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import newOrganization from '../../support/fragments/organizations/newOrganization'; import getRandomPostfix from '../../support/utils/stringTools'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let user; @@ -49,9 +50,9 @@ describe('Organizations', () => { it( 'C423630 Privileged Donor contacts do NOT appear in Contact Person lookups (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C423630'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.openPrivilegedDonorInformationSection(); Organizations.checkDonorContactIsAdd(privilegedContact); diff --git a/cypress/e2e/organizations/save-and-keep-editing-when-creating.cy.js b/cypress/e2e/organizations/save-and-keep-editing-when-creating.cy.js index 5311816a61..b3569e0e93 100644 --- a/cypress/e2e/organizations/save-and-keep-editing-when-creating.cy.js +++ b/cypress/e2e/organizations/save-and-keep-editing-when-creating.cy.js @@ -1,7 +1,6 @@ +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; describe('Organizations', () => { @@ -9,25 +8,18 @@ describe('Organizations', () => { let user; before(() => { - cy.createTempUser([permissions.uiOrganizationsViewEditCreate.gui]).then((u) => { + cy.createTempUser([Permissions.uiOrganizationsViewEditCreate.gui]).then((u) => { user = u; - cy.waitForAuthRefresh(() => { - cy.login(user.username, user.password, { - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); + cy.login(user.username, user.password, { + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, }); }); }); after(() => { - cy.loginAsAdmin({ - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); - Organizations.searchByParameters('Name', org.name); - Organizations.selectOrganization(org.name); - Organizations.deleteOrganization(); + cy.getAdminToken(); + Organizations.deleteOrganizationViaApi(org.id); Users.deleteViaApi(user.userId); }); @@ -42,11 +34,11 @@ describe('Organizations', () => { Organizations.checkRequiredFields('Status'); Organizations.fillInInfoNewOrganization(org); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(org); + Organizations.verifySaveCalloutMessage(org); Organizations.editOrganization(); Organizations.selectVendor(); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(org); + Organizations.verifySaveCalloutMessage(org); Organizations.checkIsaVendor(org); Organizations.editOrganization(); Organizations.selectDonorCheckbox(); diff --git a/cypress/e2e/organizations/save-and-keep-editing-when-editing.cy.js b/cypress/e2e/organizations/save-and-keep-editing-when-editing.cy.js index cb526c077a..fce638e891 100644 --- a/cypress/e2e/organizations/save-and-keep-editing-when-editing.cy.js +++ b/cypress/e2e/organizations/save-and-keep-editing-when-editing.cy.js @@ -1,7 +1,7 @@ +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; @@ -19,7 +19,7 @@ describe('Organizations', () => { Organizations.createOrganizationViaApi(org).then((response) => { org.id = response; }); - cy.createTempUser([permissions.uiOrganizationsViewEdit.gui]).then((u) => { + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((u) => { user = u; cy.waitForAuthRefresh(() => { cy.login(user.username, user.password, { @@ -38,9 +38,9 @@ describe('Organizations', () => { it( 'C656335 Save using Save & keep editing when editing organization', - { tags: ['extended', 'thunderjet'] }, + { tags: ['extended', 'thunderjet', 'C656335'] }, () => { - Organizations.searchByParameters('Name', org.name); + OrganizationsSearchAndFilter.searchByParameters('Name', org.name); Organizations.selectOrganization(org.name); Organizations.getLastUpdateTime().then((time) => { preUpdated = time; @@ -51,10 +51,10 @@ describe('Organizations', () => { Organizations.checkRequiredFields('Name'); Organizations.fillNameField(organizationWithNewName.name); Organizations.saveAndKeepEditing(); - Organizations.varifySaveOrganizationCalloutMessage(organizationWithNewName); + Organizations.verifySaveCalloutMessage(organizationWithNewName); Organizations.selectVendor(); Organizations.saveAndKeepEditing(); - Organizations.varifySaveOrganizationCalloutMessage(organizationWithNewName); + Organizations.verifySaveCalloutMessage(organizationWithNewName); Organizations.selectDonorCheckbox(); Organizations.cancelOrganization(); Organizations.closeWithoutSaving(); diff --git a/cypress/e2e/organizations/search-alternate-organization-name.cy.js b/cypress/e2e/organizations/search-alternate-organization-name.cy.js index a6fb3583f5..837f23b068 100644 --- a/cypress/e2e/organizations/search-alternate-organization-name.cy.js +++ b/cypress/e2e/organizations/search-alternate-organization-name.cy.js @@ -1,9 +1,9 @@ -import TopMenu from '../../support/fragments/topMenu'; -import Organizations from '../../support/fragments/organizations/organizations'; import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; describe('Organizations', () => { const organization = { @@ -39,12 +39,12 @@ describe('Organizations', () => { it( 'C677 Search an alternate organization name (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C677'] }, () => { - Organizations.searchByParameters('Alias', organization.aliases[0].value); + OrganizationsSearchAndFilter.searchByParameters('Alias', organization.aliases[0].value); Organizations.checkSearchResults(organization); Organizations.resetFilters(); - Organizations.searchByParameters('All', organization.aliases[0].value); + OrganizationsSearchAndFilter.searchByParameters('All', organization.aliases[0].value); Organizations.checkSearchResults(organization); }, ); diff --git a/cypress/e2e/organizations/search-organization.cy.js b/cypress/e2e/organizations/search-organization.cy.js index 133e6bb4d2..9b26813402 100644 --- a/cypress/e2e/organizations/search-organization.cy.js +++ b/cypress/e2e/organizations/search-organization.cy.js @@ -1,5 +1,5 @@ -import NewOrganization from '../../support/fragments/organizations/newOrganization'; -import Organizations from '../../support/fragments/organizations/organizations'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; describe('Organizations', () => { @@ -32,9 +32,9 @@ describe('Organizations', () => { ].forEach((searcher) => { it( 'C6712 Test the Organizations app searches (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C6712', 'shiftLeft'] }, () => { - Organizations.searchByParameters(searcher.parameter, searcher.value); + OrganizationsSearchAndFilter.searchByParameters(searcher.parameter, searcher.value); Organizations.checkSearchResults(organization); Organizations.resetFilters(); }, diff --git a/cypress/e2e/organizations/search-pagination.cy.js b/cypress/e2e/organizations/search-pagination.cy.js index 756afbbba0..653ed4645c 100644 --- a/cypress/e2e/organizations/search-pagination.cy.js +++ b/cypress/e2e/organizations/search-pagination.cy.js @@ -1,6 +1,7 @@ -import permissions from '../../support/dictionary/permissions'; -import TopMenu from '../../support/fragments/topMenu'; +import Permissions from '../../support/dictionary/permissions'; import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; describe('Organizations', () => { @@ -8,7 +9,7 @@ describe('Organizations', () => { before('Create user', () => { cy.getAdminToken(); - cy.createTempUser([permissions.uiOrganizationsView.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsView.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -23,10 +24,10 @@ describe('Organizations', () => { it( 'C353532 Organizations search style and position of pagination (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C353532'] }, () => { - Organizations.verifySearchAndFilterPane(); - Organizations.selectActiveStatus(); + OrganizationsSearchAndFilter.verifySearchAndFilterPane(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); Organizations.verifyPagination(50); Organizations.clickNextPaginationButton(); Organizations.clickPreviousPaginationButton(); diff --git a/cypress/e2e/organizations/settings/create-new-categories.cy.js b/cypress/e2e/organizations/settings/create-new-categories.cy.js index 1bb4ab3e13..4fcae83ed7 100644 --- a/cypress/e2e/organizations/settings/create-new-categories.cy.js +++ b/cypress/e2e/organizations/settings/create-new-categories.cy.js @@ -1,11 +1,12 @@ -import TopMenu from '../../../support/fragments/topMenu'; +import { APPLICATION_NAMES } from '../../../support/constants'; +import Permissions from '../../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import SettingsOrganizations from '../../../support/fragments/settings/organizations/settingsOrganizations'; -import Organizations from '../../../support/fragments/organizations/organizations'; -import getRandomPostfix from '../../../support/utils/stringTools'; -import permissions from '../../../support/dictionary/permissions'; -import Users from '../../../support/fragments/users/users'; -import NewOrganization from '../../../support/fragments/organizations/newOrganization'; +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'; describe('Organizations --> Settings', () => { const categoryName = `Category_${getRandomPostfix()}`; @@ -19,8 +20,8 @@ describe('Organizations --> Settings', () => { organization.id = organizationId; }); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, ]).then((userProperties) => { user = userProperties; cy.waitForAuthRefresh(() => { @@ -46,8 +47,9 @@ describe('Organizations --> Settings', () => { SettingsOrganizations.fillCategoryName(categoryName); SettingsOrganizations.saveCategoryChanges(); SettingsOrganizations.checkCategoriesTableContent(categoryName); - TopMenuNavigation.navigateToApp('Organizations'); - Organizations.searchByParameters('Name', organization.name); + + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.ORGANIZATIONS); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openContactPeopleSection(); diff --git a/cypress/e2e/organizations/settings/organizations-settings-account-types-manage.cy.js b/cypress/e2e/organizations/settings/organizations-settings-account-types-manage.cy.js index 60c323981e..d144d10d41 100644 --- a/cypress/e2e/organizations/settings/organizations-settings-account-types-manage.cy.js +++ b/cypress/e2e/organizations/settings/organizations-settings-account-types-manage.cy.js @@ -1,10 +1,12 @@ -import TopMenu from '../../../support/fragments/topMenu'; +import { APPLICATION_NAMES } from '../../../support/constants'; +import Permissions from '../../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../../support/fragments/organizations/organizationsSearchAndFilter'; import SettingsOrganizations from '../../../support/fragments/settings/organizations/settingsOrganizations'; -import getRandomPostfix from '../../../support/utils/stringTools'; -import permissions from '../../../support/dictionary/permissions'; +import TopMenu from '../../../support/fragments/topMenu'; +import TopMenuNavigation from '../../../support/fragments/topMenuNavigation'; import Users from '../../../support/fragments/users/users'; -import NewOrganization from '../../../support/fragments/organizations/newOrganization'; -import Organizations from '../../../support/fragments/organizations/organizations'; +import getRandomPostfix from '../../../support/utils/stringTools'; describe('Banking Information', () => { before('Enable Banking Information', () => { @@ -25,7 +27,7 @@ describe('Banking Information', () => { before('Create test data', () => { cy.getAdminToken(); SettingsOrganizations.createAccountTypesViaApi(existingAccountType); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + cy.createTempUser([Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( (userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -78,7 +80,7 @@ describe('Banking Information', () => { before('Create test data', () => { cy.getAdminToken(); SettingsOrganizations.createAccountTypesViaApi(accountType); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + cy.createTempUser([Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( (userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -120,7 +122,7 @@ describe('Banking Information', () => { before('Create test data', () => { cy.getAdminToken(); SettingsOrganizations.createAccountTypesViaApi(accountType); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + cy.createTempUser([Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( (userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -172,7 +174,7 @@ describe('Banking Information', () => { }); SettingsOrganizations.uncheckenableBankingInformationIfChecked(); SettingsOrganizations.createAccountTypesViaApi(accountType); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + cy.createTempUser([Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( (userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -226,9 +228,9 @@ describe('Banking Information', () => { Organizations.createBankingInformationViaApi(bankingInformation); cy.createTempUser([ - permissions.uiOrganizationsView.gui, - permissions.uiOrganizationsViewBankingInformation.gui, - permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, + Permissions.uiOrganizationsView.gui, + Permissions.uiOrganizationsViewBankingInformation.gui, + Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, ]).then((userProperties) => { user = userProperties; cy.waitForAuthRefresh(() => { @@ -258,12 +260,12 @@ describe('Banking Information', () => { // Verify banking information settings enabled: other settings might deactivate it SettingsOrganizations.selectBankingInformation(); SettingsOrganizations.checkenableBankingInformationIfNeeded(); - SettingsOrganizations.selectAccountTypes(); SettingsOrganizations.checkNewAccountTypeButtonExists(); SettingsOrganizations.tryToDeleteAccountTypeWhenItUnable(existingAccountType); - cy.visit(TopMenu.organizationsPath); - Organizations.searchByParameters('Name', organization.name); + + TopMenuNavigation.navigateToApp(APPLICATION_NAMES.ORGANIZATIONS); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.verifyBankingInformationAccordionIsPresent(); Organizations.checkBankInformationExist(bankingInformation.bankName); diff --git a/cypress/e2e/organizations/test-acquisition-unit-for-organizations.cy.js b/cypress/e2e/organizations/test-acquisition-unit-for-organizations.cy.js index 6649fd04df..37a1662c5c 100644 --- a/cypress/e2e/organizations/test-acquisition-unit-for-organizations.cy.js +++ b/cypress/e2e/organizations/test-acquisition-unit-for-organizations.cy.js @@ -1,5 +1,6 @@ -import permissions from '../../support/dictionary/permissions'; +import Permissions from '../../support/dictionary/permissions'; import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits'; import SettingsMenu from '../../support/fragments/settingsMenu'; import TopMenu from '../../support/fragments/topMenu'; @@ -13,15 +14,15 @@ describe('Organizations', () => { before(() => { cy.getAdminToken(); cy.createTempUser([ - permissions.uiOrganizationsAssignAcquisitionUnitsToNewOrganization.gui, - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, - permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, - permissions.uiOrganizationsInterfaceUsernamesAndPasswordsView.gui, - permissions.uiOrganizationsInterfaceUsernamesAndPasswordsViewEditCreateDelete.gui, - permissions.uiOrganizationsManageAcquisitionUnits.gui, - permissions.uiOrganizationsViewEditCreate.gui, - permissions.uiOrganizationsViewEditDelete.gui, - permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, + Permissions.uiOrganizationsAssignAcquisitionUnitsToNewOrganization.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsView.gui, + Permissions.uiOrganizationsIntegrationUsernamesAndPasswordsViewEdit.gui, + Permissions.uiOrganizationsInterfaceUsernamesAndPasswordsView.gui, + Permissions.uiOrganizationsInterfaceUsernamesAndPasswordsViewEditCreateDelete.gui, + Permissions.uiOrganizationsManageAcquisitionUnits.gui, + Permissions.uiOrganizationsViewEditCreate.gui, + Permissions.uiOrganizationsViewEditDelete.gui, + Permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui, ]).then((userProperties) => { user = userProperties; }); @@ -42,7 +43,7 @@ describe('Organizations', () => { it( 'C350693 Test acquisition unit restrictions for Organization records (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C350693'] }, () => { cy.loginAsAdmin({ path: SettingsMenu.acquisitionUnitsPath, @@ -73,7 +74,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkZeroSearchResultsHeader(); cy.logout(); @@ -89,7 +90,7 @@ describe('Organizations', () => { path: TopMenu.organizationsPath, waiter: Organizations.waitLoading, }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); }, ); diff --git a/cypress/e2e/organizations/unassign-contact-from-organization.cy.js b/cypress/e2e/organizations/unassign-contact-from-organization.cy.js index 348ec27661..53460786b0 100644 --- a/cypress/e2e/organizations/unassign-contact-from-organization.cy.js +++ b/cypress/e2e/organizations/unassign-contact-from-organization.cy.js @@ -3,6 +3,7 @@ import Organizations from '../../support/fragments/organizations/organizations'; import Permissions from '../../support/dictionary/permissions'; import Users from '../../support/fragments/users/users'; import NewOrganization from '../../support/fragments/organizations/newOrganization'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { const organization = { @@ -38,15 +39,15 @@ describe('Organizations', () => { it( 'C727 Unassign contact from an organization record (thunderjet)', - { tags: ['extendedPath', 'thunderjet'] }, + { tags: ['extendedPath', 'thunderjet', 'C727'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openContactPeopleSectionInEditCard(); Organizations.deleteContactFromContactPeople(); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); Organizations.checkContactSectionIsEmpty(); }, ); diff --git a/cypress/e2e/organizations/user-can-only-view-privileged-donor-information.cy.js b/cypress/e2e/organizations/user-can-only-view-privileged-donor-information.cy.js index 7d2bfa9e01..3ae9e7f05b 100644 --- a/cypress/e2e/organizations/user-can-only-view-privileged-donor-information.cy.js +++ b/cypress/e2e/organizations/user-can-only-view-privileged-donor-information.cy.js @@ -1,9 +1,9 @@ -import permissions from '../../support/dictionary/permissions'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; describe('Organizations', () => { const organization = { @@ -23,7 +23,7 @@ describe('Organizations', () => { organization.id = response; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewDonorContact(firstContact); @@ -32,8 +32,8 @@ describe('Organizations', () => { Organizations.checkDonorContactIsAdd(firstContact); Organizations.saveOrganization(); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewEditCreateDeletePrivilegedDonorInformation.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewEditCreateDeletePrivilegedDonorInformation.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -55,9 +55,9 @@ describe('Organizations', () => { it( 'C423623 A user with "Organizations: can view privileged donor information" permission can only view privileged donor information (thunderjet)', - { tags: ['criticalPath', 'thunderjet'] }, + { tags: ['criticalPath', 'thunderjet', 'C423623'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.openPrivilegedDonorInformationSection(); diff --git a/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-create-organization-record.cy.js b/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-create-organization-record.cy.js index a791453074..b69095a245 100644 --- a/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-create-organization-record.cy.js +++ b/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-create-organization-record.cy.js @@ -46,7 +46,7 @@ describe('Organizations', () => { Organizations.fillInInfoNewOrganization(organization); Organizations.selectDonorCheckbox(); Organizations.saveOrganization(); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); Organizations.varifyAbsentPrivilegedDonorInformationSection(); }, ); diff --git a/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-edit-organization-record.cy.js b/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-edit-organization-record.cy.js index 9634b1b6e3..9d25125d26 100644 --- a/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-edit-organization-record.cy.js +++ b/cypress/e2e/organizations/user-cannot-view-privileged-donor-information-when-edit-organization-record.cy.js @@ -1,9 +1,9 @@ -import permissions from '../../support/dictionary/permissions'; -import Organizations from '../../support/fragments/organizations/organizations'; +import Permissions from '../../support/dictionary/permissions'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; -import NewOrganization from '../../support/fragments/organizations/newOrganization'; describe('Organizations', () => { const organization = { @@ -23,7 +23,7 @@ describe('Organizations', () => { organization.id = response; }); cy.loginAsAdmin({ path: TopMenu.organizationsPath, waiter: Organizations.waitLoading }); - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.addNewDonorContact(firstContact); @@ -31,7 +31,7 @@ describe('Organizations', () => { Organizations.addDonorContactToOrganization(firstContact); Organizations.checkDonorContactIsAdd(firstContact); Organizations.saveOrganization(); - cy.createTempUser([permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { + cy.createTempUser([Permissions.uiOrganizationsViewEdit.gui]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { path: TopMenu.organizationsPath, @@ -54,7 +54,7 @@ describe('Organizations', () => { 'C423625 A user without privileged donor information permission cannot view privileged donor information when edit organization record (thunderjet)', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.editOrganization(); Organizations.removeDonorFromOrganization(); diff --git a/cypress/e2e/organizations/user-integration-organization.cy.js b/cypress/e2e/organizations/user-integration-organization.cy.js index 38c652267f..8fe3438403 100644 --- a/cypress/e2e/organizations/user-integration-organization.cy.js +++ b/cypress/e2e/organizations/user-integration-organization.cy.js @@ -5,6 +5,7 @@ import Users from '../../support/fragments/users/users'; import InteractorsTools from '../../support/utils/interactorsTools'; import getRandomPostfix from '../../support/utils/stringTools'; import TopMenuNavigation from '../../support/fragments/topMenuNavigation'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; describe('Organizations', () => { let userId; @@ -66,10 +67,10 @@ describe('Organizations', () => { it( 'C350762 User can Create and Edit Integrations for an Organization-Vendor (thunderjet)', - { tags: ['smoke', 'thunderjet', 'shiftLeft', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C350762', 'shiftLeft'] }, () => { // Found and edit created organization - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.checkSearchResults(organization); Organizations.selectOrganization(organization.name); // Add first integration and check this diff --git a/cypress/e2e/organizations/version-history-view.cy.js b/cypress/e2e/organizations/version-history-view.cy.js index 91f2ebd07e..a8e400eacc 100644 --- a/cypress/e2e/organizations/version-history-view.cy.js +++ b/cypress/e2e/organizations/version-history-view.cy.js @@ -1,23 +1,23 @@ -import Organizations from '../../support/fragments/organizations/organizations'; -import Users from '../../support/fragments/users/users'; +import Permissions from '../../support/dictionary/permissions'; import Agreements from '../../support/fragments/agreements/agreements'; -import TopMenu from '../../support/fragments/topMenu'; -import getRandomPostfix from '../../support/utils/stringTools'; -import newOrganization from '../../support/fragments/organizations/newOrganization'; import NewAgreement from '../../support/fragments/agreements/newAgreement'; -import InteractorsTools from '../../support/utils/interactorsTools'; -import permissions from '../../support/dictionary/permissions'; import VersionHistorySection from '../../support/fragments/inventory/versionHistorySection'; +import { NewOrganization, Organizations } from '../../support/fragments/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; +import TopMenu from '../../support/fragments/topMenu'; +import Users from '../../support/fragments/users/users'; +import InteractorsTools from '../../support/utils/interactorsTools'; +import getRandomPostfix from '../../support/utils/stringTools'; describe('Organizations', () => { const organization = { - ...newOrganization.defaultUiOrganizations, + ...NewOrganization.defaultUiOrganizations, isDonor: true, privilegedContacts: [], isVendor: false, }; - const privilegedContact = { ...newOrganization.defaultContact }; - const organizationInterface = { ...newOrganization.defaultInterface }; + const privilegedContact = { ...NewOrganization.defaultContact }; + const organizationInterface = { ...NewOrganization.defaultInterface }; const contactPeople = { firstName: `AT_FN_${getRandomPostfix()}_2`, lastName: `AT_LN_${getRandomPostfix()}_2`, @@ -31,13 +31,7 @@ describe('Organizations', () => { let lastUpdate; before(() => { - cy.waitForAuthRefresh(() => { - cy.loginAsAdmin({ - path: TopMenu.organizationsPath, - waiter: Organizations.waitLoading, - }); - }); - + cy.getAdminToken(); Organizations.createInterfaceViaApi(organizationInterface).then((interfaceId) => { organizationInterface.id = interfaceId; }); @@ -51,9 +45,12 @@ describe('Organizations', () => { organization.id = organizationResponse; }); }); - cy.wait(30000); - Organizations.searchByParameters('Name', organization.name); + cy.loginAsAdmin({ + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, + }); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganizationInCurrentPage(organization.name); Organizations.getLastUpdateTime().then((time) => { preUpdated = time.replace(' ', ', '); @@ -61,7 +58,7 @@ describe('Organizations', () => { Organizations.editOrganization(); Organizations.addContactToOrganizationWithoutSaving(contactPeople); Organizations.addIntrefaceToOrganization(organizationInterface); - Organizations.varifySaveOrganizationCalloutMessage(organization); + Organizations.verifySaveCalloutMessage(organization); Organizations.getLastUpdateTime().then((time) => { afterUpdated = time.replace(' ', ', '); }); @@ -75,8 +72,8 @@ describe('Organizations', () => { InteractorsTools.checkCalloutMessage(colloutMessage2); cy.createTempUser([ - permissions.uiOrganizationsViewEdit.gui, - permissions.uiOrganizationsViewEditCreateDeletePrivilegedDonorInformation.gui, + Permissions.uiOrganizationsViewEdit.gui, + Permissions.uiOrganizationsViewEditCreateDeletePrivilegedDonorInformation.gui, ]).then((userProperties) => { user = userProperties; cy.login(user.username, user.password, { @@ -87,12 +84,10 @@ describe('Organizations', () => { }); after(() => { - cy.loginAsAdmin({ - path: TopMenu.agreementsPath, - waiter: Agreements.waitLoading, + cy.getAdminToken(); + Agreements.getIdViaApi(defaultAgreement.name).then((agreementId) => { + Agreements.deleteViaApi(agreementId); }); - Agreements.selectRecord(defaultAgreement.name); - Agreements.deleteAgreement(); Organizations.deleteContactViaApi(contactPeople.id); Organizations.deletePrivilegedContactsViaApi(privilegedContact.id); Organizations.deleteOrganizationViaApi(organization.id); @@ -103,7 +98,7 @@ describe('Organizations', () => { 'C663330 Version history view for Organizations', { tags: ['criticalPath', 'thunderjet'] }, () => { - Organizations.searchByParameters('Name', organization.name); + OrganizationsSearchAndFilter.searchByParameters('Name', organization.name); Organizations.selectOrganization(organization.name); Organizations.openVersionHistory(); Organizations.selectVersionHistoryCard(preUpdated); diff --git a/cypress/e2e/organizations/view-existing-record.cy.js b/cypress/e2e/organizations/view-existing-record.cy.js index ccead83022..6211bd91c0 100644 --- a/cypress/e2e/organizations/view-existing-record.cy.js +++ b/cypress/e2e/organizations/view-existing-record.cy.js @@ -1,4 +1,5 @@ import Organizations from '../../support/fragments/organizations/organizations'; +import OrganizationsSearchAndFilter from '../../support/fragments/organizations/organizationsSearchAndFilter'; import TopMenu from '../../support/fragments/topMenu'; import getRandomPostfix from '../../support/utils/stringTools'; @@ -12,12 +13,15 @@ describe('Organizations', () => { }; before(() => { - cy.loginAsAdmin(); cy.getAdminToken(); Organizations.createOrganizationViaApi(organization).then((response) => { organization.id = response; }); - cy.visit(TopMenu.organizationsPath); + + cy.loginAsAdmin({ + path: TopMenu.organizationsPath, + waiter: Organizations.waitLoading, + }); }); after(() => { @@ -27,10 +31,11 @@ describe('Organizations', () => { it( 'C672 View existing organization record (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C672'] }, () => { - Organizations.selectActiveStatus(); - Organizations.checkOrganizationFilter(); + OrganizationsSearchAndFilter.waitLoading(); + OrganizationsSearchAndFilter.filterByOrganizationStatus('Active'); + OrganizationsSearchAndFilter.checkSearchAndFilterPaneExists(); Organizations.selectOrganization(organization.name); Organizations.checkOrganizationInfo(organization); }, diff --git a/cypress/e2e/receiving/check-possible-actions-for-piece-in-received-status-when-edit-piece.cy.js b/cypress/e2e/receiving/check-possible-actions-for-piece-in-received-status-when-edit-piece.cy.js index f5769f800e..c96bb18e14 100644 --- a/cypress/e2e/receiving/check-possible-actions-for-piece-in-received-status-when-edit-piece.cy.js +++ b/cypress/e2e/receiving/check-possible-actions-for-piece-in-received-status-when-edit-piece.cy.js @@ -134,7 +134,7 @@ describe('Orders: Inventory interaction', () => { it( 'C423548 Check possible actions for piece in "Received" status when edit piece (thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C423548'] }, () => { Orders.searchByParameter('PO number', orderNumber); Orders.selectFromResultsList(orderNumber); diff --git a/cypress/e2e/receiving/export/export-results-to-csv-from-receiving.cy.js b/cypress/e2e/receiving/export/export-results-to-csv-from-receiving.cy.js index f80215c10c..363e4d7e6b 100644 --- a/cypress/e2e/receiving/export/export-results-to-csv-from-receiving.cy.js +++ b/cypress/e2e/receiving/export/export-results-to-csv-from-receiving.cy.js @@ -108,7 +108,7 @@ describe('Receiving', () => { it( 'C353981 Export results (CSV) from Receiving for all "Title fields" and all "Piece fields" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353981'] }, () => { // Click "Actions" button, Select "Export results (CSV)" option Receivings.expandActionsDropdown(); @@ -157,7 +157,7 @@ describe('Receiving', () => { it( 'C353985 Export results (CSV) from Receiving with specified "Title fields" and "Piece fields" (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C353985'] }, () => { // Click "Actions" button, Select "Export results (CSV)" option Receivings.expandActionsDropdown(); diff --git a/cypress/e2e/settings/acquisition-units/create-acquisition-unit.cy.js b/cypress/e2e/settings/acquisition-units/create-acquisition-unit.cy.js index ce2450618b..cc9f13eeba 100644 --- a/cypress/e2e/settings/acquisition-units/create-acquisition-unit.cy.js +++ b/cypress/e2e/settings/acquisition-units/create-acquisition-unit.cy.js @@ -30,7 +30,7 @@ describe('Acquisition Units', () => { it( 'C6728 Create acquisitions unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6728'] }, () => { cy.waitForAuthRefresh(() => { cy.login(user.username, user.password, { diff --git a/cypress/e2e/settings/acquisition-units/edit-acquisition-unit.cy.js b/cypress/e2e/settings/acquisition-units/edit-acquisition-unit.cy.js index 4c4c8ebeeb..d825b30de5 100644 --- a/cypress/e2e/settings/acquisition-units/edit-acquisition-unit.cy.js +++ b/cypress/e2e/settings/acquisition-units/edit-acquisition-unit.cy.js @@ -41,7 +41,7 @@ describe('Acquisition Units', () => { it( 'C6729 Update existing acquisition unit (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6729'] }, () => { AcquisitionUnits.edit(defaultAcquisitionUnit.name); AcquisitionUnits.fillInAUInfo(`${defaultAcquisitionUnit.name}-edited`); diff --git a/cypress/e2e/settings/acquisition-units/test-au-for-orders-invoices-funds.cy.js b/cypress/e2e/settings/acquisition-units/test-au-for-orders-invoices-funds.cy.js index 103a162ef3..229905ca7d 100644 --- a/cypress/e2e/settings/acquisition-units/test-au-for-orders-invoices-funds.cy.js +++ b/cypress/e2e/settings/acquisition-units/test-au-for-orders-invoices-funds.cy.js @@ -164,7 +164,7 @@ describe('Acquisition Units', () => { it( 'C163931 Test acquisition unit restrictions for apply Funds to orders or Invoices (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C163931'] }, () => { cy.loginAsAdmin({ path: SettingsMenu.acquisitionUnitsPath, diff --git a/cypress/e2e/settings/data-import/add-and-remove-tags-to-a-job-profile.cy.js b/cypress/e2e/settings/data-import/add-and-remove-tags-to-a-job-profile.cy.js index c336a6c52a..2dd46cc6fb 100644 --- a/cypress/e2e/settings/data-import/add-and-remove-tags-to-a-job-profile.cy.js +++ b/cypress/e2e/settings/data-import/add-and-remove-tags-to-a-job-profile.cy.js @@ -61,7 +61,7 @@ describe('Data Import', () => { it( 'C2331 Add tags to a job profile, then remove tags from it (folijet)', - { tags: ['extendedPath', 'folijet', 'C2331', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C2331'] }, () => { TopMenuNavigation.openAppFromDropdown(APPLICATION_NAMES.SETTINGS); SettingsDataImport.goToSettingsDataImport(); diff --git a/cypress/e2e/settings/data-import/attach-profiles-to-job-profile.cy.js b/cypress/e2e/settings/data-import/attach-profiles-to-job-profile.cy.js index 43ce02ed28..a0b0257f08 100644 --- a/cypress/e2e/settings/data-import/attach-profiles-to-job-profile.cy.js +++ b/cypress/e2e/settings/data-import/attach-profiles-to-job-profile.cy.js @@ -131,7 +131,7 @@ describe('Data Import', () => { it( 'C11139 Attaching match and action profiles to a job profile (folijet) (TaaS)', - { tags: ['extendedPath', 'folijet', 'C11139', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'folijet', 'C11139'] }, () => { JobProfiles.createJobProfile(jobProfile); NewJobProfile.linkMatchProfile(collectionOfMatchProfiles[0].matchProfile.profileName); diff --git a/cypress/e2e/settings/finance/delete-fund-types.cy.js b/cypress/e2e/settings/finance/delete-fund-types.cy.js index 837b5e1291..d6db410e27 100644 --- a/cypress/e2e/settings/finance/delete-fund-types.cy.js +++ b/cypress/e2e/settings/finance/delete-fund-types.cy.js @@ -58,7 +58,7 @@ describe('Finance › Settings (Finance)', () => { it( 'C367941 Delete Fund types (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C367941'] }, () => { SettingsFinance.canNotDeleteFundType(firstFundType); SettingsFinance.deleteFundType(secondFundType); diff --git a/cypress/e2e/settings/finance/expense-classes-create.cy.js b/cypress/e2e/settings/finance/expense-classes-create.cy.js index 360c6c3251..a3d2d84f73 100644 --- a/cypress/e2e/settings/finance/expense-classes-create.cy.js +++ b/cypress/e2e/settings/finance/expense-classes-create.cy.js @@ -21,7 +21,7 @@ describe('ui-invoices-settings: Batch Group creation', { retries: { runMode: 1 } it( 'C15857 Create edit and delete Expense classes (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C15857'] }, () => { SettingsFinance.waitExpenseClassesLoading(); SettingsFinance.createNewExpenseClass(expenseClass); diff --git a/cypress/e2e/settings/invoices/delete-batch-group.cy.js b/cypress/e2e/settings/invoices/delete-batch-group.cy.js index f80549d480..22c89c737c 100644 --- a/cypress/e2e/settings/invoices/delete-batch-group.cy.js +++ b/cypress/e2e/settings/invoices/delete-batch-group.cy.js @@ -1,44 +1,48 @@ -import permissions from '../../../support/dictionary/permissions'; -import getRandomPostfix from '../../../support/utils/stringTools'; -import SettingsMenu from '../../../support/fragments/settingsMenu'; -import Users from '../../../support/fragments/users/users'; +import Permissions from '../../../support/dictionary/permissions'; +import { Invoices, NewInvoice } from '../../../support/fragments/invoices'; import NewBatchGroup from '../../../support/fragments/invoices/newBatchGroup'; import SettingsInvoices from '../../../support/fragments/invoices/settingsInvoices'; -import NewOrganization from '../../../support/fragments/organizations/newOrganization'; -import Organizations from '../../../support/fragments/organizations/organizations'; -import Invoices from '../../../support/fragments/invoices/invoices'; -import NewInvoice from '../../../support/fragments/invoices/newInvoice'; +import { NewOrganization, Organizations } from '../../../support/fragments/organizations'; import BatchGroups from '../../../support/fragments/settings/invoices/batchGroups'; import SettingsOrganizations from '../../../support/fragments/settings/organizations/settingsOrganizations'; -import TopMenu from '../../../support/fragments/topMenu'; +import SettingsMenu from '../../../support/fragments/settingsMenu'; +import Users from '../../../support/fragments/users/users'; +import getRandomPostfix from '../../../support/utils/stringTools'; describe('ui-invoices-settings: System Batch Group deletion', () => { - const firstBatchGroup = { ...NewBatchGroup.defaultUiBatchGroup }; + let user; + const firstBatchGroup = { + ...NewBatchGroup.defaultUiBatchGroup, + name: `first_autotest_group_${getRandomPostfix()}`, + }; const secondBatchGroup = { - name: `000autotest_group_${getRandomPostfix()}`, + name: `second_autotest_group_${getRandomPostfix()}`, description: 'Created by autotest', }; const invoice = { ...NewInvoice.defaultUiInvoice }; const organization = { ...NewOrganization.defaultUiOrganizations }; - let user; before(() => { cy.getAdminToken(); - BatchGroups.createBatchGroupViaApi(firstBatchGroup).then((response) => { - invoice.batchGroup = response.name; - }); - BatchGroups.createBatchGroupViaApi(secondBatchGroup); - Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { - organization.id = responseOrganizations; - invoice.accountingCode = organization.erpCode; - cy.loginAsAdmin({ - path: TopMenu.invoicesPath, - waiter: Invoices.waitLoading, + BatchGroups.createBatchGroupViaApi(firstBatchGroup).then((firstResponse) => { + invoice.batchGroup = firstResponse.name; + firstBatchGroup.id = firstResponse.id; + + Organizations.createOrganizationViaApi(organization).then((responseOrganizations) => { + organization.id = responseOrganizations; + invoice.accountingCode = organization.erpCode; + invoice.vendorId = organization.id; + + Invoices.createInvoiceViaApi(invoice).then((responseInvoice) => { + invoice.id = responseInvoice.id; + }); }); - Invoices.createDefaultInvoiceWithoutAddress(invoice); }); - cy.createTempUser([permissions.invoiceSettingsAll.gui]).then((userProperties) => { + BatchGroups.createBatchGroupViaApi(secondBatchGroup); + + cy.createTempUser([Permissions.invoiceSettingsAll.gui]).then((userProperties) => { user = userProperties; + cy.login(user.username, user.password, { path: SettingsMenu.invoiceBatchGroupsPath, waiter: SettingsOrganizations.waitLoadingOrganizationSettings, @@ -48,22 +52,14 @@ describe('ui-invoices-settings: System Batch Group deletion', () => { after(() => { cy.getAdminToken(); - cy.loginAsAdmin({ - path: TopMenu.invoicesPath, - waiter: Invoices.waitLoading, - }); - Invoices.searchByNumber(invoice.invoiceNumber); - Invoices.selectInvoice(invoice.invoiceNumber); - Invoices.deleteInvoiceViaActions(); - Invoices.confirmInvoiceDeletion(); - cy.visit(SettingsMenu.invoiceBatchGroupsPath); - SettingsInvoices.deleteBatchGroup(firstBatchGroup); + Invoices.deleteInvoiceViaApi(invoice.id); + BatchGroups.deleteBatchGroupViaApi(firstBatchGroup.id); Users.deleteViaApi(user.userId); }); it( - 'C367942: Delete Batch group (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + 'C367942 Delete Batch group (thunderjet)', + { tags: ['extendedPath', 'thunderjet', 'C367942'] }, () => { SettingsInvoices.waitBatchGroupsLoading(); SettingsInvoices.canNotDeleteBatchGroup(firstBatchGroup); diff --git a/cypress/e2e/settings/invoices/invoices.settings.checkSystemBatchGroup.cy.js b/cypress/e2e/settings/invoices/invoices.settings.checkSystemBatchGroup.cy.js index c61d3da771..bcda999eae 100644 --- a/cypress/e2e/settings/invoices/invoices.settings.checkSystemBatchGroup.cy.js +++ b/cypress/e2e/settings/invoices/invoices.settings.checkSystemBatchGroup.cy.js @@ -32,7 +32,7 @@ describe('ui-invoices-settings: System Batch Group deletion', () => { it( 'C10938 FOLIO Batch group is created by system and can only be edited (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C10938'] }, () => { systemBatchGroup.name = systemBatchGroupName; systemBatchGroup.description = systemBatchGroupDescription; diff --git a/cypress/e2e/settings/invoices/invoices.settings.createBatchGroup.cy.js b/cypress/e2e/settings/invoices/invoices.settings.createBatchGroup.cy.js index dc05fc249c..d5b0ef849e 100644 --- a/cypress/e2e/settings/invoices/invoices.settings.createBatchGroup.cy.js +++ b/cypress/e2e/settings/invoices/invoices.settings.createBatchGroup.cy.js @@ -17,7 +17,7 @@ describe('ui-invoices-settings: Batch Group creation', () => { it( 'C343345 Create and edit Batch groups (thunderjet)', - { tags: ['smoke', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['smoke', 'thunderjet', 'C343345'] }, () => { SettingsInvoices.waitBatchGroupsLoading(); SettingsInvoices.createNewBatchGroup(batchGroup); diff --git a/cypress/e2e/settings/orders/acquisition-method-create.cy.js b/cypress/e2e/settings/orders/acquisition-method-create.cy.js index c914c67858..d74e3a38d3 100644 --- a/cypress/e2e/settings/orders/acquisition-method-create.cy.js +++ b/cypress/e2e/settings/orders/acquisition-method-create.cy.js @@ -15,7 +15,7 @@ describe('Orders', () => { it( 'C347633 Create Acquisition method (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C347633'] }, () => { AcquisitionMethods.newAcquisitionMethod(); AcquisitionMethods.fillAcquisitionMethodName(acquisitionMethodName); diff --git a/cypress/e2e/settings/orders/adjust-instance.cy.js b/cypress/e2e/settings/orders/adjust-instance.cy.js index 570abd1600..e83bb2c516 100644 --- a/cypress/e2e/settings/orders/adjust-instance.cy.js +++ b/cypress/e2e/settings/orders/adjust-instance.cy.js @@ -130,7 +130,7 @@ describe('Orders', () => { it( 'C9219 Adjust Instance status, instance type and loan type defaults (items for receiving includes "Order closed" statuses) (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C9219'] }, () => { SettingsOrders.selectInstanceStatus(instanceStatus); SettingOrdersNavigationMenu.selectInstanceType(); diff --git a/cypress/e2e/settings/orders/change-PO-number.cy.js b/cypress/e2e/settings/orders/change-PO-number.cy.js index 8de42d3e93..90e0d76412 100644 --- a/cypress/e2e/settings/orders/change-PO-number.cy.js +++ b/cypress/e2e/settings/orders/change-PO-number.cy.js @@ -56,7 +56,7 @@ describe('Orders', () => { it( 'C670 Change the PO number setting from editable to non-editable, then create a couple POs to test it (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C670'] }, () => { Orders.createOrderWithPONumber(orderNumber, order, false).then((orderId) => { order.id = orderId; @@ -66,7 +66,7 @@ describe('Orders', () => { ); it( 'C15493 Allow users to edit PO number (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C15493'] }, () => { Orders.createOrderWithPONumber(orderNumber, order, false).then((orderId) => { order.id = orderId; diff --git a/cypress/e2e/settings/orders/change-the-POL-limit.cy.js b/cypress/e2e/settings/orders/change-the-POL-limit.cy.js index 2fc22425fc..bd5d77364d 100644 --- a/cypress/e2e/settings/orders/change-the-POL-limit.cy.js +++ b/cypress/e2e/settings/orders/change-the-POL-limit.cy.js @@ -87,7 +87,7 @@ describe('Orders', () => { it( 'C668 Change the purchase order lines limit, then create POs with PO Lines of (PO Line limit + 1), to see how the order app behaves (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C668'] }, () => { OrderLinesLimit.setPOLLimitViaApi(2); Orders.searchByParameter('PO number', orderNumber); diff --git a/cypress/e2e/settings/orders/closing-purchase-order-reasons.cy.js b/cypress/e2e/settings/orders/closing-purchase-order-reasons.cy.js index e98eb97c5a..faf1052fe4 100644 --- a/cypress/e2e/settings/orders/closing-purchase-order-reasons.cy.js +++ b/cypress/e2e/settings/orders/closing-purchase-order-reasons.cy.js @@ -29,7 +29,7 @@ describe('Settings (Orders) - Closing purchase order reasons', () => { it( 'C15854 Create, edit and delete closing purchase order reasons (thunderjet)', - { tags: ['extended', 'thunderjet', 'eurekaPhase1', 'C15854'] }, + { tags: ['extended', 'thunderjet', 'C15854'] }, () => { ClosingReasons.createClosingReason(closingReason); ClosingReasons.editClosingReason(closingReason, closingReasonEdited); diff --git a/cypress/e2e/settings/orders/create-order-template.cy.js b/cypress/e2e/settings/orders/create-order-template.cy.js index 6d3a2f25f5..34456bb2f2 100644 --- a/cypress/e2e/settings/orders/create-order-template.cy.js +++ b/cypress/e2e/settings/orders/create-order-template.cy.js @@ -47,7 +47,7 @@ describe('Orders', () => { it( 'C6725 Create order template (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C6725'] }, () => { OrderTemplate.clickNewOrderTemplateButton(); OrderTemplate.fillTemplateInformationWithAcquisitionMethod( diff --git a/cypress/e2e/settings/orders/edit-order-template.cy.js b/cypress/e2e/settings/orders/edit-order-template.cy.js index 8e56859d41..b6a6361560 100644 --- a/cypress/e2e/settings/orders/edit-order-template.cy.js +++ b/cypress/e2e/settings/orders/edit-order-template.cy.js @@ -63,7 +63,7 @@ describe('Orders', () => { it( 'C6726 Edit existing order template (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C6726'] }, () => { OrderTemplate.selectTemplate(orderTemplateName); OrderTemplate.editTemplate(`${orderTemplateName}-edited`); diff --git a/cypress/e2e/settings/orders/increase-pol-limit.cy.js b/cypress/e2e/settings/orders/increase-pol-limit.cy.js index 6af625e2d5..268a0ef5da 100644 --- a/cypress/e2e/settings/orders/increase-pol-limit.cy.js +++ b/cypress/e2e/settings/orders/increase-pol-limit.cy.js @@ -91,7 +91,7 @@ describe('Orders', () => { it( 'C15497 Increase purchase order lines limit (items for receiving includes "Order closed" statuses) (thunderjet)', - { tags: ['criticalPathBroken', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathBroken', 'thunderjet', 'C15497'] }, () => { SettingsOrders.setPurchaseOrderLinesLimit(5); SettingsOrders.setPurchaseOrderLinesLimit(2); diff --git a/cypress/e2e/settings/orders/order-template-categories.cy.js b/cypress/e2e/settings/orders/order-template-categories.cy.js index 03dc6cc745..879d7e19eb 100644 --- a/cypress/e2e/settings/orders/order-template-categories.cy.js +++ b/cypress/e2e/settings/orders/order-template-categories.cy.js @@ -46,7 +46,7 @@ describe('Settings (Orders) - Order template categories', () => { it( 'C736696 Create, edit and delete PO template category in Settings (thunderjet)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1', 'C736696'] }, + { tags: ['criticalPath', 'thunderjet', 'C736696'] }, () => { OrderTemplateCategories.startNewCategory(); OrderTemplateCategories.triggerEmptyValidation(); diff --git a/cypress/e2e/settings/orders/preffix-suffix-create.cy.js b/cypress/e2e/settings/orders/preffix-suffix-create.cy.js index 76145b3178..d9cf7c76c2 100644 --- a/cypress/e2e/settings/orders/preffix-suffix-create.cy.js +++ b/cypress/e2e/settings/orders/preffix-suffix-create.cy.js @@ -58,7 +58,7 @@ describe('Orders', () => { it( 'C671 Create prefix and suffix for purchase order (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C671'] }, () => { Orders.createOrderWithPONumberPreffixSuffix( poPrefix.name, diff --git a/cypress/e2e/settings/orders/select-acquisition-method-in-order-template.cy.js b/cypress/e2e/settings/orders/select-acquisition-method-in-order-template.cy.js index cd240fbb59..df0016c484 100644 --- a/cypress/e2e/settings/orders/select-acquisition-method-in-order-template.cy.js +++ b/cypress/e2e/settings/orders/select-acquisition-method-in-order-template.cy.js @@ -41,7 +41,7 @@ describe('Orders', () => { it( 'C350602 Select Acquisition Method in Order Template (thunderjet)', - { tags: ['criticalPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPathFlaky', 'thunderjet', 'C350602'] }, () => { OrderTemplate.clickNewOrderTemplateButton(); OrderTemplate.fillTemplateInformationWithAcquisitionMethod( diff --git a/cypress/e2e/settings/organizations/delete-organization-type.cy.js b/cypress/e2e/settings/organizations/delete-organization-type.cy.js index f3185aa76e..e0c415b224 100644 --- a/cypress/e2e/settings/organizations/delete-organization-type.cy.js +++ b/cypress/e2e/settings/organizations/delete-organization-type.cy.js @@ -3,34 +3,36 @@ import SettingsMenu from '../../../support/fragments/settingsMenu'; import Users from '../../../support/fragments/users/users'; import SettingsOrganizations from '../../../support/fragments/settings/organizations/settingsOrganizations'; -describe('Organizations: Settings (Organizations)', () => { - const type = { ...SettingsOrganizations.defaultTypes }; - let user; - before(() => { - cy.getAdminToken(); - SettingsOrganizations.createTypesViaApi(type); - cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( - (userProperties) => { - user = userProperties; - cy.login(user.username, user.password, { - path: SettingsMenu.organizationsPath, - waiter: SettingsOrganizations.waitLoadingOrganizationSettings, - }); +describe('Organizations', () => { + describe('Settings (Organizations)', () => { + const type = { ...SettingsOrganizations.defaultTypes }; + let user; + before(() => { + cy.getAdminToken(); + SettingsOrganizations.createTypesViaApi(type); + cy.createTempUser([permissions.uiSettingsOrganizationsCanViewAndEditSettings.gui]).then( + (userProperties) => { + user = userProperties; + cy.login(user.username, user.password, { + path: SettingsMenu.organizationsPath, + waiter: SettingsOrganizations.waitLoadingOrganizationSettings, + }); + }, + ); + }); + + after(() => { + cy.getAdminToken(); + Users.deleteViaApi(user.userId); + }); + + it( + 'C367990 Delete organization type (thunderjet)', + { tags: ['extendedPath', 'thunderjet', 'C367990'] }, + () => { + SettingsOrganizations.selectTypes(); + SettingsOrganizations.deleteType(type); }, ); }); - - after(() => { - cy.getAdminToken(); - Users.deleteViaApi(user.userId); - }); - - it( - 'C367990 Delete organization type (thunderjet)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - SettingsOrganizations.selectTypes(); - SettingsOrganizations.deleteType(type); - }, - ); }); diff --git a/cypress/e2e/settings/tenant/delete-address.cy.js b/cypress/e2e/settings/tenant/delete-address.cy.js index f248292947..fc0c404158 100644 --- a/cypress/e2e/settings/tenant/delete-address.cy.js +++ b/cypress/e2e/settings/tenant/delete-address.cy.js @@ -5,46 +5,48 @@ import SettingsMenu from '../../../support/fragments/settingsMenu'; import TenantPane, { TENANTS } from '../../../support/fragments/settings/tenant/tenantPane'; import { Addresses } from '../../../support/fragments/settings/tenant/general'; -describe('Settings', () => { - const testData = { - newAddress: { - name: `addressName_${getRandomPostfix()}`, - address: `address_${getRandomPostfix()}`, - }, - }; +describe('Tenant', () => { + describe('Settings', () => { + const testData = { + newAddress: { + name: `addressName_${getRandomPostfix()}`, + address: `address_${getRandomPostfix()}`, + }, + }; - before('Create test data', () => { - cy.createTempUser([Permissions.uiSettingsTenantAddresses.gui]).then((userProperties) => { - testData.user = userProperties; - Addresses.setAddress(testData.newAddress); - cy.login(testData.user.username, testData.user.password, { - path: SettingsMenu.tenantLocationsPath, - waiter: TenantPane.waitLoading, + before('Create test data', () => { + cy.createTempUser([Permissions.uiSettingsTenantAddresses.gui]).then((userProperties) => { + testData.user = userProperties; + Addresses.setAddress(testData.newAddress); + cy.login(testData.user.username, testData.user.password, { + path: SettingsMenu.tenantLocationsPath, + waiter: TenantPane.waitLoading, + }); }); }); - }); - after('Delete test data', () => { - cy.getAdminToken().then(() => { - Users.deleteViaApi(testData.user.userId); + after('Delete test data', () => { + cy.getAdminToken().then(() => { + Users.deleteViaApi(testData.user.userId); + }); }); - }); - it( - 'C374196 Delete Address (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, - () => { - TenantPane.selectTenant(TENANTS.ADDRESSES); - Addresses.waitLoading(); - Addresses.clickDeleteButtonForAddressValue(testData.newAddress.name); - Addresses.verifyDeleteModalDisplayed(); - Addresses.clickCancelButtonInDeleteModal(); - Addresses.verifyDeleteModalIsNotDisplayed(); - Addresses.clickDeleteButtonForAddressValue(testData.newAddress.name); - Addresses.clickDeleteButtonInDeleteModal(); - Addresses.verifyCalloutForAddressDeletionAppears(); - Addresses.verifyDeleteModalIsNotDisplayed(); - Addresses.addressRowWithValueIsAbsent(testData.newAddress.address); - }, - ); + it( + 'C374196 Delete Address (thunderjet) (TaaS)', + { tags: ['extendedPath', 'thunderjet', 'C374196'] }, + () => { + TenantPane.selectTenant(TENANTS.ADDRESSES); + Addresses.waitLoading(); + Addresses.clickDeleteButtonForAddressValue(testData.newAddress.name); + Addresses.verifyDeleteModalDisplayed(); + Addresses.clickCancelButtonInDeleteModal(); + Addresses.verifyDeleteModalIsNotDisplayed(); + Addresses.clickDeleteButtonForAddressValue(testData.newAddress.name); + Addresses.clickDeleteButtonInDeleteModal(); + Addresses.verifyCalloutForAddressDeletionAppears(); + Addresses.verifyDeleteModalIsNotDisplayed(); + Addresses.addressRowWithValueIsAbsent(testData.newAddress.address); + }, + ); + }); }); diff --git a/cypress/e2e/settings/tenant/delete-campus.cy.js b/cypress/e2e/settings/tenant/delete-campus.cy.js index 22e66c65f3..2a434bcf6b 100644 --- a/cypress/e2e/settings/tenant/delete-campus.cy.js +++ b/cypress/e2e/settings/tenant/delete-campus.cy.js @@ -73,7 +73,7 @@ describe('Settings: Tenant', () => { it( 'C374179 Delete Campus (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374179'] }, () => { TenantPane.goToTenantTab(); cy.intercept('/location-units/institutions*', { locinsts: testData.institutions }); diff --git a/cypress/e2e/settings/tenant/delete-institution.cy.js b/cypress/e2e/settings/tenant/delete-institution.cy.js index ee2f18e747..98869928b6 100644 --- a/cypress/e2e/settings/tenant/delete-institution.cy.js +++ b/cypress/e2e/settings/tenant/delete-institution.cy.js @@ -64,7 +64,7 @@ describe('Settings: Tenant', () => { it( 'C374185 Delete Institution (thunderjet) (TaaS)', - { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPath', 'thunderjet', 'C374185'] }, () => { // #1 Select "Institutions" option in "Location setup" section on "Tenant" pane cy.visit(SettingsMenu.tenantInstitutionsPath); diff --git a/cypress/e2e/settings/tenant/delete-library.cy.js b/cypress/e2e/settings/tenant/delete-library.cy.js index 6717437801..ad694eb3e9 100644 --- a/cypress/e2e/settings/tenant/delete-library.cy.js +++ b/cypress/e2e/settings/tenant/delete-library.cy.js @@ -101,7 +101,7 @@ describe('Settings: Tenant', () => { it( 'C374195 Delete Library (thunderjet) (TaaS)', - { tags: ['extendedPathFlaky', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['extendedPathFlaky', 'thunderjet', 'C374195'] }, () => { TenantPane.goToTenantTab(); cy.intercept('/location-units/institutions*', { locinsts: testData.institutions }); diff --git a/cypress/e2e/users/usertype-fields-displays-on-create-user-page.cy.js b/cypress/e2e/users/usertype-fields-displays-on-create-user-page.cy.js index cf6c155839..9b72b58398 100644 --- a/cypress/e2e/users/usertype-fields-displays-on-create-user-page.cy.js +++ b/cypress/e2e/users/usertype-fields-displays-on-create-user-page.cy.js @@ -72,7 +72,7 @@ describe('Users', () => { it( 'C410760 "User type" field is displayed on create user page (Poppy +) (Thunderjet) (TaaS)', - { tags: ['criticalPath', 'thunderjet', 'eurekaPhase1'] }, + { tags: ['criticalPath', 'thunderjet', 'C410760'] }, () => { usersSearchResultsPane.openNewUser(); UserEdit.verifySaveAndCloseIsDisabled(true); diff --git a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js index 23a98095bf..a2ba74ac90 100644 --- a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js +++ b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js @@ -28,7 +28,7 @@ const matchedAccordion = Accordion(previewOfRecordsMatchedFormName); const changesAccordion = Accordion(previewOfRecordsChangedFormName); const errorsAccordion = Accordion('Errors & warnings'); const showWarningsCheckbox = Checkbox({ labelText: 'Show warnings' }); -const recordIdentifierDropdown = Select('Record identifier'); +const recordIdentifierDropdown = Select('Record identifier*'); const recordTypesAccordion = Accordion({ label: 'Record types' }); const actions = Button('Actions'); const fileButton = Button('or choose file'); diff --git a/cypress/support/fragments/invoices/invoices.js b/cypress/support/fragments/invoices/invoices.js index ad0c045657..b95d3ad9b7 100644 --- a/cypress/support/fragments/invoices/invoices.js +++ b/cypress/support/fragments/invoices/invoices.js @@ -307,6 +307,7 @@ export default { }, createInvoiceLinePOLLookUWithSubTotal: (orderNumber, total) => { + cy.wait(2000); cy.do([ Accordion({ id: invoiceLinesAccordionId }).find(actionsButton).click(), newBlankLineButton.click(), diff --git a/cypress/support/fragments/invoices/settingsInvoices.js b/cypress/support/fragments/invoices/settingsInvoices.js index fdbd7e5da0..8730b52116 100644 --- a/cypress/support/fragments/invoices/settingsInvoices.js +++ b/cypress/support/fragments/invoices/settingsInvoices.js @@ -101,13 +101,14 @@ export default { }, canNotDeleteBatchGroup: (batchGroup) => { - cy.do([ + cy.do( MultiColumnListCell({ content: batchGroup.name }).perform((element) => { const rowNumber = element.parentElement.parentElement.getAttribute('data-row-index'); cy.do([getEditableListRow(rowNumber).find(trashIconButton).click(), deleteButton.click()]); }), - Modal('Cannot delete batch group').find(Button('Okay')).click(), - ]); + ); + cy.wait(1500); + cy.do(Modal('Cannot delete batch group').find(Button('Okay')).click()); }, checkNotDeletingGroup: (batchGroupName) => { diff --git a/cypress/support/fragments/organizations/organizations.js b/cypress/support/fragments/organizations/organizations.js index dfdf83571a..ad7aea74ed 100644 --- a/cypress/support/fragments/organizations/organizations.js +++ b/cypress/support/fragments/organizations/organizations.js @@ -1,7 +1,8 @@ -import { HTML } from '@interactors/html'; +import { HTML, including, or } from '@interactors/html'; import { Accordion, Button, + Card, Checkbox, KeyValue, Link, @@ -10,30 +11,26 @@ import { MultiColumnListCell, MultiColumnListRow, MultiSelect, + MultiSelectMenu, MultiSelectOption, Pane, + PaneContent, PaneHeader, + RepeatableField, SearchField, Section, Select, Selection, - SelectionOption, Spinner, TextArea, TextField, - including, - MultiSelectMenu, - or, - PaneContent, - Card, - RepeatableField, } from '../../../../interactors'; import { AppList } from '../../../../interactors/applist'; +import DateTools from '../../utils/dateTools'; import InteractorsTools from '../../utils/interactorsTools'; import getRandomPostfix from '../../utils/stringTools'; import SearchHelper from '../finance/financeHelper'; import OrganizationDetails from './organizationDetails'; -import DateTools from '../../utils/dateTools'; const buttonNew = Button('New'); const saveAndClose = Button('Save & close'); @@ -46,7 +43,6 @@ const organizationsList = MultiColumnList({ id: 'organizations-list' }); const blueColor = 'rgba(0, 0, 0, 0)'; const tagButton = Button({ icon: 'tag' }); const summarySection = Accordion({ id: summaryAccordionId }); -const searchInput = SearchField({ id: 'input-record-search' }); const vendorEDICodeEdited = `${getRandomPostfix()}`; const libraryEDICodeEdited = `${getRandomPostfix()}`; const serverAddress = 'ftp://ftp.ci.folio.org'; @@ -82,8 +78,16 @@ const openInterfaceSectionButton = Button({ id: 'accordion-toggle-button-interfacesSection', }); const interfaceSection = Section({ id: 'interfacesSection' }); -const addInterfaceButton = Button('Add interface'); const addInterfacesModal = Modal('Add interfaces'); +const listIntegrationConfigs = MultiColumnList({ + id: 'list-integration-configs', +}); +const donorCheckbox = Checkbox('Donor'); +const privilegedDonorInformationSection = Section({ id: 'privilegedDonorInformation' }); +const paymentMethodSection = Select('Payment method'); +const accountStatus = Select('Account status*'); +const tagsPane = Pane('Tags'); +const addInterfaceButton = Button('Add interface'); const saveButton = Button('Save'); const confirmButton = Button('Confirm'); const searchButtonInModal = Button({ type: 'submit' }); @@ -92,78 +96,26 @@ const categoryButton = Button('Categories'); const openintegrationDetailsSectionButton = Button({ id: 'accordion-toggle-button-integrationDetailsSection', }); -const listIntegrationConfigs = MultiColumnList({ - id: 'list-integration-configs', -}); -const donorCheckbox = Checkbox('Donor'); -const toggleButtonIsDonor = Button({ id: 'accordion-toggle-button-isDonor' }); -const donorSection = Section({ id: 'isDonor' }); const bankingInformationButton = Button('Banking information'); const bankingInformationAddButton = Button({ id: 'bankingInformation-add-button' }); -const privilegedDonorInformationSection = Section({ id: 'privilegedDonorInformation' }); -const toggleOrganizationStatus = Button({ id: 'accordion-toggle-button-status' }); -const toggleOrganizationTypes = Button({ - id: 'accordion-toggle-button-org-filter-organizationTypes', -}); -const toggleOrganizationTags = Button({ id: 'accordion-toggle-button-tags' }); -const toggleButtonIsVendor = Button({ id: 'accordion-toggle-button-isVendor' }); -const toggleButtonCountry = Button({ id: 'accordion-toggle-button-plugin-country-filter' }); -const toggleButtonLanguage = Button({ id: 'accordion-toggle-button-plugin-language-filter' }); -const toggleButtonPaymentMethod = Button({ id: 'accordion-toggle-button-paymentMethod' }); -const toggleButtonAcquisitionMethod = Button({ - id: 'accordion-toggle-button-org-filter-acqUnitIds', -}); -const toggleButtonCreatedBy = Button({ id: 'accordion-toggle-button-metadata.createdByUserId' }); -const toggleButtonDateCreated = Button({ id: 'accordion-toggle-button-metadata.createdDate' }); -const toggleButtonUpdatedBy = Button({ id: 'accordion-toggle-button-metadata.updatedByUserId' }); -const toggleButtonDateUpdated = Button({ id: 'accordion-toggle-button-metadata.updatedDate' }); -const updatedDateAccordion = Section({ id: 'metadata.updatedDate' }); -const startDateField = TextField({ name: 'startDate' }); -const endDateField = TextField({ name: 'endDate' }); -const applyButton = Button('Apply'); -const vendorInformationAccordion = Button({ - id: 'accordion-toggle-button-vendorInformationSection', -}); -const paymentMethodSection = Select('Payment method'); -const vendorTermsAccordion = Button({ id: 'accordion-toggle-button-agreementsSection' }); -const accountAccordion = Button({ id: 'accordion-toggle-button-accountsSection' }); -const accountStatus = Select('Account status*'); - -const tagsPane = Pane('Tags'); - const nextButton = Button('Next', { disabled: or(true, false) }); const previousButton = Button('Previous', { disabled: or(true, false) }); const contactStatusButton = Button({ id: 'accordion-toggle-button-inactive' }); - -const noResultsMessageLabel = '//span[contains(@class,"noResultsMessageLabel")]'; - const contactInformationSection = Button({ id: 'accordion-toggle-button-contactInformationSection', }); +const vendorTermsAccordion = Button({ id: 'accordion-toggle-button-agreementsSection' }); +const accountAccordion = Button({ id: 'accordion-toggle-button-accountsSection' }); +const vendorInformationAccordion = Button({ + id: 'accordion-toggle-button-vendorInformationSection', +}); +const noResultsMessageLabel = '//span[contains(@class,"noResultsMessageLabel")]'; export default { waitLoading: () => { cy.expect(Pane({ id: 'organizations-results-pane' }).exists()); }, - verifySearchAndFilterPane() { - cy.expect([ - toggleOrganizationStatus.exists(), - toggleOrganizationTypes.exists(), - toggleOrganizationTags.exists(), - toggleButtonIsDonor.exists(), - toggleButtonIsVendor.exists(), - toggleButtonCountry.exists(), - toggleButtonLanguage.exists(), - toggleButtonPaymentMethod.exists(), - toggleButtonAcquisitionMethod.exists(), - toggleButtonCreatedBy.exists(), - toggleButtonDateCreated.exists(), - toggleButtonUpdatedBy.exists(), - toggleButtonDateUpdated.exists(), - ]); - }, - verifyPagination(numberOfRows) { cy.expect([ previousButton.has({ disabled: or(true, false) }), @@ -259,7 +211,7 @@ export default { cy.get('@print').should('have.been.called'); }, - createOrganizationViaUi: (organization) => { + createOrganization(organization) { cy.expect(buttonNew.exists()); cy.do(buttonNew.click()); cy.wait(4000); @@ -509,62 +461,6 @@ export default { ]); }, - selectActiveStatus: () => { - cy.do(Checkbox('Active').click()); - }, - - selectPendingStatus: () => { - cy.wait(3000); - cy.do(Checkbox('Pending').click()); - }, - - selectInactiveStatus: () => { - cy.wait(3000); - cy.do(Checkbox('Inactive').click()); - }, - - selectIsDonorFilter: (isDonor) => { - if (isDonor === 'Yes') { - cy.wait(3000); - cy.do([ - toggleButtonIsDonor.click(), - donorSection.find(Checkbox('Yes')).click(), - toggleButtonIsDonor.click(), - ]); - } else if (isDonor === 'No') { - cy.wait(3000); - cy.do([ - toggleButtonIsDonor.click(), - donorSection.find(Checkbox('No')).click(), - toggleButtonIsDonor.click(), - ]); - } - }, - - selectCreatedByFiler: (createdBy) => { - cy.do([ - toggleButtonCreatedBy.click(), - Button('Find User').click(), - TextField({ name: 'query' }).fillIn(createdBy), - searchButtonInModal.click(), - MultiColumnListRow({ index: 0 }).click(), - ]); - }, - - selectUpdatedByFiler: (createdBy) => { - cy.do([ - toggleButtonUpdatedBy.click(), - Button('Find User').click(), - TextField({ name: 'query' }).fillIn(createdBy), - searchButtonInModal.click(), - MultiColumnListRow({ index: 0 }).click(), - ]); - }, - - checkOrganizationFilter: () => { - cy.expect(organizationsList.exists()); - }, - addNewCategory: (value) => { cy.do(categoryButton.click()); cy.expect(newButton.exists()); @@ -941,15 +837,6 @@ export default { cy.expect(summarySection.find(KeyValue({ value: organization.code })).exists()); }, - searchByParameters: (parameter, value) => { - cy.wait(4000); - cy.do([ - searchInput.selectIndex(parameter), - searchInput.fillIn(value), - Button('Search').click(), - ]); - }, - resetFilters: () => { cy.wait(3000); cy.do(resetButton.click()); @@ -970,19 +857,9 @@ export default { }, checkSearchResults: (organization) => { - cy.wait(4000); cy.expect(organizationsList.find(Link(organization.name)).exists()); }, - selectYesInIsVendor: () => { - cy.do([toggleButtonIsVendor.click(), Checkbox('Yes').click()]); - }, - - selectNoInIsVendor: () => { - cy.wait(3000); - cy.do([toggleButtonIsVendor.click(), Checkbox('No').click()]); - }, - selectVendor: () => { cy.do([Checkbox('Vendor').click()]); }, @@ -1018,31 +895,10 @@ export default { closeDetailsPane: () => { cy.do(PaneHeader({ id: 'paneHeaderpane-organization-details' }).find(timesButton).click()); }, + closeIntegrationDetailsPane: () => { cy.do(PaneHeader({ id: 'paneHeaderintegration-view' }).find(timesButton).click()); }, - selectCountryFilter: (country) => { - cy.wait(3000); - cy.do([ - toggleButtonCountry.click(), - Button({ id: 'addresses-selection' }).click(), - SelectionOption(country).click(), - ]); - }, - - selectLanguageFilter: () => { - cy.wait(3000); - cy.do([ - toggleButtonLanguage.click(), - Button({ id: 'language-selection' }).click(), - SelectionOption('English').click(), - ]); - }, - - selectCashInPaymentMethod: () => { - cy.wait(3000); - cy.do([toggleButtonPaymentMethod.click(), Checkbox('Cash').click()]); - }, deleteOrganizationViaApi: (organizationId) => cy.okapiRequest({ method: 'DELETE', @@ -1145,7 +1001,23 @@ export default { }) .then((resp) => resp.body.id), - getTagByLabel(label) { + deleteTagByIdViaApi(id) { + return cy.okapiRequest({ + method: 'DELETE', + path: `tags/${id}`, + isDefaultSearchParamsRequired: false, + }); + }, + + deletePrivilegedContactsViaApi(id) { + return cy.okapiRequest({ + method: 'DELETE', + path: `organizations-storage/privileged-contacts/${id}`, + failOnStatusCode: false, + }); + }, + + getTagByLabelViaApi(label) { const q = `label=="${label}"`; return cy .okapiRequest({ @@ -1157,7 +1029,7 @@ export default { .then((r) => r.body.tags?.[0] ?? null); }, - getPrivilegedContacts({ cql, limit = 10, offset = 0, totalRecords = 'auto' } = {}) { + getPrivilegedContactsViaApi({ cql, limit = 10, offset = 0, totalRecords = 'auto' } = {}) { return cy .okapiRequest({ method: 'GET', @@ -1170,23 +1042,7 @@ export default { getPrivilegedContactByName(firstName, lastName) { const q = `firstName == "${firstName}" and lastName == "${lastName}"`; - return this.getPrivilegedContacts({ cql: q, limit: 1 }).then((arr) => arr[0] ?? null); - }, - - deleteTagById(id) { - return cy.okapiRequest({ - method: 'DELETE', - path: `tags/${id}`, - isDefaultSearchParamsRequired: false, - }); - }, - - deletePrivilegedContactsViaApi(id) { - return cy.okapiRequest({ - method: 'DELETE', - path: `organizations-storage/privileged-contacts/${id}`, - failOnStatusCode: false, - }); + return this.getPrivilegedContactsViaApi({ cql: q, limit: 1 }).then((arr) => arr[0] ?? null); }, editOrganization: () => { @@ -1922,7 +1778,7 @@ export default { cy.expect(deleteButton.absent()); }, - varifySaveOrganizationCalloutMessage: (organization) => { + verifySaveCalloutMessage: (organization) => { InteractorsTools.checkCalloutMessage( `The Organization - "${organization.name}" has been successfully saved`, ); @@ -2034,15 +1890,6 @@ export default { }); }, - filterByDateUpdated(startDate, endDate) { - cy.do([ - toggleButtonDateUpdated.click(), - updatedDateAccordion.find(startDateField).fillIn(startDate), - updatedDateAccordion.find(endDateField).fillIn(endDate), - updatedDateAccordion.find(applyButton).click(), - ]); - }, - checkInvalidDateRangeMessage: (expected = 'Start date is greater than end date') => { cy.get('div[role="alert"] [data-test-wrong-dates-order="true"]') .should('be.visible') diff --git a/cypress/support/fragments/organizations/organizationsSearchAndFilter.js b/cypress/support/fragments/organizations/organizationsSearchAndFilter.js new file mode 100644 index 0000000000..2874bd3c23 --- /dev/null +++ b/cypress/support/fragments/organizations/organizationsSearchAndFilter.js @@ -0,0 +1,216 @@ +import { + Button, + Checkbox, + MultiColumnList, + MultiColumnListRow, + Pane, + SearchField, + Section, + SelectionOption, + TextField, +} from '../../../../interactors'; + +const organizationsList = MultiColumnList({ id: 'organizations-list' }); +const searchInput = SearchField({ id: 'input-record-search' }); +const resetButton = Button('Reset all'); +const searchButtonInModal = Button({ type: 'submit' }); +const toggleButtonIsDonor = Button({ id: 'accordion-toggle-button-isDonor' }); +const donorSection = Section({ id: 'isDonor' }); +const toggleOrganizationStatus = Button({ id: 'accordion-toggle-button-status' }); +const toggleOrganizationTypes = Button({ + id: 'accordion-toggle-button-org-filter-organizationTypes', +}); +const toggleOrganizationTags = Button({ id: 'accordion-toggle-button-tags' }); +const toggleButtonIsVendor = Button({ id: 'accordion-toggle-button-isVendor' }); +const toggleButtonCountry = Button({ id: 'accordion-toggle-button-plugin-country-filter' }); +const toggleButtonLanguage = Button({ id: 'accordion-toggle-button-plugin-language-filter' }); +const toggleButtonPaymentMethod = Button({ id: 'accordion-toggle-button-paymentMethod' }); +const toggleButtonAcquisitionMethod = Button({ + id: 'accordion-toggle-button-org-filter-acqUnitIds', +}); +const toggleButtonCreatedBy = Button({ id: 'accordion-toggle-button-metadata.createdByUserId' }); +const toggleButtonDateCreated = Button({ id: 'accordion-toggle-button-metadata.createdDate' }); +const toggleButtonUpdatedBy = Button({ id: 'accordion-toggle-button-metadata.updatedByUserId' }); +const toggleButtonDateUpdated = Button({ id: 'accordion-toggle-button-metadata.updatedDate' }); +const updatedDateAccordion = Section({ id: 'metadata.updatedDate' }); +const startDateField = TextField({ name: 'startDate' }); +const endDateField = TextField({ name: 'endDate' }); +const applyButton = Button('Apply'); + +export default { + waitLoading: () => { + cy.expect(Pane({ id: 'organizations-results-pane' }).exists()); + }, + + checkSearchAndFilterPaneExists: () => { + cy.expect(organizationsList.exists()); + }, + + searchByParameters: (parameter, value) => { + cy.wait(4000); + cy.do([ + searchInput.selectIndex(parameter), + searchInput.fillIn(value), + Button('Search').click(), + ]); + }, + + filterByIsDonor(isDonor) { + if (isDonor === 'Yes') { + cy.wait(3000); + cy.do([ + toggleButtonIsDonor.click(), + donorSection.find(Checkbox('Yes')).click(), + toggleButtonIsDonor.click(), + ]); + } else if (isDonor === 'No') { + cy.wait(3000); + cy.do([ + toggleButtonIsDonor.click(), + donorSection.find(Checkbox('No')).click(), + toggleButtonIsDonor.click(), + ]); + } + }, + + filterByIsVendor(isVendor) { + cy.wait(3000); + if (isVendor === 'Yes') { + cy.do([toggleButtonIsVendor.click(), Checkbox('Yes').click()]); + } else if (isVendor === 'No') { + cy.do([toggleButtonIsVendor.click(), Checkbox('No').click()]); + } + }, + + filterByOrganizationStatus: (status) => { + cy.wait(2000); + if (status === 'Active') { + cy.do(Checkbox('Active').click()); + } else if (status === 'Pending') { + cy.do(Checkbox('Pending').click()); + } else if (status === 'Inactive') { + cy.do(Checkbox('Inactive').click()); + } + }, + + verifySearchAndFilterPane() { + cy.expect([ + toggleOrganizationStatus.exists(), + toggleOrganizationTypes.exists(), + toggleOrganizationTags.exists(), + toggleButtonIsDonor.exists(), + toggleButtonIsVendor.exists(), + toggleButtonCountry.exists(), + toggleButtonLanguage.exists(), + toggleButtonPaymentMethod.exists(), + toggleButtonAcquisitionMethod.exists(), + toggleButtonCreatedBy.exists(), + toggleButtonDateCreated.exists(), + toggleButtonUpdatedBy.exists(), + toggleButtonDateUpdated.exists(), + ]); + }, + + openCreatedByAccordion() { + cy.wait(2000); + cy.then(() => { + toggleButtonCreatedBy.has({ ariaExpanded: 'false' }).then((isClosed) => { + if (isClosed) { + cy.do(toggleButtonCreatedBy.click()); + cy.wait(1000); + } + }); + }); + }, + + openUpdatedByAccordion() { + cy.wait(2000); + cy.then(() => { + toggleButtonUpdatedBy.has({ ariaExpanded: 'false' }).then((isClosed) => { + if (isClosed) { + cy.do(toggleButtonUpdatedBy.click()); + cy.wait(1000); + } + }); + }); + }, + + openDateUpdatedAccordion() { + cy.wait(2000); + cy.then(() => { + toggleButtonDateUpdated.has({ ariaExpanded: 'false' }).then((isClosed) => { + if (isClosed) { + cy.do(toggleButtonDateUpdated.click()); + cy.wait(1000); + } + }); + }); + }, + + resetFiltersIfActive: () => { + cy.get('[data-testid="reset-button"]') + .invoke('is', ':enabled') + .then((state) => { + if (state) { + cy.do(resetButton.click()); + cy.wait(500); + cy.expect(resetButton.is({ disabled: true })); + } + }); + }, + + filterByCreator(userName) { + this.openCreatedByAccordion(); + cy.do([ + Button('Find User').click(), + TextField({ name: 'query' }).fillIn(userName), + searchButtonInModal.click(), + ]); + cy.wait(2000); + cy.do(MultiColumnListRow({ index: 0 }).click()); + }, + + filterByUpdater(userName) { + this.openUpdatedByAccordion(); + cy.do([ + Button('Find User').click(), + TextField({ name: 'query' }).fillIn(userName), + searchButtonInModal.click(), + ]); + cy.wait(2000); + cy.do(MultiColumnListRow({ index: 0 }).click()); + }, + + filterByDateUpdated(startDate, endDate) { + this.openDateUpdatedAccordion(); + cy.do([ + updatedDateAccordion.find(startDateField).fillIn(startDate), + updatedDateAccordion.find(endDateField).fillIn(endDate), + updatedDateAccordion.find(applyButton).click(), + ]); + cy.wait(2000); + }, + + filterByCountry(country) { + cy.wait(3000); + cy.do([ + toggleButtonCountry.click(), + Button({ id: 'addresses-selection' }).click(), + SelectionOption(country).click(), + ]); + }, + + filterByLanguage(language) { + cy.wait(3000); + cy.do([ + toggleButtonLanguage.click(), + Button({ id: 'language-selection' }).click(), + SelectionOption(language).click(), + ]); + }, + + filterByPaymentMethod(paymentMethod) { + cy.wait(3000); + cy.do([toggleButtonPaymentMethod.click(), Checkbox(paymentMethod).click()]); + }, +}; diff --git a/cypress/support/fragments/settings/acquisitionUnits/acquisitionUnits.js b/cypress/support/fragments/settings/acquisitionUnits/acquisitionUnits.js index 3b375e5392..45a3cbd82e 100644 --- a/cypress/support/fragments/settings/acquisitionUnits/acquisitionUnits.js +++ b/cypress/support/fragments/settings/acquisitionUnits/acquisitionUnits.js @@ -172,6 +172,7 @@ export default { method: 'POST', path: 'acquisitions-units/units', body: acqUnit, + isDefaultSearchParamsRequired: false, }) .then(({ body }) => body); }, diff --git a/cypress/support/fragments/settings/invoices/batchGroups.js b/cypress/support/fragments/settings/invoices/batchGroups.js index 20e4891011..179dc9fd97 100644 --- a/cypress/support/fragments/settings/invoices/batchGroups.js +++ b/cypress/support/fragments/settings/invoices/batchGroups.js @@ -33,6 +33,8 @@ export default { return cy.okapiRequest({ method: 'DELETE', path: `batch-groups/${batchGroupId}`, + isDefaultSearchParamsRequired: false, + failOnStatusCode: false, }); }, }; diff --git a/cypress/support/utils/dateTools.js b/cypress/support/utils/dateTools.js index ceab697f0d..1993b887c7 100644 --- a/cypress/support/utils/dateTools.js +++ b/cypress/support/utils/dateTools.js @@ -392,7 +392,17 @@ export default { const today = new Date(); let hours = today.getUTCHours(); let minutes = today.getUTCMinutes() + 2; - const ampm = hours >= 12 ? 'P' : 'A'; + + // Handle minute overflow + if (minutes >= 60) { + hours += Math.floor(minutes / 60); + minutes %= 60; + } + + // Handle hour overflow - needed for correct AM/PM calculation + hours %= 24; + + const ampm = hours >= 12 ? 'PM' : 'AM'; hours %= 12; hours = hours || 12; minutes = minutes < 10 ? '0' + minutes : minutes; @@ -403,7 +413,17 @@ export default { const today = new Date(); let hours = today.getUTCHours(); let minutes = today.getUTCMinutes() + 3; - const ampm = hours >= 12 ? 'P' : 'A'; + + // Handle minute overflow + if (minutes >= 60) { + hours += Math.floor(minutes / 60); + minutes %= 60; + } + + // Handle hour overflow - needed for correct AM/PM calculation + hours %= 24; + + const ampm = hours >= 12 ? 'PM' : 'AM'; hours %= 12; hours = hours || 12; minutes = minutes < 10 ? '0' + minutes : minutes;