Add waitForAlerts command to ensure alert loading is complete before …

…proceeding for alert related tests

Signed-off-by: Gavin Reynolds <[email protected]>

cypress/e2e/Incidents/incidents.spec.js

@@ -25,6 +25,7 @@ import {
   manageIncidentTableColumns,
   priorityNames,
   selectAlert,
+  waitForAlerts,
 } from '../../support/util/common';
 
 describe('Manage Open Incidents', { failFast: { enabled: true } }, () => {
@@ -278,6 +279,7 @@ describe('Manage Alerts', { failFast: { enabled: true } }, () => {
       addColumns.map((column) => column[1]),
     );
     waitForIncidentTable();
+    waitForAlerts();
   });
 
   afterEach(() => {

cypress/support/util/common.js

@@ -21,10 +21,17 @@ export const waitForIncidentTable = () => {
   // eslint-disable-next-line cypress/no-unnecessary-waiting
   cy.wait(3000); // Required for query debounce
   cy.get('#incident-table-ctr', { timeout: 60000 }).should('be.visible');
+  cy.get('.selected-incidents-ctr', { timeout: 60000 }).should('not.include.text', 'Querying');
   // will move on to next command even if table is not scrollable
   cy.get('.incident-table-fixed-list').scrollTo('top', { ensureScrollable: false });
 };
 
+export const waitForAlerts = () => {
+  // eslint-disable-next-line cypress/no-unnecessary-waiting
+  cy.wait(3000); // Required for query debounce
+  cy.get('.selected-incidents-ctr', { timeout: 60000 }).should('not.include.text', 'Fetching Alerts');
+};
+
 export const selectIncident = (incidentIdx = 0, shiftKey = false) => {
   const selector = `[data-incident-row-idx="${incidentIdx}"]`;
   cy.get(selector).invoke('attr', 'data-incident-id').as(`selectedIncidentId_${incidentIdx}`);