fixing cypress tests

SwanandBhuskute · Nov 23, 2024 · a8950c3 · a8950c3
1 parent ed43c9c
commit a8950c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts b/cypress/e2e/patient_spec/PatientConsultationCreation.cy.ts
@@ -201,10 +201,8 @@ describe("Patient Consultation in multiple combination", () => {
     cy.clickSubmitButton("Create Consultation");
     cy.verifyNotification("Consultation created successfully");
     // verify the data and death report
-    patientConsultationPage.verifyTextInConsultation(
-      "#consultation-buttons",
-      "EXPIRED",
-    );
+    cy.get("#consultation-buttons").should("be.visible");
+    cy.contains("#consultation-buttons", "EXPIRED").should("exist");
     patientConsultationPage.clickPatientDetails();
     patientDeathReport.clickDeathReport();
     patientDeathReport.verifyDeathReportAutofill(

diff --git a/cypress/e2e/patient_spec/PatientRegistration.cy.ts b/cypress/e2e/patient_spec/PatientRegistration.cy.ts
@@ -83,6 +83,7 @@ describe("Patient Creation with consultation", () => {
     patientPage.createPatient();
     patientPage.selectFacility(patientFacility);
     patientPage.patientformvisibility();
+    cy.get("div:contains('Age')").scrollIntoView().should("be.visible").click();
     // Patient Details page
     patientPage.typePatientPhoneNumber(phone_number);
     patientPage.checkPhoneNumberIsEmergencyNumber();

diff --git a/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts b/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts
@@ -42,6 +42,8 @@ describe("Sample Test", () => {
     patientConsultationPage.verifyPatientDetailsResponse();
     // Visit SampleRequest Page
     sampleTestPage.visitSampleRequestPage();
+    // Wait for necessary APIs
+    cy.intercept("GET", "/api/sample-test-status").as("sampleTestStatus");
     // Fill Sample Test Request Form
     sampleTestPage.selectSampleType(sampleTestType);
     sampleTestPage.selectIcmrCategory(icmrCategory);
@@ -60,6 +62,12 @@ describe("Sample Test", () => {
     cy.clickSubmitButton("Confirm your request to send sample for testing");
     sampleTestPage.verifySampleTestReq();
     cy.verifyNotification("Sample test created successfully");
+    // Wait for status element to load
+    cy.wait("@sampleTestStatus");
+    cy.get("#sample-test-status", { timeout: 20000 })
+      .should("exist")
+      .and("contain.text", sampleTestStatus);
+
     // Check the updated request history
     sampleTestPage.checkRequestHistory(
       sampleTestStatus,

diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
@@ -553,9 +553,11 @@ export const startCase = (str: string): string => {
     .toLowerCase()
     .replace(/\s+/g, " ")
     .trim()
-    .split(" ")
-    .map((word) => (word ? word[0].toUpperCase() + word.slice(1) : ""))
-    .join(" ");
+    .split(/[\s.'-]+/)
+    .map((word) => {
+      return word ? word[0].toUpperCase() + word.slice(1) : "";
+    })
+    .join(" ");
 };
 
 // Converts a string to camelCase format, first word - lowercase and each subsequent word - uppercase letter, with no spaces.