Skip to content

Commit 242620e

Browse files
mrlockstarmrlockstar
authored
Merge branch 'main' into PPHA-785-Create-500-error-Alarms-only
2 parents e341a17 + ccc49d8 commit 242620e

32 files changed

Lines changed: 387 additions & 116 deletions

‎.github/dependabot.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,33 @@ updates:
66
directory: "/"
77
schedule:
88
interval: "daily"
9+
cooldown:
10+
default-days: 7
911

1012
- package-ecosystem: "github-actions"
1113
directory: "/"
1214
schedule:
1315
interval: "daily"
16+
cooldown:
17+
default-days: 7
1418

1519
- package-ecosystem: "npm"
1620
directory: "/"
1721
schedule:
1822
interval: "daily"
23+
cooldown:
24+
default-days: 7
1925

2026
- package-ecosystem: "pip"
2127
directory: "/"
2228
schedule:
2329
interval: "daily"
30+
cooldown:
31+
default-days: 7
2432

2533
- package-ecosystem: "terraform"
2634
directory: "/"
2735
schedule:
2836
interval: "daily"
37+
cooldown:
38+
default-days: 7

‎.vscode/settings.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
},
99
"cSpell.language": "en-GB",
1010
"cSpell.words": [
11+
"addgroup",
12+
"adduser",
1113
"columnheader",
1214
"dateutil",
1315
"DHSC",
@@ -31,12 +33,16 @@
3133
"qualitygate",
3234
"relativedelta",
3335
"responseset",
36+
"rollup",
3437
"rowgroup",
3538
"sonarsource",
3639
"stylesheet",
3740
"toplevel",
3841
"UKGDPR",
3942
"unsubmitted",
40-
"whitenoise"
43+
"userinfo",
44+
"venv",
45+
"whitenoise",
46+
"wsgi"
4147
],
4248
}

‎features/age_when_started_smoking.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Feature: Age when started smoking
5252
Then I am on "/age-when-started-smoking?change=True"
5353
And I see "18" filled in for "How old were you when you started smoking?"
5454
When I fill in "How old were you when you started smoking?" as "22" and submit
55-
Then I am on "/periods-when-you-stopped-smoking?change=True"
55+
Then I am on "/check-your-answers"
5656

5757
Scenario: Checking responses and changing them as a former smoker
5858
Given I am logged in
@@ -67,4 +67,4 @@ Feature: Age when started smoking
6767
Then I am on "/age-when-started-smoking?change=True"
6868
And I see "18" filled in for "How old were you when you started smoking?"
6969
When I fill in "How old were you when you started smoking?" as "22" and submit
70-
Then I am on "/when-you-quit-smoking?change=True"
70+
Then I am on "/check-your-answers"

‎features/questionnaire.feature‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ Feature: Questionnaire
7676
When I check "Cigarettes"
7777
And I submit the form
7878

79-
Then I am on "/cigarettes-smoking-current"
80-
When I check "Yes" and submit
81-
82-
Then I am on "/cigarettes-smoked-total-years"
83-
When I fill in "Roughly how many years have you smoked cigarettes?" with "10"
84-
And I submit the form
85-
8679
Then I am on "/cigarettes-smoking-frequency"
8780
When I check "Daily" and submit
8881

@@ -113,7 +106,7 @@ Feature: Questionnaire
113106
And I see "18" as a response to "Age you started smoking" under "Smoking history"
114107
And I see "Yes (10 years)" as a response to "Have you ever stopped smoking for periods of 1 year or longer?" under "Smoking history"
115108

116-
And I see "10" as a response to "Total number of years you smoked cigarettes" under "Smoking history"
109+
And I see "37" as a response to "Total number of years you smoked cigarettes" under "Smoking history"
117110
And I see "15 cigarettes a day" as a response to "Current cigarette smoking" under "Smoking history"
118111

119112
When I click "Submit"

‎features/smoked_amount.feature‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Feature: Smoked amount page
44
Scenario: The page is accessible
55
Given I am logged in
66
And I have answered questions showing I am eligible
7+
And I have answered questions showing I have smoked for "10" years
78
And I have answered questions showing I currently smoke "Cigarettes"
89
And I have answered questions showing I have smoked "Cigarettes" daily
910
When I go to "/cigarettes-smoked-amount"
@@ -12,6 +13,7 @@ Feature: Smoked amount page
1213
Scenario: Form errors
1314
Given I am logged in
1415
And I have answered questions showing I am eligible
16+
And I have answered questions showing I have smoked for "10" years
1517
And I have answered questions showing I currently smoke "Cigarettes"
1618
And I have answered questions showing I have smoked "Cigarettes" daily
1719
When I go to "/cigarettes-smoked-amount"
@@ -23,6 +25,7 @@ Feature: Smoked amount page
2325
Scenario: Navigating backwards and forwards
2426
Given I am logged in
2527
And I have answered questions showing I am eligible
28+
And I have answered questions showing I have smoked for "10" years
2629
And I have answered questions showing I currently smoke "Cigarettes"
2730
And I have answered questions showing I have smoked "Cigarettes" daily
2831
When I go to "/cigarettes-smoked-amount"

‎features/smoked_total_years.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Feature: Smoked total years page
1414
Given I am logged in
1515
And I have answered questions showing I am eligible
1616
And I have answered questions showing I have smoked for "10" years
17-
And I have answered questions showing I have smoked "Cigarettes"
17+
And I have answered questions showing I have smoked "Cigarettes, Pipe"
1818
And I have answered questions showing I currently smoke "Cigarettes"
1919
When I go to "/cigarettes-smoked-total-years"
2020
And I click "Continue"

‎features/smoking_change.feature‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Feature: Smoking change page
33
Scenario: The page is accessible
44
Given I am logged in
55
And I have answered questions showing I am eligible
6+
And I have answered questions showing I have smoked for "10" years
67
And I have answered questions showing I currently smoke "Cigarettes"
78
And I have answered questions showing I have smoked 10 "Cigarettes" "daily"
89
When I go to "/cigarettes-smoking-change"
@@ -11,6 +12,7 @@ Feature: Smoking change page
1112
Scenario: Form errors
1213
Given I am logged in
1314
And I have answered questions showing I am eligible
15+
And I have answered questions showing I have smoked for "10" years
1416
And I have answered questions showing I currently smoke "Cigarettes"
1517
And I have answered questions showing I have smoked 10 "Cigarettes" "daily"
1618
When I go to "/cigarettes-smoking-change"
@@ -25,6 +27,7 @@ Feature: Smoking change page
2527
Scenario: Navigating backwards and forwards
2628
Given I am logged in
2729
And I have answered questions showing I am eligible
30+
And I have answered questions showing I have smoked for "10" years
2831
And I have answered questions showing I currently smoke "Cigarettes"
2932
And I have answered questions showing I have smoked 10 "Cigarettes" "daily"
3033
When I go to "/cigarettes-smoking-change"

‎features/smoking_current.feature‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ Feature: Smoking current page
44
Scenario: The page is accessible
55
Given I am logged in
66
And I have answered questions showing I am eligible
7+
And I have answered questions showing I have smoked for "10" years
78
And I have answered questions showing I have smoked "Cigarettes"
89
When I go to "/cigarettes-smoking-current"
910
Then there are no accessibility violations
1011

1112
Scenario: Form errors
1213
Given I am logged in
1314
And I have answered questions showing I am eligible
14-
And I have answered questions showing I have smoked "Cigarettes"
15+
And I have answered questions showing I have smoked for "10" years
16+
And I have answered questions showing I have smoked "Cigarettes, Pipe"
1517
When I go to "/cigarettes-smoking-current"
1618
And I click "Continue"
1719
Then I am on "/cigarettes-smoking-current"

‎features/smoking_frequency.feature‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Feature: Smoking frequency page
44
Scenario: The page is accessible
55
Given I am logged in
66
And I have answered questions showing I am eligible
7+
And I have answered questions showing I have smoked for "10" years
78
And I have answered questions showing I have smoked "Cigarettes"
89
And I have answered questions showing I currently smoke "Cigarettes"
910
When I go to "/cigarettes-smoking-frequency"
@@ -12,6 +13,7 @@ Feature: Smoking frequency page
1213
Scenario: Form errors
1314
Given I am logged in
1415
And I have answered questions showing I am eligible
16+
And I have answered questions showing I have smoked for "10" years
1517
And I have answered questions showing I have smoked "Cigarettes"
1618
And I have answered questions showing I currently smoke "Cigarettes"
1719
When I go to "/cigarettes-smoking-frequency"
@@ -25,15 +27,15 @@ Feature: Smoking frequency page
2527
And I have answered questions showing I am eligible
2628
And I have answered questions showing I have smoked for "10" years
2729
And I have answered questions showing I currently smoke "Cigarettes"
28-
And I have answered questions showing I have smoked "Cigarettes"
2930
When I go to "/cigarettes-smoking-frequency"
30-
Then I see a back link to "/cigarettes-smoked-total-years"
31+
Then I see a back link to "/types-tobacco-smoking"
3132
When I check "Daily" and submit
3233
Then I am on "/cigarettes-smoked-amount"
3334

3435
Scenario: When I say that I have increased the amount I smoke I am shown the correct page
3536
Given I am logged in
3637
And I have answered questions showing I am eligible
38+
And I have answered questions showing I have smoked for "10" years
3739
And I have answered questions showing I currently smoke "Cigarettes"
3840
And I have answered questions showing I have smoked 10 "Cigarettes" "daily"
3941
And I have answered questions showing I have "increased" my level of "Cigarettes" smoking from "10 cigarettes a day"

‎features/smoking_history.feature‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ Feature: Smoking history pages
66
And I have answered questions showing I have smoked for "30" years
77
When I go to "/types-tobacco-smoking"
88
And I check "Cigarettes"
9-
And I check "Cigarettes"
10-
And I submit the form
11-
12-
Then I am on "/cigarettes-smoking-current"
13-
When I check "Yes"
14-
And I submit the form
15-
16-
Then I am on "/cigarettes-smoked-total-years"
17-
When I fill in "Roughly how many years have you smoked cigarettes?" with "15"
189
And I submit the form
1910

2011
Then I am on "/cigarettes-smoking-frequency"
@@ -55,7 +46,7 @@ Feature: Smoking history pages
5546
And I submit the form
5647

5748
Then I am on "/check-your-answers"
58-
Then I see "15 years" as a response to "Total number of years you smoked cigarettes" under "Cigarette smoking history"
49+
Then I see "30 years" as a response to "Total number of years you smoked cigarettes" under "Cigarette smoking history"
5950
And I see "10 cigarettes a day" as a response to "Current cigarette smoking" under "Cigarette smoking history"
6051
And I see "200 cigarettes a week for 5 years" as a response to "When you smoked more than 10 cigarettes a day" under "Cigarette smoking history"
6152
And I see "1 cigarettes a month for 2 years" as a response to "When you smoked fewer than 10 cigarettes a day" under "Cigarette smoking history"

0 commit comments

Comments
 (0)