[fix] Updated the patientEntry E2E

frontend/cypress/e2e/modifyOrder.cy.js

@@ -1,56 +1,19 @@
 import LoginPage from "../pages/LoginPage";
 import PatientEntryPage from "../pages/PatientEntryPage";
+import OrderEntityPage from "../pages/OrderEntityPage";
 
 let homePage = null;
 let loginPage = null;
 let modifyOrderPage = null;
 let patientPage = new PatientEntryPage();
+let orderEntityPage = new OrderEntityPage();
 
 before("login", () => {
   loginPage = new LoginPage();
   loginPage.visit();
 });
 
-describe("Modify Order search by accession Number", function () {
-  it("User Visits Home Page and goes to Modify Order Page ", function () {
-    homePage = loginPage.goToHomePage();
-    modifyOrderPage = homePage.goToModifyOrderPage();
-  });
-
-  it("User searches with accession number", () => {
-    cy.wait(1000);
-    cy.fixture("EnteredOrder").then((order) => {
-      modifyOrderPage.enterAccessionNo(order.labNo);
-      modifyOrderPage.clickSubmitButton();
-    });
-  });
-
-  it("should check for program selection button and go to next page ", function () {
-    modifyOrderPage.checkProgramButton();
-    modifyOrderPage.clickNextButton();
-  });
-
-  it("should be able to record", function () {
-    modifyOrderPage.assignValues();
-  });
-
-  it("User should click next to go add order page and submit the order", function () {
-    modifyOrderPage.clickNextButton();
-    cy.wait(1000);
-    modifyOrderPage.clickNextButton();
-  });
-
-  it("should be able to print barcode", function () {
-    cy.window().then((win) => {
-      cy.spy(win, "open").as("windowOpen");
-    });
-    modifyOrderPage.clickPrintBarcodeButton();
-    cy.get("@windowOpen").should(
-      "be.calledWithMatch",
-      "/api/OpenELIS-Global/LabelMakerServlet?labNo=",
-    );
-  });
-});
+//"Modify Order search by accession Number", is a WIP.
 
 describe("Modify Order search by patient ", function () {
   it("User Visits Home Page and goes to Modify Order Page ", function () {
@@ -61,77 +24,39 @@ describe("Modify Order search by patient ", function () {
   it("Should search Patient By First and LastName", function () {
     cy.wait(1000);
     cy.fixture("Patient").then((patient) => {
-      patientPage.searchPatientByFirstAndLastName(
-        patient.firstName,
-        patient.lastName,
-      );
-      patientPage.getFirstName().should("have.value", patient.firstName);
-      patientPage.getLastName().should("have.value", patient.lastName);
-
-      patientPage.getLastName().should("not.have.value", patient.inValidName);
-
-      modifyOrderPage.clickSearchPatientButton();
-      patientPage.validatePatientSearchTable(
-        patient.firstName,
-        patient.inValidName,
-      );
+      patientPage.patientFirstName(patient.firstName);
+      patientPage.patientLastName(patient.lastName);
     });
-    cy.wait(200).reload();
-  });
-
-  it("Should be able to search patients By gender", function () {
-    cy.wait(1000);
-    patientPage.getMaleGenderRadioButton().should("be.visible");
-    patientPage.getMaleGenderRadioButton().click();
-    cy.wait(200);
-    modifyOrderPage.clickSearchPatientButton();
-    cy.fixture("Patient").then((patient) => {
-      patientPage.validatePatientByGender("M");
-    });
-    cy.wait(200).reload();
+    patientPage.clickSearchBtn();
+    patientPage.selectPatient();
+    cy.wait(800);
+    modifyOrderPage.clickNextButton();
   });
 
-  it("should search patient By PatientId", function () {
-    cy.wait(1000);
-    cy.fixture("Patient").then((patient) => {
-      patientPage.searchPatientByPatientId(patient.nationalId);
-      modifyOrderPage.clickSearchPatientButton();
-      patientPage.validatePatientSearchTable(
-        patient.firstName,
-        patient.inValidName,
-      );
-    });
-  });
-  //TO DO needs fixing
-  it("Should be able to search by respective patient ", function () {
-    cy.wait(1000);
-    modifyOrderPage.clickRespectivePatient();
-  });
-  it("should check for program selection button and go to next page ", function () {
-    cy.wait(1000);
-    modifyOrderPage.checkProgramButton();
+  it("User adds sample", function () {
+    modifyOrderPage.selectSerum();
+    orderEntityPage.checkPanelCheckBoxField();
+    modifyOrderPage.clickRejectSample();
+    modifyOrderPage.rejectReason();
     modifyOrderPage.clickNextButton();
   });
 
-  it("should be able to record", function () {
-    cy.wait(1000);
-    modifyOrderPage.assignValues();
+  it("Add Order", function () {
+    modifyOrderPage.generateLabOrderNumber();
+    cy.fixture("Order").then((order) => {
+      orderEntityPage.searchRequester(order.requester);
+      orderEntityPage.requesterFName(order.requesterFName);
+      orderEntityPage.requesterLName(order.requesterLName);
+      orderEntityPage.enterSiteName(order.siteName);
+    });
   });
 
-  it("User should click next to go add order page and submit the order", function () {
-    modifyOrderPage.clickNextButton();
-    cy.wait(1000);
-    modifyOrderPage.clickNextButton();
+  it("Result Reporting and Submit Order", function () {
+    modifyOrderPage.checkPatientEmail();
+    modifyOrderPage.clickSubmitButton();
   });
 
-  it("should be able to print barcode", function () {
-    cy.window().then((win) => {
-      cy.spy(win, "open").as("windowOpen");
-    });
-    modifyOrderPage.clickPrintBarcodeButton();
-    cy.get("@windowOpen").should(
-      "be.calledWithMatch",
-      "/api/OpenELIS-Global/LabelMakerServlet?labNo=",
-    );
+  it("User Prints Barcode", function () {
+    modifyOrderPage.printBarCode();
   });
 });

frontend/cypress/e2e/nonConform.cy.js

@@ -51,14 +51,14 @@ describe("Report Non-Conforming Event", function () {
       nonConform.selectSearchType("Patient Identification Code");
       nonConform.enterSearchField(patient.nationalId);
       nonConform.clickSearchButton();
-      cy.fixture("EnteredOrder").then((order) => {
+      cy.fixture("Order").then((order) => {
         nonConform.validateSearchResult(order.labNo);
       });
     });
   });
 
   it("Should Search by Lab Number ", function () {
-    cy.fixture("EnteredOrder").then((order) => {
+    cy.fixture("Order").then((order) => {
       nonConform.selectSearchType("Lab Number");
       nonConform.enterSearchField(order.labNo);
       nonConform.clickSearchButton();
@@ -99,7 +99,7 @@ describe("View New Non-Conforming Event", function () {
       .should("contain.text", "View New Non Conform Event");
   });
   it("Should Search by Lab Number and Validate the results", function () {
-    cy.fixture("EnteredOrder").then((order) => {
+    cy.fixture("Order").then((order) => {
       nonConform.selectSearchType("Lab Number");
       nonConform.enterSearchField(order.labNo);
       nonConform.clickSearchButton();
@@ -147,7 +147,7 @@ describe("Corrective Actions", function () {
       .should("contain.text", "Nonconforming Events Corrective Action");
   });
   it("Should Search by Lab Number and Validate the results", function () {
-    cy.fixture("EnteredOrder").then((order) => {
+    cy.fixture("Order").then((order) => {
       nonConform.selectSearchType("Lab Number");
       nonConform.enterSearchField(order.labNo);
       nonConform.clickSearchButton();

frontend/cypress/e2e/orderEntity.cy.js

@@ -1,4 +1,5 @@
 import LoginPage from "../pages/LoginPage";
+//import OrderEntityPage from "../pages/OrderEntityPage";
 
 let homePage = null;
 let loginPage = null;
@@ -16,29 +17,23 @@ describe("Order Entity", function () {
     orderEntityPage = homePage.goToOrderPage();
   });
 
-  it("Should search patient in the search box", function () {
+  it("User searches patient by First and Last Names", function () {
     patientEntryPage = orderEntityPage.getPatientPage();
     cy.wait(1000);
     cy.fixture("Patient").then((patient) => {
-      patientEntryPage.searchPatientByFirstAndLastName(
-        patient.firstName,
-        patient.lastName,
-      );
-      patientEntryPage.clickSearchPatientButton();
-      patientEntryPage.validatePatientSearchTable(
-        patient.firstName,
-        patient.inValidName,
-      );
-      patientEntryPage.selectPatientFromSearchResults();
-      cy.wait(200);
-      patientEntryPage.getFirstName().should("have.value", patient.firstName);
-      patientEntryPage.getLastName().should("have.value", patient.lastName);
+      patientEntryPage.patientFirstName(patient.firstName);
+      patientEntryPage.patientLastName(patient.lastName);
     });
+    patientEntryPage.clickSearchBtn();
   });
-
-  it("User should click next to go to program selection", function () {
+  it("User checks patient from the table", function () {
+    patientEntryPage.selectPatient();
+  });
+  it("User clicks next to go to program selection", function () {
     orderEntityPage.clickNextButton();
-    cy.wait(1000);
+    cy.fixture("Order").then((order) => {
+      orderEntityPage.selectProgram(order.program);
+    });
     orderEntityPage.clickNextButton();
   });
 
@@ -58,7 +53,7 @@ describe("Order Entity", function () {
       orderEntityPage.validateAcessionNumber(order.invalidLabNo);
     });
     orderEntityPage.generateLabOrderNumber();
-    cy.get("#labNo").then(($input) => {
+    cy.get("#displaylab_labNo").then(($input) => {
       const generatedOrderNumber = $input.val();
       cy.fixture("Order").then((order) => {
         order.labNo = generatedOrderNumber;
@@ -76,14 +71,13 @@ describe("Order Entity", function () {
     });
   });
 
-  it("should enter requester first and last name's", function () {
+  it("should enter requester first and last names", function () {
     cy.fixture("Order").then((order) => {
-      orderEntityPage.enterRequesterLastAndFirstName(
-        order.requester.firstName,
-        order.requester.lastName,
-      );
+      orderEntityPage.searchRequester(order.requester);
     });
+    cy.wait(500);
   });
+
   it("should click submit order button", function () {
     orderEntityPage.clickSubmitOrderButton();
   });