Fix Thunderjet Master Tests

cypress/e2e/invoices/approve-and-pay-invoice-in-current-FY-for-previous-FY.cy.js

@@ -13,6 +13,7 @@ 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 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';
@@ -80,21 +81,22 @@ describe('Invoices', () => {
           FinanceHelp.searchByName(defaultFund.name);
           Funds.selectFund(defaultFund.name);
           Funds.addBudget(allocatedQuantity);
+          Funds.closeBudgetDetails();
         });
         secondFiscalYear.code = firstFiscalYear.code.slice(0, -1) + '2';
         FiscalYears.createViaApi(secondFiscalYear).then((secondFiscalYearResponse) => {
           secondFiscalYear.id = secondFiscalYearResponse.id;
         });
 
-        cy.visit(TopMenu.ledgerPath);
+        FinanceHelp.selectLedgersNavigation();
         FinanceHelp.searchByName(defaultLedger.name);
         Ledgers.selectLedger(defaultLedger.name);
         Ledgers.rollover();
         Ledgers.fillInCommonRolloverInfo(secondFiscalYear.code, 'None', 'Allocation');
       });
     });
 
-    cy.visit(TopMenu.fiscalYearPath);
+    FinanceHelp.selectFiscalYearsNavigation();
     FinanceHelp.searchByName(firstFiscalYear.name);
     FiscalYears.selectFY(firstFiscalYear.name);
     FiscalYears.editFiscalYearDetails();
@@ -167,7 +169,7 @@ describe('Invoices', () => {
       Invoices.createInvoiceFromOrder(invoice, firstFiscalYear.code);
       Invoices.approveInvoice();
       Invoices.payInvoice();
-      cy.visit(TopMenu.fundPath);
+      TopMenuNavigation.navigateToApp('Finance');
       FinanceHelp.searchByName(defaultFund.name);
       Funds.selectFund(defaultFund.name);
       Funds.selectPreviousBudgetDetails();
@@ -177,12 +179,11 @@ describe('Invoices', () => {
         firstFiscalYear.code,
         '($10.00)',
         invoice.invoiceNumber,
-        'Encumbrance',
+        'Payment',
         `${defaultFund.name} (${defaultFund.code})`,
       );
-      cy.visit(TopMenu.fundPath);
-      FinanceHelp.searchByName(defaultFund.name);
-      Funds.selectFund(defaultFund.name);
+      Funds.closeTransactionApp(defaultFund, firstFiscalYear);
+      Funds.closeBudgetDetails();
       Funds.selectBudgetDetails();
       Funds.openTransactions();
       Funds.selectTransactionInList('Encumbrance');

cypress/e2e/invoices/invoice-duplicate-validation-on-approve-and-pay-option.cy.js

@@ -193,7 +193,7 @@ describe('Invoices', () => {
     'C440075: Check invoice duplicate validation on "Approve & pay" option (thunderjet)',
     { tags: ['criticalPath', 'thunderjet'] },
     () => {
-      Invoices.selectInvoice(testData.firstInvoice.vendorInvoiceNo);
+      Invoices.selectInvoiceByIndex(testData.firstInvoice.vendorInvoiceNo, 0);
       InvoiceView.clickApproveAndPayInvoice({ isApprovePayEnabled });
       ApproveInvoiceModal.verifyModalViewForDuplicateInvoice(
         { isApprovePayEnabled },
@@ -204,7 +204,7 @@ describe('Invoices', () => {
         invoiceInformation: [{ key: 'Status', value: INVOICE_STATUSES.PAID }],
       });
       cy.wait(2000);
-      Invoices.selectInvoice(testData.firstInvoice.vendorInvoiceNo);
+      Invoices.selectInvoiceByIndex(testData.firstInvoice.vendorInvoiceNo, 1);
       InvoiceView.checkInvoiceDetails({
         invoiceInformation: [{ key: 'Status', value: INVOICE_STATUSES.OPEN }],
       });

cypress/e2e/invoices/invoices-create-credit-invoice.cy.js

@@ -53,6 +53,7 @@ describe('Invoices', () => {
       Invoices.approveInvoice();
       // check transactions after approve
       TopMenuNavigation.openAppFromDropdown('Finance');
+      Helper.selectFundsNavigation();
       Helper.searchByName(fund.name);
       Funds.selectFund(fund.name);
       Funds.openBudgetDetails(fund.code, DateTools.getCurrentFiscalYearCode());
@@ -70,10 +71,6 @@ describe('Invoices', () => {
       Invoices.payInvoice();
       // check transactions after payment
       TopMenuNavigation.openAppFromDropdown('Finance');
-      Helper.searchByName(fund.name);
-      Funds.selectFund(fund.name);
-      Funds.openBudgetDetails(fund.code, DateTools.getCurrentFiscalYearCode());
-      Funds.openTransactions();
       Funds.checkTransaction(
         1,
         transactionFactory.create('credit', valueInTransactionTable, fund.code, '', 'Invoice', ''),

cypress/e2e/orders/editing-fund-and-increasing-cost-in-pol.cy.js

@@ -20,6 +20,7 @@ import MaterialTypes from '../../support/fragments/settings/inventory/materialTy
 import NewLocation from '../../support/fragments/settings/tenant/locations/newLocation';
 import ServicePoints from '../../support/fragments/settings/tenant/servicePoints/servicePoints';
 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';
 
@@ -183,19 +184,19 @@ describe('ui-orders: Orders', () => {
       OrderLines.editPOLInOrder();
       OrderLines.editFundInPOL(secondFund, '70', '100');
       OrderLines.checkFundInPOL(secondFund);
-      cy.visit(TopMenu.fundPath);
+      TopMenuNavigation.navigateToApp('Finance');
       FinanceHelp.searchByName(secondFund.name);
       Funds.selectFund(secondFund.name);
       Funds.selectBudgetDetails();
       Funds.viewTransactions();
       Funds.checkOrderInTransactionList(`${secondFund.code}`, '($20.00)');
-      cy.visit(TopMenu.invoicesPath);
+      TopMenuNavigation.navigateToApp('Invoices');
       Invoices.searchByNumber(firstInvoice.vendorInvoiceNo);
       Invoices.selectInvoice(firstInvoice.vendorInvoiceNo);
       Invoices.selectInvoiceLine();
       cy.reload();
       Invoices.checkFundInInvoiceLine(firstFund);
-      cy.visit(TopMenu.fundPath);
+      TopMenuNavigation.navigateToApp('Finance');
       FinanceHelp.searchByName(firstFund.name);
       Funds.selectFund(firstFund.name);
       Funds.selectBudgetDetails();

cypress/e2e/organizations/test-acquisition-unit-for-organizations.cy.js

@@ -57,33 +57,37 @@ describe('ui-organizations: Organizations', () => {
       // Need to wait,while data is load
       cy.wait(2000);
       AcquisitionUnits.assignUser(user.username);
-
+      cy.logout();
       cy.login(user.username, user.password, {
         path: TopMenu.organizationsPath,
         waiter: Organizations.waitLoading,
       });
       Organizations.createOrganizationWithAU(organization, defaultAcquisitionUnit.name);
       Organizations.checkOrganizationInfo(organization);
+      cy.logout();
 
       cy.loginAsAdmin({
         path: SettingsMenu.acquisitionUnitsPath,
         waiter: AcquisitionUnits.waitLoading,
       });
       AcquisitionUnits.unAssignUser(defaultAcquisitionUnit.name);
+      cy.logout();
 
       cy.login(user.username, user.password, {
         path: TopMenu.organizationsPath,
         waiter: Organizations.waitLoading,
       });
       Organizations.searchByParameters('Name', organization.name);
       Organizations.checkZeroSearchResultsHeader();
+      cy.logout();
 
       cy.loginAsAdmin({
         path: SettingsMenu.acquisitionUnitsPath,
         waiter: AcquisitionUnits.waitLoading,
       });
       AcquisitionUnits.edit(defaultAcquisitionUnit.name);
       AcquisitionUnits.selectViewCheckbox();
+      cy.logout();
 
       cy.login(user.username, user.password, {
         path: TopMenu.organizationsPath,

cypress/support/fragments/invoices/invoices.js

@@ -983,6 +983,16 @@ export default {
     cy.do(invoiceResultsPane.find(Link(invoiceNumber)).click());
   },
 
+  selectInvoiceByIndex: (invoiceNumber, indexNumber) => {
+    cy.wait(4000);
+    cy.do(
+      invoiceResultsPane
+        .find(MultiColumnListRow({ index: indexNumber }))
+        .find(Link(invoiceNumber))
+        .click(),
+    );
+  },
+
   checkVendorCodeInInvoicePane: (vendorCode) => {
     cy.wait(4000);
     cy.expect(Pane({ subtitle: vendorCode }).exists());

cypress/support/fragments/orders/orders.js

@@ -925,4 +925,9 @@ export default {
     cy.wait(4000);
     cy.expect(ordersResultsPane.find(MultiColumnListCell(POL)).exists());
   },
+
+  selectOrdersNavigation: () => {
+    cy.wait(4000);
+    cy.get('[data-test-orders-navigation="true"]').click();
+  },
 };

cypress/support/fragments/organizations/organizations.js

@@ -105,8 +105,9 @@ export default {
 
   createOrganizationViaUi: (organization) => {
     cy.expect(buttonNew.exists());
+    cy.do(buttonNew.click());
+    cy.wait(4000);
     cy.do([
-      buttonNew.click(),
       organizationStatus.choose(organization.status),
       organizationNameField.fillIn(organization.name),
       organizationCodeField.fillIn(organization.code),