01/05 - As per PR 42 comments, Pushing the Latest code changes.

Author: vidhya-chandra1

pages/screening_subject_search/contact_with_patient_page.py

@@ -10,20 +10,20 @@ def __init__(self, page: Page):
         self.page = page
 
         # Contact With Patient - Page Locators
-        self.contact_direction_dropdown = page.locator("#UI_DIRECTION")
-        self.contact_made_between_Patient_and_dropdown = page.locator("#UI_CALLER_ID")
-        self.calendar_button = page.get_by_role("button", name="Calendar")
-        self.time_from_text_field = page.get_by_role("textbox", name="Start Time")
-        self.time_to_text_field = page.get_by_role("textbox", name="End Time")
-        self.discussion_record_text_field = page.get_by_role("textbox", name="Discussion Record")
-        self.outcome_dropdown = page.locator("##UI_OUTCOME")
-        self.save_button = page.get_by_role("button", name="Save")
+        self.contact_direction_dropdown = self.page.locator("#UI_DIRECTION")
+        self.contact_made_between_patient_and_dropdown = self.page.locator("#UI_CALLER_ID")
+        self.calendar_button = self.page.get_by_role("button", name="Calendar")
+        self.time_from_text_field = self.page.get_by_role("textbox", name="Start Time")
+        self.time_to_text_field = self.page.get_by_role("textbox", name="End Time")
+        self.discussion_record_text_field = self.page.get_by_role("textbox", name="Discussion Record")
+        self.outcome_dropdown = self.page.locator("##UI_OUTCOME")
+        self.save_button = self.page.get_by_role("button", name="Save")
 
     def select_direction_dropdown_option(self, direction: str) -> None:
         self.contact_direction_dropdown.select_option(label=direction)
 
-    def select_callerid_dropdown_option(self, callerid: str) -> None:
-        self.contact_made_between_Patient_and_dropdown.select_option(label=callerid)
+    def select_caller_id_dropdown_index_option(self, index_value: int) -> None:
+        self.contact_made_between_patient_and_dropdown.select_option(index=index_value)
 
     def click_calendar_button(self) -> None:
         self.click(self.calendar_button)

tests/smokescreen/test_compartment_5.py

@@ -166,9 +166,9 @@ def test_compartment_5(page: Page, smokescreen_properties: dict) -> None:
     # select 'Outcome' - 'Post-investigation Appointment Not Required' and click 'Save'
 
     ContactWithPatientPage(page).select_direction_dropdown_option("To patient")
-    ContactWithPatientPage(page).select_callerid_dropdown_option("Amid, Snoring (FS Screening Coordinator)")
+    ContactWithPatientPage(page).select_caller_id_dropdown_index_option(1)
     ContactWithPatientPage(page).click_calendar_button()
-    CalendarPicker(page).select_day(datetime.today())
+    CalendarPicker(page).v1_calender_picker(datetime.today())
     ContactWithPatientPage(page).enter_start_time("11:00")
     ContactWithPatientPage(page).enter_end_time("12:00")
     ContactWithPatientPage(page).enter_discussion_record_text("Test Automation")