Updates post PR comments

Author: victor-soares-ibm

pages/screening_practitioner_appointments/practitioner_availability_page.py

@@ -12,11 +12,11 @@ def __init__(self, page: Page):
         self.screening_practitioner_dropdown = page.locator("#UI_PRACTITIONER_ID")
         self.calendar_button = page.get_by_role("button", name="Calendar")
 
-    def select_royal_hospital_wolverhampton_dropdown_option(self) -> None:
-        self.site_id_dropdown.select_option(label="THE ROYAL HOSPITAL (WOLVERHAMPTON)")
+    def select_site_dropdown_option(self, site_to_use: str) -> None:
+        self.site_id_dropdown.select_option(label=site_to_use)
 
-    def select_astonish_ethanol_practitioner_dropdown_option(self) -> None:
-        self.screening_practitioner_dropdown.select_option(label="Astonish, Ethanol")
+    def select_practitioner_dropdown_option(self, practitioner: str) -> None:
+        self.screening_practitioner_dropdown.select_option(label=practitioner)
 
     def click_calendar_button(self) -> None:
         self.click(self.calendar_button)

tests/smokescreen/test_compartment_4.py

@@ -50,8 +50,8 @@ def test_compartment_4(page: Page, smokescreen_properties: dict) -> None:
     BasePage(page).go_to_screening_practitioner_appointments_page()
     ScreeningPractitionerAppointmentsPage(page).go_to_set_availability_page()
     SetAvailabilityPage(page).go_to_practitioner_availability_page()
-    PractitionerAvailabilityPage(page).select_royal_hospital_wolverhampton_dropdown_option()
-    PractitionerAvailabilityPage(page).select_astonish_ethanol_practitioner_dropdown_option()
+    PractitionerAvailabilityPage(page).select_site_dropdown_option("THE ROYAL HOSPITAL (WOLVERHAMPTON)")
+    PractitionerAvailabilityPage(page).select_practitioner_dropdown_option("Astonish, Ethanol")
     PractitionerAvailabilityPage(page).click_calendar_button()
     CalendarPicker(page).select_day(
         datetime.today()

utils/calendar_picker.py

@@ -78,7 +78,7 @@ def select_day(self, date: datetime) -> None:
         This function is used by both the v1 and v2 calendar picker
         It extracts the day from the date and then selects that value in the calendar picker
         """
-        day_to_select = str(date.strftime("%#d"))
+        day_to_select = str(date.day)
         number_of_cells_with_day = self.page.get_by_role(
             "cell", name=day_to_select
         ).count()