Move accessibility tests on form errors to form error scenarios

Themitchell · Themitchell · commit 196a9c8e2350 · 2026-01-09T09:43:18.000Z
diff --git a/lung_cancer_screening/questions/jinja2/_speak_to_a_gp_if.jinja b/lung_cancer_screening/questions/jinja2/_speak_to_a_gp_if.jinja
@@ -1,5 +1,5 @@
 <div class="nhsuk-do-dont-list">
-  <h3 class="nhsuk-do-dont-list__label">Speak to a GP if:</h3>
+  <h2 class="nhsuk-do-dont-list__label">Speak to a GP if:</h2>
     <p>You have any of the following symptoms:</p>
 
     <ul class="nhsuk-list nhsuk-list--bullet" role="list">
diff --git a/lung_cancer_screening/questions/jinja2/age_range_exit.jinja b/lung_cancer_screening/questions/jinja2/age_range_exit.jinja
@@ -15,7 +15,7 @@
 {% block content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
-      <h2 class="title">You are not eligible for lung cancer screening</h2>
+      <h1 class="nhsuk-heading-l">You are not eligible for lung cancer screening</h1>
 
       <p>NHS lung cancer screening is for people between the ages of 55 and 74.</p>
       <p>According to the date of birth you have provided you are not in this age range.</p>
diff --git a/lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja b/lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja
@@ -15,7 +15,7 @@
 {% block content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
-      <h2 class="title">You are not eligible for lung cancer screening</h2>
+      <h1 class="nhsuk-heading-l">You are not eligible for lung cancer screening</h1>
 
       <p>NHS lung cancer screening is for people who have smoked or are current smokers.</p>
 
diff --git a/tests/features/asbestos_exposure.feature b/tests/features/asbestos_exposure.feature
@@ -3,15 +3,14 @@ Feature: Asbestos exposure page
     Given I am logged in
     When I go to "/asbestos-exposure"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/asbestos-exposure"
     And I click "Continue"
     Then I am on "/asbestos-exposure"
     And I see a form error "Select if you have been exposed to asbestos"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/cancer_diagnosis.feature b/tests/features/cancer_diagnosis.feature
@@ -3,15 +3,14 @@ Feature: Cancer diagnosis page
     Given I am logged in
     When I go to "/cancer-diagnosis"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/cancer-diagnosis"
     And I click "Continue"
     Then I am on "/cancer-diagnosis"
     And I see a form error "Select if you have been diagnosed with cancer"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/date_of_birth_page.feature b/tests/features/date_of_birth_page.feature
@@ -3,8 +3,6 @@ Feature: Date of birth page
     Given I am logged in
     When I go to "/date-of-birth"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
@@ -22,6 +20,7 @@ Feature: Date of birth page
     When I fill in and submit my date of birth with "31-02-2001"
     Then I am on "/date-of-birth"
     And I see a form error "Date of birth must be a real date"
+    And there are no accessibility violations
 
   Scenario: Eligibility of people not in age range
     Given I am logged in
diff --git a/tests/features/ethnicity.feature b/tests/features/ethnicity.feature
@@ -3,15 +3,14 @@ Feature: Ethnicity page
     Given I am logged in
     When I go to "/ethnicity"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/ethnicity"
     And I click "Continue"
     Then I am on "/ethnicity"
     And I see a form error "Select your ethnic background"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/family_history_lung_cancer.feature b/tests/features/family_history_lung_cancer.feature
@@ -3,15 +3,14 @@ Feature: Family history of lung cancer page
     Given I am logged in
     When I go to "/family-history-lung-cancer"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/family-history-lung-cancer"
     And I click "Continue"
     Then I am on "/family-history-lung-cancer"
     And I see a form error "Select if any of your parents, siblings or children have had a diagnosis of lung cancer"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/gender.feature b/tests/features/gender.feature
@@ -3,15 +3,14 @@ Feature: Gender page
     Given I am logged in
     When I go to "/gender"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/gender"
     And I click "Continue"
     Then I am on "/gender"
     And I see a form error "Select the option that best describes your gender"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/have_you_ever_smoked_page.feature b/tests/features/have_you_ever_smoked_page.feature
@@ -3,22 +3,22 @@ Feature: Have you ever smoked page
     Given I am logged in
     When I go to "/have-you-ever-smoked"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/have-you-ever-smoked"
     And I submit the form
     Then I am on "/have-you-ever-smoked"
     And I see a form error "Select if you have ever smoked"
+    And there are no accessibility violations
 
   Scenario: Eligibility of non smokers
     Given I am logged in
     When I go to "/have-you-ever-smoked"
     And I fill in and submit my smoking status with "No, I have never smoked"
     Then I am on "/non-smoker-exit"
     And I see a title "You are not eligible for lung cancer screening"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/height.feature b/tests/features/height.feature
@@ -3,7 +3,7 @@ Feature: Height page
     Given I am logged in
     When I go to "/height"
     Then there are no accessibility violations
-    When I click "Continue"
+    When I click "Switch to feet and inches"
     Then there are no accessibility violations
 
   Scenario: Metric form errors
@@ -18,6 +18,7 @@ Feature: Height page
     When I fill in and submit my height with "243.9"
     Then I am on "/height"
     And I see a form error "Height must be between 139.7cm and 243.8 cm"
+    And there are no accessibility violations
 
   Scenario: Imperial form errors
     Given I am logged in
@@ -34,6 +35,7 @@ Feature: Height page
     When I fill in and submit my height with "8" feet and "1" inch
     Then I am on "/height?unit=imperial"
     And I see a form error "Height must be between 4 feet 7 inches and 8 feet"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/relatives_age_when_diagnosed.feature b/tests/features/relatives_age_when_diagnosed.feature
@@ -5,8 +5,6 @@ Feature: Relatives age when diagnosed page
     And I fill in and submit my family history lung cancer with "Yes"
     Then I am on "/relatives-age-when-diagnosed"
     And there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
@@ -16,6 +14,7 @@ Feature: Relatives age when diagnosed page
     When I submit the form
     Then I am on "/relatives-age-when-diagnosed"
     And I see a form error "Select if your relatives were younger than 60 when they were diagnosed with lung cancer"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/respiratory_conditions.feature b/tests/features/respiratory_conditions.feature
@@ -3,8 +3,6 @@ Feature: Respiratory conditions page
     Given I am logged in
     When I go to "/respiratory-conditions"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
@@ -15,6 +13,7 @@ Feature: Respiratory conditions page
     When I fill in and submit my respiratory conditions with "Bronchitis" and "No, I have not had any of these respiratory conditions"
     Then I am on "/respiratory-conditions"
     And I see a form error "Select if you have had any respiratory conditions, or select 'No, I have not had any of these respiratory conditions'"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/sex_at_birth.feature b/tests/features/sex_at_birth.feature
@@ -3,15 +3,14 @@ Feature: Sex at birth page
     Given I am logged in
     When I go to "/sex-at-birth"
     Then there are no accessibility violations
-    When I click "Continue"
-    Then there are no accessibility violations
 
   Scenario: Form errors
     Given I am logged in
     When I go to "/sex-at-birth"
     And I click "Continue"
     Then I am on "/sex-at-birth"
     And I see a form error "Select your sex at birth"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
diff --git a/tests/features/steps/page_assertion_steps.py b/tests/features/steps/page_assertion_steps.py
@@ -7,7 +7,7 @@
 
 @then(u'I see a title "{title}"')
 def then_i_see_a_title(context, title):
-    expect(context.page.locator('.title')).to_have_text(title)
+    expect(context.page.locator('.nhsuk-heading-l')).to_have_text(title)
 
 @then(u'I see a back link to "{url}"')
 def then_i_see_a_back_link_to(context, url):
diff --git a/tests/features/weight.feature b/tests/features/weight.feature
@@ -3,7 +3,7 @@ Feature: Weight page
     Given I am logged in
     When I go to "/weight"
     Then there are no accessibility violations
-    When I click "Continue"
+    When I click "Switch to stone and pounds"
     Then there are no accessibility violations
 
   Scenario: Metric form errors
@@ -18,6 +18,7 @@ Feature: Weight page
     When I fill in and submit my weight with "317.6"
     Then I am on "/weight"
     And I see a form error "Weight must be between 25.4kg and 317.5kg"
+    And there are no accessibility violations
 
   Scenario: Imperial form errors
     Given I am logged in
@@ -37,6 +38,7 @@ Feature: Weight page
     When I fill in and submit my weight with "50" stone and "1" pound
     Then I am on "/weight?unit=imperial"
     And I see a form error "Weight must be between 4 stone and 50 stone"
+    And there are no accessibility violations
 
   Scenario: Navigating backwards and forwards
     Given I am logged in
