From 8f5f6e4c74612bf77a6e8a3bd3b909103ee869c3 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Tue, 26 Sep 2023 14:31:00 +0200
Subject: [PATCH] fix: flaky custom program stage working list tests

---
 .../TeiWorkingLists/TeiWorkingListsUser.feature             | 2 +-
 .../TeiWorkingLists/TeiWorkingListsUser/index.js            | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
index fe69bbc858..d3f07adfe2 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser.feature
@@ -233,7 +233,7 @@ And the Custom Program stage list is deleted
 
 @v>=40
 Scenario: The user can save a program stage working list, based on a TEI working list configuration
-Given you open the main page with Ngelehun and Malaria focus investigation context
+Given you open a clean main page with Ngelehun and Malaria focus investigation context
 Then you see the custom TEI working lists
 And you can load the view with the name Ongoing foci responses
 And you open the program stage filters from the more filters dropdown menu
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
index 9e277a8ff0..974685a855 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -26,7 +26,6 @@ Given('you open the main page with Ngelehun and WHO RMNCH Tracker context', () =
 });
 
 Given('you open the main page with Ngelehun and Malaria focus investigation context', () => {
-    cleanUpIfApplicable();
     cy.visit('#/?programId=M3xtLkYBlKI&orgUnitId=DiszpKrYNg8');
 });
 
@@ -75,6 +74,11 @@ Given('you open the main page with Ngelehun and Malaria case diagnosis and House
         .click();
 });
 
+Given('you open a clean main page with Ngelehun and Malaria focus investigation context', () => {
+    cleanUpIfApplicable();
+    cy.visit('#/?programId=M3xtLkYBlKI&orgUnitId=DiszpKrYNg8');
+});
+
 Then('the default working list should be displayed', () => {
     const names = [
         'Filona',