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 5351b21696..adb445f371 100644 --- a/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js +++ b/cypress/e2e/orders/edit-fund-with-reviewed-invoice.cy.js @@ -17,7 +17,7 @@ import Users from '../../support/fragments/users/users'; import getRandomPostfix from '../../support/utils/stringTools'; describe('ui-orders: Orders', () => { - const defaultFiscalYear = { ...FiscalYears.defaultRolloverFiscalYear }; + const defaultFiscalYear = { ...FiscalYears.defaultUiFiscalYear }; const defaultLedger = { ...Ledgers.defaultUiLedger }; const firstFund = { ...Funds.defaultUiFund }; const secondFund = { 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 b90cfa8f83..76434c89a7 100644 --- a/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js +++ b/cypress/e2e/orders/verify-orders-numbers-is-hyperlink.cy.js @@ -73,7 +73,7 @@ describe('Orders', () => { 'C369087 - Orders| Results List | Verify that value in "PO number" and "POL number" columns are hyperlinks (thunderjet) (TaaS)', { tags: ['extendedPath', 'thunderjet', 'eurekaPhase1'] }, () => { - Orders.selectStatusInSearch(ORDER_STATUSES.PENDING); + Orders.selectPendingStatusFilter(); Orders.waitLoading(); [...Array(ordersCount).keys()].forEach((index) => { const title = testData.orders[index].poNumber; @@ -82,7 +82,7 @@ describe('Orders', () => { Orders.selectFromResultsList(title); OrderDetails.verifyOrderTitle(`Purchase order - ${title}`); }); - + Orders.resetFilters(); Orders.selectOrderLines(); OrderLines.verifyNoResultsMessage(); @@ -94,6 +94,7 @@ describe('Orders', () => { OrderLines.selectOrderline(title); OrderLines.verifyOrderTitlePOL(`PO Line details - ${title}`); }); + Orders.resetFilters(); }, ); }); diff --git a/cypress/support/fragments/orders/orderLines.js b/cypress/support/fragments/orders/orderLines.js index a9e1313806..ebf83b64ed 100644 --- a/cypress/support/fragments/orders/orderLines.js +++ b/cypress/support/fragments/orders/orderLines.js @@ -777,7 +777,6 @@ export default { addReveivingNoteToItemDetailsAndSave(orderNumber) { cy.do([TextArea('Receiving note').fillIn(note), saveAndCloseButton.click()]); - cy.wait(4000); submitOrderLine(); InteractorsTools.checkCalloutMessage( `The purchase order line ${orderNumber}-1 was successfully updated`, diff --git a/cypress/support/fragments/orders/orders.js b/cypress/support/fragments/orders/orders.js index 3d55adfb09..26b8a04dfc 100644 --- a/cypress/support/fragments/orders/orders.js +++ b/cypress/support/fragments/orders/orders.js @@ -739,6 +739,7 @@ export default { }, selectPendingStatusFilter: () => { + cy.wait(4000); cy.do(Checkbox({ id: 'clickable-filter-workflowStatus-pending' }).click()); },