remove main text expectations from children_page

Author: jf-x-dev

mavis/test/pages/children.py

@@ -167,11 +167,11 @@ def fill_nhs_no_for_child(self, child: Child, nhs_no: str) -> None:
     def click_invite_to_community_clinic(self) -> None:
         self.invite_to_community_clinic_button.click()
 
-    def expect_text_in_main(self, text: str) -> None:
-        expect(self.page.get_by_role("main")).to_contain_text(text)
+    def expect_vaccination_details(self, key: str, value: str) -> None:
+        detail_key = self.page.locator(".nhsuk-summary-list__key", has_text=key)
+        detail_value = detail_key.locator("xpath=following-sibling::*[1]")
 
-    def expect_text_in_heading(self, text: str) -> None:
-        expect(self.page.get_by_role("heading")).to_contain_text(text)
+        expect(detail_value).to_contain_text(value)
 
     def expect_text_in_alert(self, text: str) -> None:
         expect(self.page.get_by_role("alert")).to_contain_text(text)
@@ -214,12 +214,18 @@ def verify_activity_log_for_created_or_matched_child(
 
         self.click_record_for_child(child)
         self.click_activity_log()
-        self.expect_text_in_main("Consent given")
-        self.expect_text_in_main(f"Added to the session at {location}")
+        self.expect_activity_log_header("Consent given")
+        self.expect_activity_log_header(f"Added to the session at {location}", any=True)
 
         # FIXME: Update this text when MAVIS-1896/MAV-253 is closed
         self.check_log_updates_with_match()
 
+    def expect_activity_log_header(self, header: str, any: bool = False):
+        if any:
+            expect(self.page.get_by_role("heading", name=header).first).to_be_visible()
+        else:
+            expect(self.page.get_by_role("heading", name=header)).to_be_visible()
+
     def archive_child_record(self):
         self.click_archive_child_record()
         self.click_imported_in_error()

tests/test_children.py

@@ -131,11 +131,11 @@ def test_details_mav_853(setup_mav_853, children_page, schools, children):
     children_page.click_record_for_child(child)
     # Verify activity log
     children_page.click_activity_log()
-    children_page.expect_text_in_main("Vaccinated with Gardasil 9")
+    children_page.expect_activity_log_header("Vaccinated with Gardasil 9")
     # Verify vaccination record
     children_page.click_child_record()
     children_page.click_vaccination_details(school)
-    children_page.expect_text_in_main("OutcomeVaccinated")
+    children_page.expect_vaccination_details("Outcome", "Vaccinated")
 
 
 @pytest.mark.bug
@@ -148,7 +148,7 @@ def test_change_nhsno(setup_change_nhsno, children_page, children):
     children_page.click_change_nhs_no()
     children_page.fill_nhs_no_for_child(child, "9123456789")
     children_page.click_continue()
-    children_page.expect_text_in_main("Enter a valid NHS number")
+    children_page.expect_text_in_alert("Enter a valid NHS number")
 
 
 @pytest.mark.children

tests/test_import_records.py

@@ -349,7 +349,7 @@ def test_vaccs_historic_no_urn_mav_855(
     children_page.search_with_all_filters_for_child_name(str(child))
     children_page.click_record_for_child(child)
     children_page.click_vaccination_details(school)
-    children_page.expect_text_in_main(str(school))
+    children_page.expect_vaccination_details("Location", str(school))
 
 
 @pytest.mark.vaccinations