Fix and add to ui tests

Author: jamiefalcus

.vscode/settings.json

@@ -9,6 +9,8 @@
   "cSpell.language": "en-GB",
   "cSpell.words": [
     "dateutil",
+    "Dproject",
+    "Dsonar",
     "endcall",
     "endfor",
     "endset",
@@ -20,8 +22,10 @@
     "novalidate",
     "psycopg",
     "pyjwt",
+    "qualitygate",
     "relativedelta",
     "responseset",
+    "sonarsource",
     "stylesheet",
     "toplevel",
     "unsubmitted",

tests/features/questionnaire.feature

@@ -44,9 +44,12 @@ Feature: Questionnaire
     When I fill in and submit my cancer diagnosis with "No"
     Then I am on "/family-history-lung-cancer"
     And I see a back link to "/cancer-diagnosis"
-    When I fill in and submit my family history lung cancer with "No"
-    Then I am on "/responses"
+    When I fill in and submit my family history lung cancer with "Yes"
+    Then I am on "/relatives-age-when-diagnosed"
     And I see a back link to "/family-history-lung-cancer"
+    When I fill in and submit my relatives age when diagnosed with "Yes, they were younger than 60"
+    Then I am on "/responses"
+    And I see a back link to "/relatives-age-when-diagnosed"
     And I see responses "Have you ever smoked? Yes, I used to smoke"
     And I see responses "What is your date of birth?" with a date 55 years ago
     And I see responses "What is your height? 5 feet 7 inches"
@@ -56,3 +59,6 @@ Feature: Questionnaire
     And I see responses "What is your ethnic background? White"
     And I see responses "Have you ever worked in a job where you might have been exposed to asbestos? No"
     And I see responses "Have you ever been diagnosed with any of the following respiratory conditions? Pneumonia and Emphysema"
+    And I see responses "Have you ever been diagnosed with cancer? No"
+    And I see responses "Have any of your parents, siblings or children ever been diagnosed with lung cancer Yes"
+    And I see responses "Were any of your relatives younger than 60 years old when they were diagnosed with lung cancer? Yes, they were younger than 60"

tests/features/steps/form_steps.py

@@ -84,6 +84,11 @@ def when_i_fill_in_and_submit_my_cancer_diagnosis(context, family_history_lung_c
     context.page.get_by_label(family_history_lung_cancer, exact=True).check()
     when_i_submit_the_form(context)
 
+@when(u'I fill in and submit my relatives age when diagnosed with "{relatives_age_when_diagnosed}"')
+def when_i_fill_in_and_submit_my_cancer_diagnosis(context, relatives_age_when_diagnosed):
+    context.page.get_by_label(relatives_age_when_diagnosed, exact=True).check()
+    when_i_submit_the_form(context)
+
 @when('I submit the form')
 def when_i_submit_the_form(context):
     context.page.click("text=Continue")

tests/features/validation_errors.feature

@@ -123,3 +123,30 @@ Feature: Validation errors
     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'"
+
+  Scenario: Respiratory conditions form errors
+    Given I am logged in
+    And I have started the questionnaire
+    When I go to "/cancer-diagnosis"
+    And I submit the form
+    Then I am on "/cancer-diagnosis"
+    And I see a form error "Select if you have been diagnosed with cancer"
+
+  Scenario: Respiratory conditions form errors
+    Given I am logged in
+    And I have started the questionnaire
+    When I go to "/family-history-lung-cancer"
+    And I submit the form
+    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"
+
+  Scenario: Respiratory conditions form errors
+    Given I am logged in
+    And I have started the questionnaire
+    When I go to "/relatives-age-when-diagnosed"
+    Then I am on "/family-history-lung-cancer"
+    When I fill in and submit my family history lung cancer with "Yes"
+    Then I am on "/relatives-age-when-diagnosed"
+    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"