Cypress tests replace cy.wait with cy.intercept or dynamic waits

cypress/e2e/assets_spec/AssetHomepage.cy.ts

@@ -101,7 +101,6 @@ describe("Asset Tab", () => {
 
   it("Export asset", () => {
     assetPage.selectassetimportbutton();
-    cy.wait(2000);
     assetPage.selectJsonExportButton();
     assetPage.selectassetimportbutton();
     assetPage.selectCsvExportButton();

cypress/e2e/facility_spec/FacilityCreation.cy.ts

@@ -201,7 +201,7 @@ describe("Facility Creation", () => {
     facilityPage.clickManageFacilityDropdown();
     facilityPage.clickDeleteFacilityOption();
     facilityPage.confirmDeleteFacility();
-    cy.verifyNotification("Facility deleted successfully");
+    cy.verifyNotification(`${facilityName} deleted successfully`);
   });
 
   it("Create a new facility with single bed and doctor capacity", () => {

cypress/e2e/facility_spec/FacilityHomepage.cy.ts

@@ -156,7 +156,6 @@ describe("Facility Homepage Function", () => {
     facilityNotify.verifyPostNotificationReq();
     cy.verifyNotification("Facility Notified");
     cy.closeNotification();
-    cy.wait(2000);
     // Verify the frontend error on empty message
     facilityHome.clickFacilityNotifyButton();
     facilityNotify.verifyFacilityName(facilityName);

cypress/e2e/facility_spec/FacilityInventory.cy.ts

@@ -25,15 +25,20 @@ describe("Inventory Management Section", () => {
 
   it("Add New Inventory | Modify data and delete last entry ", () => {
     // add a new item
+    cy.intercept("GET", "/api/v1/items/**").as("getItems");
     facilityPage.clickManageInventory();
+    cy.wait("@getItems").its("response.statusCode").should("eq", 200);
     facilityPage.fillInventoryDetails("PPE", "Add Stock", "10");
     facilityPage.clickAddInventory();
     facilityPage.verifySuccessNotification("Inventory created successfully");
+    cy.closeNotification();
     facilityPage.clickManageInventory();
     // modify the new item
     facilityPage.fillInventoryDetails("PPE", "Use Stock", "5");
     facilityPage.clickAddInventory();
-    facilityPage.verifySuccessNotification("Inventory created successfully");
+    facilityPage.verifySuccessNotification(
+      "Inventory use stock updated successfully",
+    );
     // verify the new modification
     facilityPage.verifyPpeQuantity("PPE");
     facilityPage.verifyPpeQuantity("5");
@@ -43,7 +48,6 @@ describe("Inventory Management Section", () => {
     // verify the last entry deletion
     facilityPage.verifyStockInRow("#row-0", "Added Stock");
     facilityPage.verifyStockInRow("#row-1", "Used Stock");
-    cy.wait(3000);
     facilityHome.navigateBack();
     facilityPage.verifyPpeQuantity("PPE");
   });
@@ -57,9 +61,12 @@ describe("Inventory Management Section", () => {
     cy.closeNotification();
     // Verify Backend minimum badge
     facilityPage.verifyBadgeWithText(".badge-danger", "Low Stock");
+    cy.intercept("GET", "**/api/v1/facility/*/min_quantity/**").as(
+      "getMinQuantity",
+    );
     // modify with manual minimum badge
     facilityPage.clickAddMinimumQuanitity();
-    cy.wait(3000);
+    cy.wait("@getMinQuantity").its("response.statusCode").should("eq", 200);
     cy.get("body").then(($body) => {
       if ($body.find("#update-minimum-quantity").is(":visible")) {
         // If the 'update-minimum-quantity' element is visible, click it

cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts

@@ -105,7 +105,6 @@ describe("Patient Consultation in multiple combination", () => {
     patientPrescription.enterDosage("3");
     patientPrescription.selectDosageFrequency("Twice daily");
     cy.clickSubmitButton("Submit");
-    cy.wait(2000);
     cy.verifyNotification("Medicine prescribed");
     patientPrescription.clickReturnToDashboard();
     // Verify the data's across the dashboard

cypress/e2e/patient_spec/PatientConsultationDischarge.cy.ts

@@ -76,10 +76,8 @@ describe("Patient Discharge based on multiple reason", () => {
     patientDischarge.clickClearButton();
     // select a non-registered facility and perform the discharge
     patientDischarge.typeReferringFacility(referringFreetextFacility);
-    cy.wait(2000);
     cy.clickSubmitButton("Confirm Discharge");
     cy.clickSubmitButton("Acknowledge & Submit");
-    cy.wait(2000);
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();
     // Verify the consultation dashboard reflection
@@ -106,12 +104,10 @@ describe("Patient Discharge based on multiple reason", () => {
     patientPrescription.selectDosageFrequency("Twice daily");
     cy.clickSubmitButton("Submit");
     cy.verifyNotification("Medicine prescribed");
-    cy.wait(2000);
     cy.closeNotification();
     // submit the discharge pop-up
     cy.clickSubmitButton("Confirm Discharge");
     cy.clickSubmitButton("Acknowledge & Submit");
-    cy.wait(2000);
     cy.verifyNotification("Patient Discharged Successfully");
     cy.closeNotification();
     // Verify the consultation dashboard reflection

cypress/e2e/patient_spec/PatientLogUpdate.cy.ts

@@ -113,7 +113,6 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.closeNotification();
     // Submit the doctors log update
     cy.clickSubmitButton("Save and Continue");
-    cy.wait(2000);
     cy.verifyNotification("Progress Note created successfully");
     cy.closeNotification();
     // modify the relevant critical care log update
@@ -252,7 +251,6 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     patientLogupdate.typeRhythm(patientRhythm);
     cy.get("#consciousness_level-option-RESPONDS_TO_PAIN").click();
     cy.clickSubmitButton("Save");
-    cy.wait(2000);
     cy.verifyNotification("Brief Update created successfully");
     // Verify the card content
     cy.get("#basic-information").scrollIntoView();

cypress/e2e/patient_spec/PatientPrescription.cy.ts

@@ -113,7 +113,6 @@ describe("Patient Medicine Administration", () => {
     cy.closeNotification();
     // Administer the medicine in edit form
     patientPrescription.clickAdministerButton();
-    cy.wait(2000);
     patientPrescription.enterAdministerDosage(medicineBaseDosage);
     patientPrescription.enterAdministerNotes(medicineAdministerNote);
     cy.clickSubmitButton("Administer Medicine");

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -116,7 +116,6 @@ describe("Patient Creation with consultation", () => {
     patientPage.verifyPatientIsCreated();
     // Verify the patient details
     patientPage.clickCancelButton();
-    cy.wait(3000);
     patientPage.savePatientUrl();
     patientPage.verifyPatientDashboardDetails(
       patientOneGender,
@@ -154,7 +153,6 @@ describe("Patient Creation with consultation", () => {
     patientPage.verifyStatusCode();
     patientPage.patientformvisibility();
     // change the gender to female and input data to related changed field
-    cy.wait(3000);
     patientPage.selectPatientGender(patientOneUpdatedGender);
     patientPage.typePatientDateOfBirth(patientDateOfBirth);
     patientPage.clickPatientAntenatalStatusYes();
@@ -195,11 +193,9 @@ describe("Patient Creation with consultation", () => {
       patientOneSecondInsurerName,
     );
     patientPage.clickUpdatePatient();
-    cy.wait(3000);
     patientPage.verifyPatientUpdated();
     patientPage.visitPatientUrl();
     // Verify Female Gender change reflection, No Medical History and Insurance Details
-    cy.wait(5000);
     patientPage.verifyPatientDashboardDetails(
       patientOneUpdatedGender,
       age,
@@ -216,9 +212,7 @@ describe("Patient Creation with consultation", () => {
     cy.get("[data-testid=patient-details]")
       .contains("member id")
       .scrollIntoView();
-    cy.wait(2000);
     patientInsurance.clickPatientInsuranceViewDetail();
-    cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(
       patientOneFirstSubscriberId,
       patientOneFirstPolicyId,

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -182,7 +182,6 @@ describe("User Creation", () => {
   it("create new user form throwing mandatory field error", () => {
     userCreationPage.clickElementById("addUserButton");
     userCreationPage.clickElementById("submit");
-    cy.wait(2000);
     userCreationPage.verifyErrorMessages(EXPECTED_ERROR_MESSAGES);
   });
 

cypress/e2e/users_spec/UsersManage.cy.ts

@@ -42,11 +42,9 @@ describe("Manage User", () => {
     manageUserPage.selectSkillFromDropdown(linkedskill);
     manageUserPage.clickAddSkillButton();
     manageUserPage.clickCloseSlideOver();
-    cy.wait(5000);
     manageUserPage.clicklinkedskillbutton();
     manageUserPage.assertSkillInAddedUserSkills(linkedskill);
     manageUserPage.clickCloseSlideOver();
-    cy.wait(5000);
     manageUserPage.navigateToProfile();
     userCreationPage.verifyElementContainsText(
       "username-profile-details",

cypress/pageobject/Facility/FacilityCreation.ts

@@ -284,8 +284,7 @@ class FacilityPage {
     cy.get("#facility-location-button").click();
     cy.wait("@mapApi").its("response.statusCode").should("eq", 200);
     cy.get("input#pac-input").type(location).type("{enter}");
-    cy.wait(2000);
-    cy.get("div#map-close").click();
+    cy.get("div#map-close").should("be.visible").click();
   }
 
   fillMiddleWareAddress(url: string) {
@@ -355,16 +354,14 @@ class FacilityPage {
   }
 
   fillInventoryDetails(name: string, status: string, quantity: string) {
-    cy.wait(2000);
-    cy.get("div#id").click();
-    cy.get("div#id ul li").contains(name).click();
     cy.get("div#isIncoming").click();
     cy.get("div#isIncoming ul li").contains(status).click();
+    cy.get("div#id").click();
+    cy.get("div#id ul li").contains(name).click();
     cy.get("[name='quantity']").type(quantity);
   }
 
   fillInventoryMinimumDetails(name: string, quantity: string) {
-    cy.wait(2000);
     cy.get("div#id").click();
     cy.get("div#id ul li").contains(name).click();
     cy.get("[name='quantity']").type(quantity);

cypress/pageobject/Patient/PatientConsultation.ts

@@ -1,6 +1,5 @@
 export class PatientConsultationPage {
   selectConsultationStatus(status: string) {
-    cy.wait(5000);
     cy.get("#route_to_facility").scrollIntoView();
     cy.get("#route_to_facility").should("be.visible");
     cy.clickAndSelectOption("#route_to_facility", status);
@@ -110,7 +109,6 @@ export class PatientConsultationPage {
       "#consultation-buttons",
       "Edit Consultation Details",
     );
-    cy.wait(3000);
   }
 
   interceptPatientDetailsAPI(): void {

cypress/pageobject/Patient/PatientCreation.ts

@@ -14,7 +14,6 @@ export class PatientPage {
     cy.get("#name").click().type(patientName);
     cy.intercept("GET", "**/api/v1/consultation/**").as("getPatient");
     cy.get("#patient-name-list").contains(patientName).click();
-    cy.wait(2000);
     cy.wait("@getPatient").its("response.statusCode").should("eq", 200);
     cy.get("#patient-name-consultation")
       .should("be.visible")

cypress/pageobject/Patient/PatientDoctorNotes.ts

@@ -5,7 +5,7 @@ export class PatientDoctorNotes {
   }
 
   addDiscussionNotes(notes: string) {
-    cy.wait(2000);
+    cy.wait(3000);
     cy.get("#discussion_notes_textarea").scrollIntoView();
     cy.get("#discussion_notes_textarea").click().type(notes);
   }

cypress/pageobject/Patient/PatientFileupload.ts

@@ -20,12 +20,8 @@ export class PatientFileUpload {
 
   recordAudio() {
     cy.get("#record-audio").click();
-    cy.wait(2000);
-    cy.get("#start-recording").click();
-    cy.wait(2000);
-    cy.get("#stop-recording").click();
-    cy.wait(1000);
-    cy.get("#save-recording").click();
+    cy.get("#stop-recording").should("be.enabled").click();
+    cy.get("#save-recording").should("be.enabled").click();
   }
 
   clickUploadAudioFile() {
@@ -35,8 +31,9 @@ export class PatientFileUpload {
   }
 
   verifyUploadFilePresence(fileName: string) {
-    cy.wait(2000);
-    cy.get("#file-div").scrollIntoView();
+    cy.get("#file-div", { timeout: 10000 })
+      .scrollIntoView()
+      .should("be.visible");
     cy.verifyContentPresence("#file-div", [fileName]);
   }
 

cypress/pageobject/Patient/PatientLogupdate.ts

@@ -2,7 +2,6 @@ class PatientLogupdate {
   clickLogupdate() {
     cy.get("#log-update").scrollIntoView();
     cy.verifyAndClickElement("#log-update", "Log Update");
-    cy.wait(2000);
   }
 
   clickSwitchBed() {
@@ -16,7 +15,6 @@ class PatientLogupdate {
   selectBed(bed: string) {
     cy.typeAndSelectOption("input[name='bed']", bed);
     cy.get("#update-switchbed").click();
-    cy.wait(2000);
   }
 
   selectPatientCategory(category: string) {
@@ -78,19 +76,16 @@ class PatientLogupdate {
     cy.get(element).scrollIntoView();
     cy.verifyContentPresence(element, [patientCategory]);
     cy.get(element).first().contains("View Details").click();
-    cy.wait(3000);
   }
 
   clickLogUpdateUpdateLog(element: string, patientCategory: string) {
     cy.get(element).scrollIntoView();
     cy.verifyContentPresence(element, [patientCategory]);
     cy.get(element).first().contains("Update Log").click();
-    cy.wait(3000);
   }
 
   clickUpdateDetail() {
     cy.verifyAndClickElement("#consultation-preview", "Update Details");
-    cy.wait(3000);
   }
 
   clearIntoElementById(elementId) {

cypress/pageobject/Patient/PatientPrescription.ts

@@ -61,8 +61,7 @@ export class PatientPrescription {
   }
 
   enterDiscontinueReason(reason: string) {
-    cy.wait(2000);
-    cy.get("#discontinuedReason").type(reason);
+    cy.get("#discontinuedReason").should("be.visible").type(reason);
   }
 
   enterAdministerDosage(dosage: string) {

cypress/pageobject/Patient/PatientTransfer.ts

@@ -19,13 +19,11 @@ class PatientTransfer {
 
   clickTransferSubmitButton() {
     cy.get("#submit-transferpatient").click();
-    cy.wait(2000);
   }
 
   clickConsultationCancelButton() {
     cy.get("#cancel").scrollIntoView();
     cy.get("#cancel").click();
-    cy.wait(2000);
   }
 
   clickAllowPatientTransferButton() {

cypress/pageobject/Users/ManageUserPage.ts

@@ -41,7 +41,7 @@ export class ManageUserPage {
   }
 
   clickCloseSlideOver() {
-    cy.get("#close-slide-over").click({ force: true });
+    cy.get("#close-slide-over").should("be.visible").click();
   }
 
   clickHomeFacilityIcon() {