Merge pull request #242 from NHSDigital/DTOSS-9936-include-name-in-checkin-links

[DTOSS-9936] (accessibility) include name in checkin links

Author: MatMoore

manage_breast_screening/clinics/tests/system/test_user_views_clinic_show_page.py

@@ -48,6 +48,11 @@ def test_user_views_clinic_show_page_with_special_appointments(self):
         self.when_i_click_on_the_special_appointment()
         self.then_i_can_see_the_special_appointment_banner()
 
+    def test_accessibility(self):
+        self.given_there_are_appointments()
+        self.and_i_am_on_the_clinic_show_page()
+        self.then_the_accessibility_baseline_is_met()
+
     def given_there_are_appointments(self):
         self.confirmed_appointment = AppointmentFactory(
             clinic_slot__clinic=self.clinic,
@@ -56,6 +61,13 @@ def given_there_are_appointments(self):
             screening_episode__participant__first_name="Janet",
             screening_episode__participant__last_name="Confirmed",
         )
+        self.another_confirmed_appointment = AppointmentFactory(
+            clinic_slot__clinic=self.clinic,
+            clinic_slot__starts_at=datetime.now(timezone.utc).replace(hour=9, minute=0),
+            screening_episode__participant__first_name="Also",
+            screening_episode__participant__last_name="Confirmed",
+            current_status=AppointmentStatus.CONFIRMED,
+        )
         self.checked_in_appointment = AppointmentFactory(
             clinic_slot__clinic=self.clinic,
             clinic_slot__starts_at=datetime.now(timezone.utc).replace(
@@ -74,6 +86,12 @@ def given_there_are_appointments(self):
     def given_i_am_on_the_clinic_list(self):
         self.page.goto(self.live_server_url + reverse("clinics:index"))
 
+    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})
+        )
+
     def when_i_click_on_the_clinic(self):
         self.page.get_by_role("link", name="West London BSS").click()
 
@@ -86,10 +104,15 @@ def then_i_should_see_the_clinic_show_page(self):
     def and_i_can_see_remaining_appointments(self):
         remaining_link = self.page.get_by_role("link", name=re.compile("Remaining"))
         count_span = remaining_link.locator(".app-count")
-        expect(count_span).to_contain_text("2")
+        expect(count_span).to_contain_text("3")
         rows = self.page.locator("table.nhsuk-table tbody tr").all()
         self._expect_rows_to_match_appointments(
-            rows, [self.confirmed_appointment, self.checked_in_appointment]
+            rows,
+            [
+                self.confirmed_appointment,
+                self.another_confirmed_appointment,
+                self.checked_in_appointment,
+            ],
         )
 
     def when_i_click_on_checked_in(self):
@@ -118,19 +141,22 @@ def when_i_click_on_all(self):
     def then_i_can_see_all_appointments(self):
         all_link = self.page.get_by_role("link", name=re.compile("All"))
         count_span = all_link.locator(".app-count")
-        expect(count_span).to_contain_text("3")
+        expect(count_span).to_contain_text("4")
         rows = self.page.locator("table.nhsuk-table tbody tr").all()
         self._expect_rows_to_match_appointments(
             rows,
             [
                 self.confirmed_appointment,
+                self.another_confirmed_appointment,
                 self.checked_in_appointment,
                 self.screened_appointment,
             ],
         )
 
     def when_i_check_in_an_appointment(self):
-        self.page.get_by_role("button", name=re.compile("Check in")).click()
+        self.page.get_by_role(
+            "button", name=re.compile("Check in Janet Confirmed")
+        ).click()
 
     def then_the_appointment_is_checked_in(self):
         row = self.page.locator("tr").filter(has_text="Janet Confirmed")
@@ -141,6 +167,7 @@ def and_the_appointments_remain_in_the_same_order(self):
         rows = self.page.locator("table.nhsuk-table tbody tr").all()
         expected_times = [
             format_time(self.confirmed_appointment.clinic_slot.starts_at),
+            format_time(self.another_confirmed_appointment.clinic_slot.starts_at),
             format_time(self.checked_in_appointment.clinic_slot.starts_at),
             format_time(self.screened_appointment.clinic_slot.starts_at),
         ]

manage_breast_screening/core/jinja2/components/appointment-status/template.jinja

@@ -13,7 +13,7 @@
     {% set action_url = check_in_url or url('mammograms:check_in', kwargs={'pk': appointment.pk}) %}
     <form action="{{ action_url }}" method="post" novalidate>
       <p class="nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-0">
-        <button class="app-button--link">Check in</button>
+        <button class="app-button--link">Check in<span class="nhsuk-u-visually-hidden"> {{ appointment.participant.full_name }}</span></button>
       </p>
       {{ csrf_input }}
     </form>

manage_breast_screening/core/system_test_setup.py

@@ -1,4 +1,5 @@
 import os
+from collections import Counter
 
 import pytest
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
@@ -56,9 +57,30 @@ def expect_validation_error(
 
         expect(field).to_be_focused()
 
-    def then_the_accessibility_baseline_is_met(self):
+    def then_the_accessibility_baseline_is_met(self, require_unique_link_text=True):
         """
-        Check there are no Axe violations
+        Check for certain accessibility issues that can be detected automatically without
+        context of the page under test.
+
+        If require_unique_link_text is True (the default), then fail if there are
+        any links on the page with identical link text (or any buttons styled to
+        look like links). This depends on context, but generally we should be disambiguating
+        any interactive elements that appear close together, and avoiding any non-specific
+        links like "click here".
         """
         results = self.axe.run()
         self.assertEqual(results.violations_count, 0, results.generate_report())
+
+        if require_unique_link_text:
+            links = self.page.get_by_role("link").or_(
+                self.page.locator("css=.app-button--link")
+            )
+
+            counter = Counter(link.text_content().strip() for link in links.all())
+
+            # Known bug: There is an extra "home" link that is shown at mobile screen widths. This will be fixed in NHS.UK frontend 10.0.0
+            counter["Home"] -= 1
+
+            duplicates = {k: v for k, v in counter.items() if v > 1}
+
+            self.assertEqual(len(duplicates), 0, duplicates)