Skip to content

Commit

Permalink
Merge pull request #9273 from ohcnetwork/staging
Browse files Browse the repository at this point in the history
Production Release 24.49.0
  • Loading branch information
gigincg authored Dec 2, 2024
2 parents 61033e5 + e3584e0 commit dfd8289
Show file tree
Hide file tree
Showing 51 changed files with 2,510 additions and 1,840 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
11 changes: 6 additions & 5 deletions cypress/e2e/patient_spec/PatientRegistration.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ describe("Patient Creation with consultation", () => {
const patientDateOfBirth = "01012001";
const patientMenstruationStartDate = getRelativeDateString(-10);
const patientDateOfDelivery = getRelativeDateString(-20);
const patientOneName = "Patient With No Consultation";
const patientOneName = "Great Napolean 14";
const patientOneGender = "Male";
const patientOneUpdatedGender = "Female";
const patientOneAddress = "Test Patient Address";
const patientOneAddress = `149/J, 3rd Block,
Aluva
Ernakulam, Kerala - 682001`;
const patientOnePincode = "682001";
const patientOneState = "Kerala";
const patientOneDistrict = "Ernakulam";
Expand Down Expand Up @@ -130,6 +132,7 @@ describe("Patient Creation with consultation", () => {
"Middle Class",
"Family member",
);

patientMedicalHistory.verifyPatientMedicalDetails(
patientOnePresentHealth,
patientOneOngoingMedication,
Expand Down Expand Up @@ -214,11 +217,9 @@ describe("Patient Creation with consultation", () => {
patientMedicalHistory.verifyNoSymptosPresent("Diabetes");
// verify insurance details and dedicatd page
cy.get("[data-testid=patient-details]")
.contains("member id")
.contains("Member ID")
.scrollIntoView();
cy.wait(2000);
patientInsurance.clickPatientInsuranceViewDetail();
cy.wait(3000);
patientInsurance.verifyPatientPolicyDetails(
patientOneFirstSubscriberId,
patientOneFirstPolicyId,
Expand Down
3 changes: 2 additions & 1 deletion cypress/pageobject/Patient/PatientConsultation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,10 @@ export class PatientConsultationPage {
}

clickViewConsultationButton() {
cy.get("a").contains("Encounters").click();
cy.verifyAndClickElement(
"#view_consultation_and_log_updates",
"View Consultation / Log Updates",
"View Updates",
);
}

Expand Down
4 changes: 2 additions & 2 deletions cypress/pageobject/Patient/PatientCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export class PatientPage {
expect($dashboard).to.contain(patientName);
expect($dashboard).to.contain(phoneNumber);
expect($dashboard).to.contain(emergencyPhoneNumber);
expect($dashboard).to.contain(yearOfBirth);
//expect($dashboard).to.contain(yearOfBirth); //Commented out because new proposed UI does not have DOB. Can change later.
expect($dashboard).to.contain(bloodGroup);
expect($dashboard).to.contain(occupation);
socioeconomicStatus && expect($dashboard).to.contain(socioeconomicStatus);
Expand Down Expand Up @@ -221,7 +221,7 @@ export class PatientPage {
}

clickPatientUpdateDetails() {
cy.verifyAndClickElement("#update-patient-details", "Update Details");
cy.verifyAndClickElement("#update-patient-details", "Edit Profile");
}

interceptFacilities() {
Expand Down
4 changes: 3 additions & 1 deletion cypress/pageobject/Patient/PatientMedicalHistory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ class PatientMedicalHistory {
patientSymptoms6: string,
patientSymptoms7: string,
) {
cy.get("[data-testid=patient-details]").then(($dashboard) => {
cy.get("a").contains("Health Profile").click();
cy.wait(2000);
cy.get("[data-test-id=patient-health-profile]").then(($dashboard) => {
cy.url().should("include", "/facility/");
expect($dashboard).to.contain(patientPresentHealth);
expect($dashboard).to.contain(patientOngoingMedication);
Expand Down
4 changes: 3 additions & 1 deletion cypress/pageobject/Patient/PatientPredefined.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ class PatientPredefined {
patientPage.typePatientDateOfBirth("01012001");
patientPage.typePatientName("Patient With Predefined Data");
patientPage.selectPatientGender("Male");
patientPage.typePatientAddress("Test Patient Address");
patientPage.typePatientAddress(
"149/J, 3rd Block, Aluva, Ernakulam - 682001",
);
facilityPage.fillPincode("682001");
facilityPage.selectStateOnPincode("Kerala");
facilityPage.selectDistrictOnPincode("Ernakulam");
Expand Down
2 changes: 2 additions & 0 deletions cypress/pageobject/Sample/SampleTestCreate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export class SampleTestPage {
visitSampleRequestPage(): void {
cy.get("a").contains("Service Request").click();
cy.verifyAndClickElement("#sample-request-btn", "Request Sample Test");
cy.url().should("include", "/sample-test");
}
Expand Down Expand Up @@ -60,6 +61,7 @@ export class SampleTestPage {
fastTrack: string,
sampleTestResult: string,
): void {
cy.get("a").contains("Service Request").click();
cy.verifyContentPresence("#sample-test-status", [sampleTestStatus]);
cy.verifyContentPresence("#sample-test-type", [sampleTestType]);
cy.verifyContentPresence("#sample-test-fast-track", [fastTrack]);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dfd8289

Please sign in to comment.