Merge pull request #462 from NHSDigital/fix-titles

MatMoore · web-flow · commit 4181047c1e78 · 2025-09-30T11:20:44.000+01:00
[DTOSS-11153] Fix a few cases where the page title wasn't being set
diff --git a/manage_breast_screening/mammograms/views/special_appointment_views.py b/manage_breast_screening/mammograms/views/special_appointment_views.py
@@ -37,6 +37,7 @@ def get_context_data(self, **kwargs):
                     "text": "Back to appointment",
                 },
                 "caption": self.participant.full_name,
+                "page_title": "Provide special appointment details",
                 "heading": "Provide special appointment details",
             },
         )
@@ -91,6 +92,7 @@ def get_context_data(self, **kwargs):
                     "text": "Back",
                 },
                 "caption": self.participant.full_name,
+                "page_title": "Which of these reasons are temporary?",
                 "heading": "Which of these reasons are temporary?",
             },
         )
diff --git a/manage_breast_screening/mammograms/views/symptom_views.py b/manage_breast_screening/mammograms/views/symptom_views.py
@@ -45,6 +45,7 @@ def get_context_data(self, **kwargs):
                 "back_link_params": self.get_back_link_params(),
                 "caption": participant.full_name,
                 "heading": f"Details of the {self.symptom_type_name}",
+                "page_title": f"Details of the {self.symptom_type_name}",
             },
         )
 
@@ -143,6 +144,7 @@ def get(self, request, *args, **kwargs):
         symptom = get_object_or_404(Symptom, pk=kwargs["symptom_pk"])
 
         context = {
+            "page_title": "Are you sure you want to delete this symptom?",
             "heading": "Are you sure you want to delete this symptom?",
             "confirm_action": {
                 "text": "Delete symptom",
diff --git a/manage_breast_screening/tests/system/administrative/test_participant_record.py b/manage_breast_screening/tests/system/administrative/test_participant_record.py
@@ -111,6 +111,7 @@ def then_i_should_be_on_the_participant_record_page(self):
             kwargs={"pk": self.participant.pk},
         )
         expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Participant")
 
     def and_i_should_see_the_participant_record(self):
         main = self.page.get_by_role("main")
diff --git a/manage_breast_screening/tests/system/clinical/test_adding_previous_mammograms.py b/manage_breast_screening/tests/system/clinical/test_adding_previous_mammograms.py
@@ -95,6 +95,7 @@ def then_i_should_be_on_the_add_previous_mammogram_form(self):
             kwargs={"pk": self.participant.pk},
         )
         expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Add details of a previous mammogram")
 
     def then_i_should_be_back_on_the_appointment(self):
         path = reverse(
diff --git a/manage_breast_screening/tests/system/clinical/test_editing_special_appointments.py b/manage_breast_screening/tests/system/clinical/test_editing_special_appointments.py
@@ -30,7 +30,9 @@ def test_setting_up_a_special_appointment(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_i_am_on_the_appointment_show_page()
         self.when_i_click_on_make_special_appointment()
-        self.and_i_add_a_reason()
+        self.then_i_am_on_the_special_appointment_form()
+
+        self.when_i_add_a_reason()
         self.and_i_select_no_reasons_are_temporary()
         self.and_i_submit_the_form()
         self.then_i_am_back_on_the_appointment()
@@ -158,11 +160,16 @@ def when_i_click_on_the_change_link(self):
         banner = self.page.locator(".nhsuk-warning-callout")
         banner.get_by_text("Change").click()
 
+    def then_i_am_on_the_special_appointment_form(self):
+        self.assert_page_title_contains("Provide special appointment details")
+
     def and_i_add_a_reason(self):
         self.page.get_by_label("Hearing").click()
         self.page.keyboard.press("Tab")
         self.page.locator("*:focus").fill("Deaf in one ear")
 
+    when_i_add_a_reason = and_i_add_a_reason
+
     def and_i_add_another_reason(self):
         self.page.get_by_label("Gender identity").click()
         self.page.keyboard.press("Tab")
diff --git a/manage_breast_screening/tests/system/clinical/test_ethnicity_details_form.py b/manage_breast_screening/tests/system/clinical/test_ethnicity_details_form.py
@@ -24,7 +24,7 @@ def test_entering_ethnicity_details_for_a_participant(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_i_am_viewing_an_appointment()
         self.when_i_click_on_enter_ethnicity_details()
-        self.then_i_should_be_on_the_ethnicity_details_form()
+        self.then_i_am_on_the_ethnicity_details_form()
 
         self.when_i_submit_the_form()
         self.then_i_see_an_error()
@@ -35,7 +35,7 @@ def test_entering_ethnicity_details_for_a_participant(self):
         self.and_the_ethnicity_is_updated_to("Asian or Asian British (Chinese)")
 
         self.when_i_click_the_change_ethnicity_link()
-        self.then_i_should_be_on_the_ethnicity_details_form()
+        self.then_i_am_on_the_ethnicity_details_form()
         self.and_the_saved_ethnicity_is_selected("Chinese")
         self.when_i_select_an_ethnicity("Any other White background")
         self.and_i_submit_the_form()
@@ -52,7 +52,7 @@ def test_entering_ethnicity_description_provided_by_the_participant(self):
         self.given_i_am_logged_in_as_a_clinical_user()
         self.and_i_am_viewing_an_appointment()
         self.when_i_click_on_enter_ethnicity_details()
-        self.then_i_should_be_on_the_ethnicity_details_form()
+        self.then_i_am_on_the_ethnicity_details_form()
 
         self.when_i_select_an_ethnicity("Any other White background")
         self.and_i_enter_an_ethnicity_description_provided_by_the_participant(
@@ -83,7 +83,7 @@ def and_i_am_viewing_an_appointment(self):
     def when_i_click_on_enter_ethnicity_details(self):
         self.page.get_by_role("link", name="Enter ethnicity details").click()
 
-    def then_i_should_be_on_the_ethnicity_details_form(self):
+    def then_i_am_on_the_ethnicity_details_form(self):
         expect(self.page).to_have_url(
             re.compile(
                 reverse(
@@ -92,6 +92,7 @@ def then_i_should_be_on_the_ethnicity_details_form(self):
                 )
             )
         )
+        self.assert_page_title_contains("Ethnicity")
 
     def when_i_submit_the_form(self):
         self.page.get_by_role("button", name="Save and continue").click()
diff --git a/manage_breast_screening/tests/system/clinical/test_recording_a_mammogram.py b/manage_breast_screening/tests/system/clinical/test_recording_a_mammogram.py
@@ -121,13 +121,15 @@ def then_i_should_be_on_the_medical_information_page(self):
             kwargs={"pk": self.appointment.pk},
         )
         expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Medical information")
 
     def then_i_should_be_on_the_record_medical_information_page(self):
         path = reverse(
             "mammograms:record_medical_information",
             kwargs={"pk": self.appointment.pk},
         )
         expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Record medical information")
 
     def and_i_should_be_prompted_to_ask_about_relevant_medical_information(self):
         expect(
@@ -156,6 +158,7 @@ def then_the_screen_should_show_that_it_is_awaiting_images_from_the_PACS(self):
             kwargs={"pk": self.appointment.pk},
         )
         expect(self.page).to_have_url(re.compile(path))
+        self.assert_page_title_contains("Awaiting images")
 
     def then_i_am_prompted_to_answer_can_the_screening_go_ahead(self):
         self.expect_validation_error(
diff --git a/manage_breast_screening/tests/system/clinical/test_recording_symptoms.py b/manage_breast_screening/tests/system/clinical/test_recording_symptoms.py
@@ -92,6 +92,7 @@ def when_i_click_on_add_a_lump(self):
 
     def then_i_see_the_add_a_lump_form(self):
         expect(self.page.get_by_text("Details of the lump")).to_be_visible()
+        self.assert_page_title_contains("Details of the lump")
 
     def when_i_select_right_breast(self):
         self.page.get_by_label("Right breast").click()
diff --git a/manage_breast_screening/tests/system/clinical/test_user_submits_cannot_go_ahead_form.py b/manage_breast_screening/tests/system/clinical/test_user_submits_cannot_go_ahead_form.py
@@ -51,6 +51,7 @@ def and_i_am_on_the_cannot_go_ahead_form(self):
                 kwargs={"pk": self.appointment.pk},
             )
         )
+        self.assert_page_title_contains("Appointment cannot go ahead")
 
     def when_i_submit_the_form(self):
         self.page.get_by_role("button", name="Continue").click()
diff --git a/manage_breast_screening/tests/system/general/test_user_views_clinic_show_page.py b/manage_breast_screening/tests/system/general/test_user_views_clinic_show_page.py
@@ -5,6 +5,7 @@
 from django.urls import reverse
 from playwright.sync_api import expect
 
+from manage_breast_screening.clinics.models import Clinic
 from manage_breast_screening.clinics.tests.factories import ClinicFactory
 from manage_breast_screening.core.utils.date_formatting import format_date, format_time
 from manage_breast_screening.core.utils.string_formatting import (
@@ -66,6 +67,7 @@ def and_a_clinic_exists_that_is_run_by_my_provider(self):
             starts_at=self.clinic_start_time,
             setting__name="West London BSS",
             setting__provider=user_assignment.provider,
+            risk_type=Clinic.RiskType.ROUTINE_RISK,
         )
 
     def and_there_are_appointments(self):
@@ -100,12 +102,14 @@ def and_there_are_appointments(self):
 
     def and_i_am_on_the_clinic_list(self):
         self.page.goto(self.live_server_url + reverse("clinics:index"))
+        self.assert_page_title_contains("Today’s clinics")
 
     def and_i_am_on_the_clinic_show_page(self):
         self.page.goto(
             self.live_server_url
             + reverse("clinics:show", kwargs={"pk": self.clinic.pk})
         )
+        self.assert_page_title_contains("Routine risk screening clinic")
 
     def when_i_click_on_the_clinic(self):
         self.page.get_by_role("link", name="West London BSS").click()
diff --git a/manage_breast_screening/tests/system/general/test_viewing_a_completed_appointment.py b/manage_breast_screening/tests/system/general/test_viewing_a_completed_appointment.py
@@ -2,6 +2,7 @@
 from django.urls import reverse
 from playwright.sync_api import expect
 
+from manage_breast_screening.clinics.models import Clinic
 from manage_breast_screening.participants.models import AppointmentStatus
 from manage_breast_screening.participants.tests.factories import (
     AppointmentFactory,
@@ -18,6 +19,7 @@ def before(self):
         self.participant = ParticipantFactory(first_name="Janet", last_name="Williams")
         self.screening_episode = ScreeningEpisodeFactory(participant=self.participant)
         self.appointment = AppointmentFactory(
+            clinic_slot__clinic__type=Clinic.Type.SCREENING,
             screening_episode=self.screening_episode,
             current_status=AppointmentStatus.SCREENED,
         )
@@ -46,6 +48,7 @@ def and_i_am_on_the_appointment_show_page(self):
                 kwargs={"pk": self.appointment.pk},
             )
         )
+        self.assert_page_title_contains("Screening appointment")
 
     def then_i_should_see_the_demographic_banner(self):
         expect(self.page.get_by_text("NHS Number")).to_be_visible()
diff --git a/manage_breast_screening/tests/system/system_test_setup.py b/manage_breast_screening/tests/system/system_test_setup.py
@@ -107,6 +107,9 @@ def expect_validation_error(
 
         expect(field).to_be_focused()
 
+        title_components = self.page_title_components()
+        assert title_components[0].startswith("Error: "), title_components
+
     def expect_url(self, url, **kwargs):
         path = reverse(url, kwargs=kwargs)
         url = re.compile(f"^{self.live_server_url}{re.escape(path)}$")
@@ -148,3 +151,13 @@ def then_the_accessibility_baseline_is_met(self, require_unique_link_text=True):
             duplicates = {k: v for k, v in counter.items() if v > 1}
 
             self.assertEqual(len(duplicates), 0, duplicates)
+
+    def page_title_components(self):
+        return self.page.title().split(" – ")
+
+    def assert_page_title_contains(self, component):
+        components = self.page_title_components()
+
+        assert components[-1] == "NHS", components
+        assert components[-2] == "Manage breast screening", components
+        assert components[-3] == component, components

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ def then_i_should_be_on_the_participant_record_page(self):`
`111`	`111`	`kwargs={"pk": self.participant.pk},`
`112`	`112`	`)`
`113`	`113`	`expect(self.page).to_have_url(re.compile(path))`
	`114`	`+ self.assert_page_title_contains("Participant")`
`114`	`115`
`115`	`116`	`def and_i_should_see_the_participant_record(self):`
`116`	`117`	`main = self.page.get_by_role("main")`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ def then_i_should_be_on_the_add_previous_mammogram_form(self):`
`95`	`95`	`kwargs={"pk": self.participant.pk},`
`96`	`96`	`)`
`97`	`97`	`expect(self.page).to_have_url(re.compile(path))`
	`98`	`+ self.assert_page_title_contains("Add details of a previous mammogram")`
`98`	`99`
`99`	`100`	`def then_i_should_be_back_on_the_appointment(self):`
`100`	`101`	`path = reverse(`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ def and_i_am_on_the_cannot_go_ahead_form(self):`
`51`	`51`	`kwargs={"pk": self.appointment.pk},`
`52`	`52`	`)`
`53`	`53`	`)`
	`54`	`+ self.assert_page_title_contains("Appointment cannot go ahead")`
`54`	`55`
`55`	`56`	`def when_i_submit_the_form(self):`
`56`	`57`	`self.page.get_by_role("button", name="Continue").click()`