From 045f375bc846dd49d9f0b07bd618e7111550da41 Mon Sep 17 00:00:00 2001
From: sidpg123 <siddharthpatilgurav@gmail.com>
Date: Tue, 17 Dec 2024 14:48:57 +0530
Subject: [PATCH] made suggested changes

---
 cypress/e2e/patient_spec/PatientVolunteer.cy.ts |  2 +-
 cypress/pageobject/Patient/PatientDetails.ts    | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/patient_spec/PatientVolunteer.cy.ts b/cypress/e2e/patient_spec/PatientVolunteer.cy.ts
index 168cc0838a2..febb5730403 100644
--- 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
index b17eb86de43..841f2e50c55 100644
--- 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");