Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20479-compartment-6-pom-investigation-dataset-page

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: adrianoaru-nhs

tests/test_calendar_picker_methods.py

@@ -28,8 +28,8 @@ def test_calender_picker_v1(page: Page) -> None:
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 3, 30))
     SubjectScreeningPage(page).verify_date_of_birth_filter_input("30/03/2020")
     SubjectScreeningPage(page).click_clear_filters_button()
-    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 6, 15))
-    SubjectScreeningPage(page).verify_date_of_birth_filter_input("15/06/2020")
+    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2019, 11, 27))
+    SubjectScreeningPage(page).verify_date_of_birth_filter_input("27/11/2019")
     SubjectScreeningPage(page).click_clear_filters_button()
     SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime.today())
     SubjectScreeningPage(page).verify_date_of_birth_filter_input(

utils/calendar_picker.py

@@ -18,6 +18,7 @@ def __init__(self, page: Page):
         self.v1_calendar_current_date = self.page.locator(
             'td.title[colspan="5"][style="cursor: move;"]'
         )
+        self.v1_today_button = self.page.get_by_text("Today", exact=True)
         # V2 Calendar picker locators
         self.v2date_picker_switch = self.page.locator(
             'th.datepicker-switch[colspan="5"]:visible'
@@ -127,18 +128,20 @@ def select_day(self, date: datetime) -> None:
             "cell", name=day_to_select
         ).count()
 
-        all_days = self.page.locator(".day").all()
+        all_matching_days = self.page.get_by_role(
+            "cell", name=day_to_select, exact=True
+        ).all()
 
         matching_days = [
             day
-            for day in all_days
+            for day in all_matching_days
             if day.evaluate("el => el.textContent.trim()") == day_to_select
         ]
 
         if int(day_to_select) < 15 and number_of_cells_with_day > 1:
             self.click(matching_days[0].first)
         elif int(day_to_select) > 15 and number_of_cells_with_day > 1:
-            self.click(matching_days[0].last)
+            self.click(matching_days[-1].last)
         else:
             self.click(matching_days[0])
 
@@ -150,6 +153,13 @@ def v1_calender_picker(self, date: datetime) -> None:
         Args:
             date (datetime): The date we want to select
         """
+
+        if DateTimeUtils.format_date(date, "%d/%m/%Y") == DateTimeUtils.format_date(
+            datetime.today(), "%d/%m/%Y"
+        ):
+            self.click(self.v1_today_button)
+            return
+
         current_date = datetime.strptime(
             self.v1_calendar_current_date.inner_text(), "%B, %Y"
         )