From dcde9915a526d45e3b6d7a4f81df16c0bb9c5184 Mon Sep 17 00:00:00 2001
From: arsforza <asforza@redcross.nl>
Date: Fri, 27 Jan 2023 15:20:48 +0100
Subject: [PATCH] fix: update tests + enable typhoon test AB#17590

---
 .../disaster-type/disaster-type.component.html  |  1 +
 .../backup_old_tests/logout-button.spec.js      |  3 ++-
 .../backup_old_tests/master-test.spec.js        |  2 +-
 tests/cypress/support/commands.js               | 17 +++++++++++------
 tests/cypress/support/test-functions.js         |  5 +----
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/interfaces/IBF-dashboard/src/app/components/disaster-type/disaster-type.component.html b/interfaces/IBF-dashboard/src/app/components/disaster-type/disaster-type.component.html
index 23219cda02..5781379f40 100644
--- a/interfaces/IBF-dashboard/src/app/components/disaster-type/disaster-type.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/disaster-type/disaster-type.component.html
@@ -6,6 +6,7 @@
     <ion-icon
       (click)="switchDisasterType(disasterType)"
       class="disaster-type-button"
+      [ngClass]="disasterType?.activeTrigger ? 'triggered' : ''"
       data-test="disaster-type-button"
       [src]="
         getButtonSvg(disasterType.disasterType, disasterType.activeTrigger)
diff --git a/tests/cypress/support/backup_old_tests/logout-button.spec.js b/tests/cypress/support/backup_old_tests/logout-button.spec.js
index 98222e65cf..9337ea1363 100644
--- a/tests/cypress/support/backup_old_tests/logout-button.spec.js
+++ b/tests/cypress/support/backup_old_tests/logout-button.spec.js
@@ -8,10 +8,11 @@ describe('Logout Button', () => {
   });
 
   it('loads', () => {
-    cy.get(selectors.logOut).should('be.visible').should('not.be.disabled');
+    cy.waitForLogoutButton();
   });
 
   it('logs out', () => {
+    cy.waitForLogoutButton();
     cy.get(selectors.logOut).click();
     cy.url().should((url) => {
       expect(url).to.match(
diff --git a/tests/cypress/support/backup_old_tests/master-test.spec.js b/tests/cypress/support/backup_old_tests/master-test.spec.js
index 630c5acf70..2e9006dd7d 100644
--- a/tests/cypress/support/backup_old_tests/master-test.spec.js
+++ b/tests/cypress/support/backup_old_tests/master-test.spec.js
@@ -42,7 +42,7 @@ const testCountry = ({ iso3Code, email }) => {
           timelineTest(i, iso3Code);
         }
       });
-
+      cy.waitForLogoutButton();
       cy.get(selectors.logOut).click();
     });
   });
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index cf02437a78..316174efe5 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -2,10 +2,16 @@ import constants from './constants';
 import selectors from './selectors';
 import 'cypress-wait-until';
 
-Cypress.Commands.add('waitForRequests', () => {
-  cy.intercept({ method: 'GET', url: '**' }).as('getHttp');
-  cy.wait('@getHttp', { timeout: 10000 });
-});
+Cypress.Commands.add('waitForRequests', () =>
+  cy.get(selectors.loader, { timeout: 20000 }).should('not.exist'),
+);
+
+Cypress.Commands.add('waitForLogoutButton', () =>
+  cy
+    .get(selectors.logOut, { timeout: 10000 })
+    .should('be.visible')
+    .should('not.be.disabled'),
+);
 
 // Contains a list of custom Commands
 Cypress.Commands.add('login', (countryEmail) => {
@@ -25,8 +31,7 @@ Cypress.Commands.add('login', (countryEmail) => {
     });
 
   cy.visit(constants.dashboardPagePath);
-  cy.waitForRequests();
-  cy.waitUntil(() => Cypress.$(selectors.loader).length === 0); // https://github.com/NoriSte/cypress-wait-until/issues/75#issuecomment-572685623
+  cy.waitForRequests(); // https://github.com/NoriSte/cypress-wait-until/issues/75#issuecomment-572685623
 });
 /* close all popup windows */
 Cypress.Commands.add('closeAllTabs', () => {
diff --git a/tests/cypress/support/test-functions.js b/tests/cypress/support/test-functions.js
index 3b911eea1f..fab24fa103 100644
--- a/tests/cypress/support/test-functions.js
+++ b/tests/cypress/support/test-functions.js
@@ -5,9 +5,6 @@ Cypress.Commands.add('timelineTest', (countryName) => {
 
   cy.get(selectors.disasterType.disasterTypeButtons).then((buttons) => {
     for (let index = 0; index < buttons.length; index++) {
-      if (countryName === 'PHILIPPINES' && index === 2) {
-        return;
-      }
       if (index > 0) {
         cy.get(selectors.disasterType.disasterTypeButtons).eq(index).click();
       }
@@ -32,6 +29,6 @@ Cypress.Commands.add('timelineTest', (countryName) => {
       );
     }
   });
-
+  cy.waitForLogoutButton();
   cy.get(selectors.logOut).click();
 });