Merge pull request #557 from NHSDigital/remove-main-text-expectations

Remove main text expectations

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()

mavis/test/pages/consent.py

@@ -362,8 +362,12 @@ def select_consent_not_given_reason(
 
         self.click_continue()
 
-    def expect_text_in_main(self, text: str) -> None:
-        expect(self.page.get_by_role("main")).to_contain_text(text)
+    def expect_text_in_alert(self, text: str) -> None:
+        expect(self.page.get_by_role("alert")).to_contain_text(text)
+
+    def expect_confirmation_text(self, text: str) -> None:
+        confirmation = self.page.locator(".nhsuk-panel.nhsuk-panel--confirmation")
+        expect(confirmation).to_contain_text(text)
 
     def change_parent_phone(self):
         self.fill_phone_number_and_receive_text_alerts("7700900000")
@@ -421,7 +425,7 @@ def parent_written_positive(
     def update_triage_outcome_positive(self):
         self.click_safe_to_vaccinate()
         self.click_save_triage()
-        expect(self.page.get_by_role("main")).to_contain_text("Triage outcome updated")
+        self.expect_text_in_alert("Triage outcome updated")
 
     def parent_phone_positive(
         self, parent: Parent, consent_option: ConsentOption = ConsentOption.INJECTION
@@ -555,4 +559,4 @@ def programme_display(programme, consent_option) -> str:
             body = f"{child.first_name} {child.last_name} is due to get the {programmes_str} vaccination{'s' if len(programmes) > 1 else ''} at school"
 
         final_message = "".join([title, body])
-        self.expect_text_in_main(final_message)
+        self.expect_confirmation_text(final_message)

mavis/test/pages/programmes.py

@@ -122,6 +122,9 @@ def click_use_duplicate(self):
     def click_resolve_duplicate(self):
         self.resolve_duplicate_button.click()
 
+    def expect_alert_text(self, text: str):
+        expect(self.page.get_by_role("alert")).to_contain_text(text)
+
     @step("Click on Download vaccination report")
     def click_download_report(self):
         self.download_report_button.click()
@@ -170,9 +173,3 @@ def _download_and_verify_report_headers(self, expected_headers: str):
             assert False, (
                 f"The following expected field(s) were not found in the report: {_e_not_a}.  Report contains extra field(s), which were not expected: {_a_not_e}."
             )
-
-    def expect_text(self, text: str):
-        expect(self.page.get_by_role("main")).to_contain_text(text)
-
-    def expect_to_not_see_text(self, text: str):
-        expect(self.page.get_by_role("main")).not_to_contain_text(text)

mavis/test/pages/sessions.py

@@ -132,7 +132,6 @@ def __init__(
             "#vaccinate-form-vaccine-method-nasal-field"
         )
         self.attending_button = self.page.get_by_role("button", name="Attending").first
-        self.success_alert = self.page.get_by_role("alert", name="Success")
         self.notes_length_error = (
             page.locator("div").filter(has_text="There is a problemEnter").nth(3)
         )
@@ -531,7 +530,7 @@ def add_note(self, note: str):
         with self.page.expect_navigation():
             self.click_save_note()
 
-        expect(self.success_alert).to_contain_text("Note added")
+        self.expect_alert_text("Note added")
         reload_until_element_is_visible(self.page, self.page.get_by_text(note))
 
         self.check_notes_appear_in_order([note])
@@ -562,22 +561,43 @@ def download_offline_recording_excel(self) -> Path:
 
         return _file_path
 
-    @step("Expect text {1}")
-    def expect_main_to_contain_text(self, text: str):
-        expect(self.page.locator("main")).to_contain_text(text)
+    def expect_consent_refused_text(self, parent: Parent):
+        expect(
+            self.page.get_by_text(f"{parent.relationship} refused to give consent.")
+        ).to_be_visible()
+
+    def check_session_activity_entry(self, text: str):
+        expect(self.page.get_by_role("heading", name=text).first).to_be_visible()
+
+    def expect_conflicting_consent_text(self):
+        expect(
+            self.page.get_by_text(
+                "You can only vaccinate if all respondents give consent."
+            )
+        ).to_be_visible()
+
+    def expect_consent_status(self, programme: Programme, status: str):
+        expect(self.page.get_by_text(f"{programme}: {status}")).to_be_visible()
+
+    def expect_child_safe_to_vaccinate(self, child: Child):
+        expect(
+            self.page.get_by_text(
+                f"NURSE, Nurse decided that {str(child)} is safe to vaccinate."
+            )
+        ).to_be_visible()
 
     def get_session_id_from_offline_excel(self):
         file_path = self.download_offline_recording_excel()
         return self.test_data.get_session_id(file_path)
 
     @step("Add Gillick competence details")
     def add_gillick_competence(
-        self, is_competent: bool, competence_details: str
+        self,
+        is_competent: bool,
     ) -> None:
         self.__set_gillick_competence(
             is_add=True,
             is_competent=is_competent,
-            competence_details=competence_details,
         )
 
     @step("Click Sessions")
@@ -586,29 +606,35 @@ def click_sessions(self) -> None:
 
     @step("Edit Gillick competence details")
     def edit_gillick_competence(
-        self, is_competent: bool, competence_details: str
+        self,
+        is_competent: bool,
     ) -> None:
         self.__set_gillick_competence(
             is_add=False,
             is_competent=is_competent,
-            competence_details=competence_details,
         )
 
     def __set_gillick_competence(
-        self, is_add: bool, is_competent: bool, competence_details: str
+        self,
+        is_add: bool,
+        is_competent: bool,
     ) -> None:
         self.answer_gillick_competence_questions(is_competent)
+        competence_assessment = (
+            f"Child assessed as {'' if is_competent else 'not '}Gillick competent"
+        )
 
-        self.assessment_notes_textbox.fill(competence_details)
+        self.assessment_notes_textbox.fill(competence_assessment)
         if is_add:
             self.click_complete_assessment()
         else:
             self.click_update_assessment()
-        if is_competent:
-            self.expect_main_to_contain_text("Child assessed as Gillick competent")
-        else:
-            self.expect_main_to_contain_text("Child assessed as not Gillick competent")
-        self.expect_main_to_contain_text(competence_details)
+
+        competence_result_locator = self.page.get_by_role(
+            "heading", name="Gillick assessment"
+        ).locator("xpath=following-sibling::*[1]")
+
+        expect(competence_result_locator).to_contain_text(competence_assessment)
 
     def answer_gillick_competence_questions(self, is_competent):
         questions = [
@@ -632,7 +658,7 @@ def __schedule_session(self, on_date: str, expect_error: bool = False):
         self.fill_date_fields(_day, _month, _year)
         self.click_continue_button()
         if expect_error:
-            self.expect_main_to_contain_text("There is a problemEnter a date")
+            self.expect_alert_text("There is a problemEnter a date")
 
     def __edit_session(self, to_date: str):
         _day = to_date[-2:]
@@ -650,23 +676,28 @@ def __edit_session(self, to_date: str):
         ).not_to_be_visible()
 
     def verify_triage_updated_for_child(self):
-        expect(self.success_alert).to_contain_text("Triage outcome updated")
+        self.expect_alert_text("Triage outcome updated")
 
     def invalidate_parent_refusal(self, parent: Parent):
+        invalidation_notes = "Invalidation notes."
         self.page.get_by_role("link", name=parent.full_name).click()
         self.click_mark_as_invalid_link()
-        self.fill_notes("Invalidation notes.")
+        self.fill_notes(invalidation_notes)
         self.click_mark_as_invalid_button()
-        self.expect_main_to_contain_text("Consent refusedInvalid")
-        self.expect_main_to_contain_text("Invalidation notes.")
+        self.expect_details("Decision", "Consent refusedInvalid")
+        self.expect_details("Notes", invalidation_notes)
 
         self.click_back_to_child()
-        self.expect_main_to_contain_text("Consent refusedInvalid")
-        self.expect_main_to_contain_text("No requests have been sent.")
+        self.expect_details("Decision", "Consent refusedInvalid")
+        expect(self.page.get_by_text("No requests have been sent.")).to_be_visible()
 
-    def verify_scheduled_date(self, message: str):
-        self.expect_main_to_contain_text(message)
-        self.click_continue_link()
+    def expect_details(self, key: str, value: str) -> None:
+        detail_key = self.page.locator(
+            ".nhsuk-summary-list__key", has_text=re.compile(f"^{key}$")
+        ).first
+        detail_value = detail_key.locator("xpath=following-sibling::*[1]")
+
+        expect(detail_value).to_contain_text(value)
 
     def schedule_a_valid_session(
         self,
@@ -684,10 +715,13 @@ def schedule_a_valid_session(
         else:
             offset_days = 10
         _future_date = get_offset_date(offset_days=offset_days)
-        _expected_message = f"Session dates{self.__get_display_formatted_date(date_to_format=_future_date)}"
         self.click_session_for_programme_group(location, programme_group)
         self.__schedule_session(on_date=_future_date)
-        self.verify_scheduled_date(message=_expected_message)
+        self.expect_details(
+            "Session dates",
+            self.__get_display_formatted_date(date_to_format=_future_date),
+        )
+        self.click_continue_link()
 
     def edit_a_session_to_today(self, location: str, programme_group: str):
         _future_date = get_offset_date(offset_days=0)
@@ -741,7 +775,9 @@ def verify_search(self):
         """
         self.click_consent_tab()
         self.search_for("a very long string that won't match any names")
-        self.expect_main_to_contain_text("No children matching search criteria found")
+        expect(
+            self.page.get_by_text("No children matching search criteria found")
+        ).to_be_visible()
 
     def search_child(self, child: Child) -> None:
         self.search_for(str(child))
@@ -790,11 +826,12 @@ def record_vaccs_for_child(
                 self.vaccination_notes.fill("Confirmation notes")
                 self.click_confirm_button()
 
-            expect(self.success_alert).to_contain_text(
-                f"Vaccination outcome recorded for {programme}"
-            )
+            self.expect_alert_text(f"Vaccination outcome recorded for {programme}")
         return datetime.now().astimezone()
 
+    def expect_alert_text(self, text: str):
+        expect(self.page.get_by_role("alert")).to_contain_text(text)
+
     def verify_child_shows_correct_flu_consent_method(self, child: Child, method: str):
         patient_card = self.page.locator(
             f'div.nhsuk-card.app-card.app-card--compact:has(h4:has-text("{str(child)}"))'

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

tests/test_online_consent_doubles.py

@@ -29,7 +29,7 @@ def test_refused(consent_page, schools, children):
         details="Vaccine already received in previous school",
     )
     consent_page.click_confirm()
-    consent_page.expect_text_in_main(
+    consent_page.expect_confirmation_text(
         f"Consent refusedYou’ve told us that you do not want {child.first_name} {child.last_name} to get the MenACWY and Td/IPV vaccinations at school"
     )
 

tests/test_online_consent_flu.py

@@ -52,7 +52,7 @@ def test_refused(start_consent, consent_page, schools, children):
         details="Vaccine already received in previous school",
     )
     consent_page.click_confirm()
-    consent_page.expect_text_in_main(
+    consent_page.expect_confirmation_text(
         f"Consent refusedYou’ve told us that you do not want {child.first_name} {child.last_name} to get the flu vaccination at school"
     )
 

tests/test_online_consent_hpv.py

@@ -27,7 +27,7 @@ def test_refused(consent_page, schools, children):
         details="Vaccine already received in previous school",
     )
     consent_page.click_confirm()
-    consent_page.expect_text_in_main(
+    consent_page.expect_confirmation_text(
         f"Consent refusedYou’ve told us that you do not want {child.first_name} {child.last_name} to get the HPV vaccination at school"
     )
 

tests/test_programmes.py

@@ -251,12 +251,12 @@ def test_rav_triage_consent_refused(
     sessions_page.navigate_to_consent_response(child, Programme.HPV)
 
     consent_page.parent_paper_refuse_consent(child.parents[0])
-    consent_page.expect_text_in_main(str(child))
+    consent_page.expect_text_in_alert(str(child))
 
     sessions_page.select_consent_refused()
     sessions_page.click_child(child)
     sessions_page.click_session_activity_and_notes()
-    sessions_page.expect_main_to_contain_text(
+    sessions_page.check_session_activity_entry(
         f"Consent refused by {child.parents[0].name_and_relationship}"
     )
 
@@ -278,7 +278,7 @@ def test_rav_edit_dose_to_not_given(
     programmes_page.click_they_refused_it()
     programmes_page.click_continue()
     programmes_page.click_save_changes()
-    programmes_page.expect_to_not_see_text("Sorry, there’s a problem with the service")
+    programmes_page.expect_alert_text("Vaccination outcome recorded for HPV")
 
 
 @pytest.mark.rav
@@ -325,7 +325,7 @@ def test_rav_verify_excel_mav_854(
     sessions_page.check_location_radio(clinics[0])
     sessions_page.click_continue_button()
     sessions_page.click_confirm_button()
-    sessions_page.expect_main_to_contain_text("Vaccination outcome recorded for HPV")
+    sessions_page.expect_alert_text("Vaccination outcome recorded for HPV")
     dashboard_page.click_mavis()
     dashboard_page.click_sessions()
     sessions_page.click_session_for_programme_group(school, Programme.HPV)