Skip to content

Commit

Permalink
[GRO-165] update content and fixed test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaolaDMadd-Pro
PaolaDMadd-Pro committed Apr 5, 2024
1 parent ee8dc8f commit a5fdb80
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 57 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ coverage
.nyc_output
anchore-reports/
.env
dump.rdb
10 changes: 5 additions & 5 deletions apps/gro/translations/src/en/fields.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"country-select": {
"summary": "Country",
"label": "Select a country",
"hint": "Start to type the country name and options will appear"
"hint": "Start to type and select from the list"
},
"building": {
"label": "Building and street",
Expand All @@ -231,12 +231,12 @@
"changeLinkDescription": "Your current town or city"
},
"countyOrState": {
"label": "County or state",
"changeLinkDescription": "Your current county or state"
"label": "County",
"changeLinkDescription": "Your current county"
},
"postcodeOrZIPCode": {
"label": "Postcode or ZIP Code",
"changeLinkDescription": "Your current postcode or ZIP Code"
"label": "Postcode",
"changeLinkDescription": "Your current postcode"
},
"nonUkAddress": {
"label": "Your current address",
Expand Down
3 changes: 3 additions & 0 deletions apps/gro/translations/src/en/pages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
},
"postcodeOrZIPCode": {
"label": "Postcode or ZIP Code"
},
"nonUkAddress":{
"label": "Your current address"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions apps/gro/translations/src/en/validation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@
"regex": "Enter a town or city without including digits"
},
"countyOrState": {
"default": "Enter a county or state",
"regex": "Enter a county or state without including digits"
"default": "Enter a county",
"regex": "Enter a county without including digits"
},
"postcodeOrZIPCode": {
"default": "Enter your postcode or ZIP Code"
"default": "Enter your postcode"
},
"nonUkAddress": {
"default": "Enter your address"
Expand Down
14 changes: 7 additions & 7 deletions test/_features/gro/certificate_not_received.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -172,7 +172,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -303,7 +303,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -431,7 +431,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -560,7 +560,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -692,7 +692,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -825,7 +825,7 @@ Feature: Order not received
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
6 changes: 3 additions & 3 deletions test/_features/gro/existing_enquiry.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Feature: Existing Enquiry
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I click the 'Continue' button
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'sas-hof-test@digital.homeoffice.gov.uk'
Then I click the 'Continue' button
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -107,7 +107,7 @@ Feature: Existing Enquiry
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I click the 'Continue' button
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'sas-hof-test@digital.homeoffice.gov.uk'
Then I click the 'Continue' button
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -167,7 +167,7 @@ Feature: Existing Enquiry
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I click the 'Continue' button
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'sas-hof-test@digital.homeoffice.gov.uk'
Then I click the 'Continue' button
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
2 changes: 1 addition & 1 deletion test/_features/gro/new_enquiry.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Feature: New Enquiry
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I click the 'Continue' button
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'sas-hof-test@digital.homeoffice.gov.uk'
Then I click the 'Continue' button
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
3 changes: 3 additions & 0 deletions test/_features/gro/nonUkCountries.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ Feature: testing
Then I should be on the 'email-address' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'Yes'
Then I select 'Continue'
Then I should be on the 'country' page showing 'What country is your address located?'
Then I fill 'country-select' with 'France' option
Then I select 'Continue'
Expand Down
14 changes: 7 additions & 7 deletions test/_features/gro/other-issues-and-feedback.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -176,7 +176,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -310,7 +310,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -442,7 +442,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -575,7 +575,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -711,7 +711,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -848,7 +848,7 @@ Feature: Other issues and feedback
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
14 changes: 7 additions & 7 deletions test/_features/gro/poor_quality_certificate.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -147,7 +147,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -278,7 +278,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -406,7 +406,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -535,7 +535,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -667,7 +667,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -800,7 +800,7 @@ Feature: Poor quality certificate
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
14 changes: 7 additions & 7 deletions test/_features/gro/refund_query.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -147,7 +147,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -278,7 +278,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -406,7 +406,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -535,7 +535,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -667,7 +667,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down Expand Up @@ -800,7 +800,7 @@ Feature: Refund query
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Then I choose 'No'
Then I select 'Continue'
Then I should be on the 'email-address/edit' page showing 'What is your email address?'
Then I should be on the 'email-address/' page showing 'What is your email address?'
Then I fill 'email-text' with 'test@test.com'
Then I select 'Continue'
Then I should be on the 'check-email' page showing 'Is the email address you entered correct?'
Expand Down
Loading

0 comments on commit a5fdb80

Please sign in to comment.