Merge pull request #2058 from bcgov/dev

Dev

Author: JamesPasta

applications/Unity.AutoUI/cypress/e2e/ApplicationsActionBar.cy.ts

@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 
 import { loginIfNeeded } from "../support/auth";
-import { ApplicationsListPage } from "../pages/ApplicationDetailsPage";
+import { ApplicationsListPage } from "../pages/ApplicationsListPage";
 
 describe("Unity Login and check data from CHEFS", () => {
   const page = new ApplicationsListPage();
@@ -171,13 +171,12 @@ describe("Unity Login and check data from CHEFS", () => {
     page.switchToGrantProgram("Default Grants Program");
   });
 
-  it("Tests the existence and functionality of the Submitted Date From and Submitted Date To filters", () => {
-    // Set date filters using page object methods
+  it("Tests the existence and functionality of the Quick Date Range filter", () => {
+    // Select "All time" from quick date range dropdown and verify table refreshes
     page
-      .setSubmittedFromDate("2022-01-01")
+      .selectQuickDateRange("alltime")
       .waitForTableRefresh()
-      .setSubmittedToDate(page.getTodayIsoLocal())
-      .waitForTableRefresh();
+      .verifyQuickDateRangeValue("alltime");
   });
 
   // With no rows selected verify the visibility of Filter, Export, Save View, and Columns.
@@ -196,7 +195,7 @@ describe("Unity Login and check data from CHEFS", () => {
       .verifyTableHasData()
       .selectMultipleRows([0, 1])
       .verifyActionBarExists()
-      .clickPaymentButton()
+      .clickPaymentButtonWithWait()
       .waitForPaymentModalVisible()
       .closePaymentModal()
       .verifyPaymentModalClosed();

applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts

@@ -269,6 +269,24 @@ describe("Send an email", () => {
   });
 
   it("Open Emails tab", () => {
+    // Dismiss any swal2 modal that may be covering the tab
+    cy.get("body").then(($body) => {
+      if ($body.find(".swal2-container").length > 0) {
+        cy.get(".swal2-container").then(($swal) => {
+          if ($swal.find(".swal2-close").length > 0) {
+            cy.get(".swal2-close").click({ force: true });
+          } else if ($swal.find(".swal2-confirm").length > 0) {
+            cy.get(".swal2-confirm").click({ force: true });
+          } else {
+            cy.get("body").type("{esc}", { force: true });
+          }
+        });
+        cy.get(".swal2-container", { timeout: STANDARD_TIMEOUT }).should(
+          "not.exist",
+        );
+      }
+    });
+
     cy.get("#emails-tab", { timeout: STANDARD_TIMEOUT })
       .should("exist")
       .should("be.visible")

applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts

@@ -59,13 +59,12 @@ describe('Unity Login and check data from CHEFS', () => {
         // Ensure the search field exists
         cy.get('#search', { timeout: STANDARD_TIMEOUT }).should('exist')
 
-        // Conditionally widen Submitted Date range if the control exists
+        // Select "All time" from quick date range to widen the search
         cy.get('body', { timeout: STANDARD_TIMEOUT }).then(($body) => {
-            if ($body.find('input#submittedFromDate').length > 0) {
-                cy.get('input#submittedFromDate', { timeout: STANDARD_TIMEOUT })
-                    .should('exist')
-                    .clear()
-                    .type('2022-01-01')
+            if ($body.find('select#quickDateRange').length > 0) {
+                cy.get('select#quickDateRange', { timeout: STANDARD_TIMEOUT })
+                    .should('be.visible')
+                    .select('alltime')
             }
         })