Merge branch 'develop' into shift-details-tab-enhancement

cypress/e2e/facility_spec/FacilityHomepage.cy.ts

@@ -21,8 +21,6 @@ describe("Facility Homepage Function", () => {
   const patientPage = new PatientPage();
   const facilityLocation = new FacilityLocation();
   const facilitiesAlias = "downloadFacilitiesCSV";
-  const doctorsAlias = "downloadDoctorsCSV";
-  const triagesAlias = "downloadTriagesCSV";
   const facilityName = "Dummy Facility 40";
   const facilityLocaion = "Dummy Location";
   const stateName = "Kerala";
@@ -118,23 +116,7 @@ describe("Facility Homepage Function", () => {
     // Verify Facility Export
     facilityHome.csvDownloadIntercept(facilitiesAlias, "");
     facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Facilities");
     facilityHome.verifyDownload(facilitiesAlias);
-    // Verify Doctor Export
-    facilityHome.csvDownloadIntercept(doctorsAlias, "&doctors");
-    facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Doctors");
-    facilityHome.verifyDownload(doctorsAlias);
-    // Verify Triage Export
-    facilityHome.csvDownloadIntercept(triagesAlias, "&triage");
-    facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Triages");
-    facilityHome.verifyDownload(triagesAlias);
-  });
-
-  it("Verify Capacity Export Functionality", () => {
-    facilityHome.clickExportButton();
-    facilityHome.clickMenuItem("Capacities");
   });
 
   it("Verify Facility Detail page redirection to CNS and Live Minitoring  ", () => {

cypress/e2e/facility_spec/FacilityManage.cy.ts

@@ -21,12 +21,6 @@ describe("Facility Manage Functions", () => {
     /Health Facility config updated successfully|Health ID registration failed/;
   const facilityHfrId = "IN180000018";
   const facilityUpdatedHfrId = "IN180000020";
-  const doctorCapacity = "5";
-  const doctorModifiedCapacity = "7";
-  const totalCapacity = "100";
-  const currentOccupied = "80";
-  const totalUpdatedCapacity = "120";
-  const currentUpdatedOccupied = "100";
 
   before(() => {
     loginPage.loginByRole("districtAdmin");
@@ -116,64 +110,6 @@ describe("Facility Manage Functions", () => {
     facilityManage.verifyHfrIdValue(facilityUpdatedHfrId);
   });
 
-  it("Modify doctor capacity in Facility detail page", () => {
-    // Add a doctor capacity
-    facilityManage.clickFacilityAddDoctorTypeButton();
-    facilityPage.selectAreaOfSpecialization("Pulmonology");
-    facilityPage.fillDoctorCount(doctorCapacity);
-    facilityPage.saveAndExitDoctorForm();
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Staff count added successfully",
-    );
-    facilityManage.verifyTotalDoctorCapacity(doctorCapacity);
-    // edit a existing doctor
-    facilityManage.clickEditFacilityDoctorCapacity();
-    facilityPage.fillDoctorCount(doctorModifiedCapacity);
-    facilityPage.clickdoctorcapacityaddmore();
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Staff count updated successfully",
-    );
-    facilityManage.verifyTotalDoctorCapacity(doctorModifiedCapacity);
-    // delete a bed
-    facilityManage.clickDeleteFacilityDoctorCapacity();
-    facilityManage.clickButtonWithText("Delete");
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Staff specialization type deleted successfully",
-    );
-  });
-
-  it("Modify bed capacity in Facility detail page", () => {
-    // add multiple new bed capacity
-    facilityManage.clickFacilityAddBedTypeButton();
-    facilityPage.selectBedType("Isolation Bed");
-    facilityPage.fillTotalCapacity(totalCapacity);
-    facilityPage.fillCurrentlyOccupied(currentOccupied);
-    facilityPage.saveAndExitBedCapacityForm();
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed capacity added successfully",
-    );
-    cy.closeNotification();
-    facilityManage.verifyFacilityBedCapacity(totalCapacity);
-    facilityManage.verifyFacilityBedCapacity(currentOccupied);
-    // edit a existing bed
-    facilityManage.clickEditFacilityBedCapacity();
-    facilityPage.fillTotalCapacity(totalUpdatedCapacity);
-    facilityPage.fillCurrentlyOccupied(currentUpdatedOccupied);
-    facilityPage.clickbedcapcityaddmore();
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed capacity updated successfully",
-    );
-    cy.closeNotification();
-    facilityManage.verifyFacilityBedCapacity(totalUpdatedCapacity);
-    facilityManage.verifyFacilityBedCapacity(currentUpdatedOccupied);
-    // delete a bed
-    facilityManage.clickDeleteFacilityBedCapacity();
-    facilityManage.clickButtonWithText("Delete");
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      "Bed type deleted successfully",
-    );
-  });
-
   afterEach(() => {
     cy.saveLocalStorage();
   });

cypress/e2e/patient_spec/PatientHomepage.cy.ts

@@ -54,7 +54,6 @@ describe("Patient Homepage present functionalities", () => {
     patientHome.verifyPatientAdmittedBeforeDate(patientToDateBadge);
     patientHome.verifyPatientAdmittedAfterDate(patientFromDateBadge);
     cy.clearAllFilters();
-    patientHome.verifyTotalPatientCount("1");
   });
 
   it("Facility Geography based advance filters applied in the patient tab", () => {
@@ -71,7 +70,6 @@ describe("Patient Homepage present functionalities", () => {
     patientHome.verifyFacilityLsgBadgeContent(facilityLsgBody);
     patientHome.verifyFacilityDistrictContent(facilityDistrict);
     cy.clearAllFilters();
-    patientHome.verifyTotalPatientCount("1");
   });
 
   it("Patient diagnosis based advance filters applied in the patient tab", () => {
@@ -104,7 +102,6 @@ describe("Patient Homepage present functionalities", () => {
     patientHome.verifyDifferentialDiagnosisBadgeContent(patientIcdDiagnosis);
     // Clear the badges and verify the patient count along with badges
     cy.clearAllFilters();
-    patientHome.verifyTotalPatientCount("1");
     // Apply Any and confirmed diagonsis to verify patient count 17
     advanceFilters.clickAdvancedFiltersButton();
     patientHome.selectAnyIcdDiagnosis(patientIcdDiagnosis, patientIcdDiagnosis);
@@ -142,7 +139,6 @@ describe("Patient Homepage present functionalities", () => {
     patientHome.verifyMedicoBadgeContent("false");
     // Clear the badges and verify the patient count along with badges
     cy.clearAllFilters();
-    patientHome.verifyTotalPatientCount("1");
   });
 
   it("Export the live patient list based on a date range", () => {

cypress/e2e/resource_spec/ResourcesHomepage.cy.ts

@@ -20,14 +20,15 @@ describe("Resource Page", () => {
   beforeEach(() => {
     cy.restoreLocalStorage();
     cy.clearLocalStorage(/filters--.+/);
-    cy.awaitUrl("/resource");
   });
 
   it("Checks if all download button works", () => {
+    resourcePage.navigationToResourcePage();
     resourcePage.verifyDownloadButtonWorks();
   });
 
   it("Switch between active/completed", () => {
+    resourcePage.navigationToResourcePage();
     resourcePage.spyResourceApi();
     resourcePage.clickCompletedResources();
     resourcePage.verifyCompletedResources();
@@ -37,6 +38,7 @@ describe("Resource Page", () => {
   });
 
   it("Switch between list view and board view", () => {
+    resourcePage.navigationToResourcePage();
     resourcePage.clickListViewButton();
     resourcePage.clickBoardViewButton();
   });
@@ -68,7 +70,7 @@ describe("Resource Page", () => {
   });
 
   it("Update the status of resource", () => {
-    cy.visit(createdResource);
+    cy.awaitUrl(createdResource);
     resourcePage.clickUpdateStatus();
     resourcePage.updateStatus("APPROVED");
     resourcePage.clickSubmitButton();
@@ -78,7 +80,7 @@ describe("Resource Page", () => {
   });
 
   it("Post comment for a resource", () => {
-    cy.visit(createdResource);
+    cy.awaitUrl(createdResource);
     resourcePage.addCommentForResource("Test comment");
     resourcePage.clickPostCommentButton();
     resourcePage.verifySuccessNotification("Comment added successfully");