made suggested changes

sidpg123 · Dec 17, 2024 · 045f375 · 045f375
1 parent 0dbf1e2
commit 045f375
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/cypress/e2e/patient_spec/PatientVolunteer.cy.ts b/cypress/e2e/patient_spec/PatientVolunteer.cy.ts
@@ -43,7 +43,7 @@ describe("Assign a volunteer to a patient - Multiple Tests", () => {
 
   it("should unassign volunteer successfully", () => {
     patientDetailsPage.clickAssignOrReassignVolunteer();
-    patientDetailsPage.unassignAndPrepareForReassignment();
+    patientDetailsPage.unassignVolunteer();
     patientDetailsPage.verifyBannerIsRemovedAfterUnassign();
   });
 

diff --git a/cypress/pageobject/Patient/PatientDetails.ts b/cypress/pageobject/Patient/PatientDetails.ts
@@ -9,20 +9,16 @@ export class PatientDetailsPage {
 
   clickAssignOrReassignVolunteer() {
     cy.get("#assign-volunteer")
-      .scrollIntoView()
-      .should("be.visible")
-      .should("be.enabled")
       .invoke("text")
       .then((text) => {
         if (text.includes("Assign to a Volunteer")) {
-          cy.verifyAndClickElement(
-            "#assign-volunteer",
-            "Assign to a Volunteer",
-          );
+          this.clickAssignToVolunteer();
         } else if (text.includes("Reassign Volunteer")) {
-          cy.verifyAndClickElement("#assign-volunteer", "Reassign Volunteer");
+          this.clickReassignToVolunteer();
         } else {
-          throw new Error("Expected button text not found.");
+          throw new Error(
+            `Button text must be either "Assign to a Volunteer" or "Reassign Volunteer", but found: "${text}"`,
+          );
         }
       });
   }
@@ -34,7 +30,7 @@ export class PatientDetailsPage {
     cy.verifyContentPresence("#assigned-volunteer", [volunteerName]);
   }
 
-  unassignAndPrepareForReassignment() {
+  unassignVolunteer() {
     cy.get("#clear-button").should("be.visible").click();
     cy.get("#dropdown-toggle").should("be.visible").click();
     cy.clickSubmitButton("Unassign");