fix regression test

Author: jf-x-dev

mavis/test/pages/sessions.py

@@ -118,7 +118,6 @@ def __init__(
         self.update_results_button = self.page.get_by_role(
             "button", name="Update results"
         )
-        self.year_10_checkbox = self.page.get_by_role("checkbox", name="Year 10")
         self.confirm_button = self.page.get_by_role("button", name="Confirm")
         self.search_textbox = self.page.get_by_role("textbox", name="Search")
         self.search_button = self.page.get_by_role("button", name="Search")
@@ -182,6 +181,10 @@ def __init__(
         vaccinations_card = page.get_by_role("table", name="Vaccinations")
         self.vaccinations_card_row = vaccinations_card.get_by_role("row")
         self.sessions_link = page.get_by_role("link", name="Sessions", exact=True).first
+        self.advanced_filters_link = page.get_by_text("Advanced filters")
+        self.missing_nhs_no_checkbox = self.page.get_by_role(
+            "checkbox", name="Children missing an NHS number"
+        )
 
     def __get_display_formatted_date(self, date_to_format: str) -> str:
         _parsed_date = datetime.strptime(date_to_format, "%Y%m%d")
@@ -247,6 +250,7 @@ def click_session_for_programme_group(self, location: str, programme_group: str)
 
         self.search_textbox.fill(str(location))
         self.search_button.click()
+
         self.page.get_by_role("link", name=str(location)).click()
 
         expect(self.page.locator("h1", has_text=str(location))).to_be_visible(
@@ -394,17 +398,25 @@ def click_confirm_button(self):
 
     @step("Check box for year {1}")
     def check_year_checkbox(self, year: str):
-        self.page.get_by_role("checkbox", name=f"Year {year}").check()
+        if year == "0":
+            self.page.get_by_role("checkbox", name="Reception").check()
+        else:
+            self.page.get_by_role("checkbox", name=f"Year {year}").check()
 
     @step("Uncheck box for year {1}")
     def uncheck_year_checkbox(self, year: str):
-        self.page.get_by_role("checkbox", name=f"Year {year}").uncheck()
+        if year == "0":
+            self.page.get_by_role("checkbox", name="Reception").uncheck()
+        else:
+            self.page.get_by_role("checkbox", name=f"Year {year}").uncheck()
 
-    @step("Check box for year {1}")
-    def check_box_for_year_other_than(self, year: str):
-        self.page.get_by_role("checkbox", name="Year ").filter(
-            has_not_text=year
-        ).first.check()
+    @step("Click Advanced filters")
+    def click_advanced_filters(self):
+        self.advanced_filters_link.click()
+
+    @step("Check Children missing an NHS number")
+    def check_missing_nhs_no_checkbox(self):
+        self.missing_nhs_no_checkbox.check()
 
     @step("Click on Record vaccinations")
     def click_record_vaccinations_tab(self):
@@ -680,22 +692,6 @@ def get_online_consent_url(self, *programmes: list[Programme]) -> str:
         link_text = f"View the {' and '.join(str(programme) for programme in programmes)} online consent form"
         return str(self.page.get_by_role("link", name=link_text).get_attribute("href"))
 
-    def verify_attendance_filters(self):
-        self.click_register_tab()
-
-        search_summary = self.page.get_by_text("Showing 1 to")
-
-        expect(search_summary).not_to_have_text("Showing 1 to 1 of 1 children")
-        self.year_10_checkbox.check()
-        self.click_on_update_results()
-
-        expect(search_summary).to_have_text("Showing 1 to 1 of 1 children")
-
-        self.year_10_checkbox.uncheck()
-        self.click_on_update_results()
-
-        expect(search_summary).not_to_have_text("Showing 1 to 1 of 1 children")
-
     def register_child_as_attending(self, child: Child):
         self.click_register_tab()
         self.search_for(str(child))

tests/test_sessions.py

@@ -100,10 +100,11 @@ def test_verify_attendance_filters(setup_mavis_1822, sessions_page, year_groups)
     expect(search_summary).to_have_text("Showing 1 to 5 of 5 children")
 
     sessions_page.uncheck_year_checkbox(year_group)
-    sessions_page.check_box_for_year_other_than(year_group)
+    sessions_page.click_advanced_filters()
+    sessions_page.check_missing_nhs_no_checkbox()
     sessions_page.click_on_update_results()
 
-    expect(search_summary).not_to_have_text("Showing 1 to 1 of 1 children")
+    expect(search_summary).not_to_be_visible()
 
 
 @issue("MAV-1018")