From a5fdb80123ce3d9d77a224171fda062483b0e0d4 Mon Sep 17 00:00:00 2001 From: Paola Maddaluno <83777310+PaolaDMadd-Pro@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:02:47 +0100 Subject: [PATCH] [GRO-165] update content and fixed test suite --- .gitignore | 1 + apps/gro/translations/src/en/fields.json | 10 +++++----- apps/gro/translations/src/en/pages.json | 3 +++ apps/gro/translations/src/en/validation.json | 6 +++--- .../_features/gro/certificate_not_received.feature | 14 +++++++------- test/_features/gro/existing_enquiry.feature | 6 +++--- test/_features/gro/new_enquiry.feature | 2 +- test/_features/gro/nonUkCountries.feature | 3 +++ .../gro/other-issues-and-feedback.feature | 14 +++++++------- .../_features/gro/poor_quality_certificate.feature | 14 +++++++------- test/_features/gro/refund_query.feature | 14 +++++++------- test/_features/gro/service_complaint.feature | 14 +++++++------- .../gro/wrong_certificate_received.feature | 14 +++++++------- test/_integration/gro/validations.spec.js | 6 +++--- 14 files changed, 64 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 2f62b810..b35786d7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ coverage .nyc_output anchore-reports/ .env +dump.rdb diff --git a/apps/gro/translations/src/en/fields.json b/apps/gro/translations/src/en/fields.json index 9fd05a78..3a3cff64 100755 --- a/apps/gro/translations/src/en/fields.json +++ b/apps/gro/translations/src/en/fields.json @@ -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", @@ -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", diff --git a/apps/gro/translations/src/en/pages.json b/apps/gro/translations/src/en/pages.json index da119af7..6c983f77 100755 --- a/apps/gro/translations/src/en/pages.json +++ b/apps/gro/translations/src/en/pages.json @@ -121,6 +121,9 @@ }, "postcodeOrZIPCode": { "label": "Postcode or ZIP Code" + }, + "nonUkAddress":{ + "label": "Your current address" } } }, diff --git a/apps/gro/translations/src/en/validation.json b/apps/gro/translations/src/en/validation.json index 9345dc3c..c43a5843 100755 --- a/apps/gro/translations/src/en/validation.json +++ b/apps/gro/translations/src/en/validation.json @@ -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" diff --git a/test/_features/gro/certificate_not_received.feature b/test/_features/gro/certificate_not_received.feature index 9b393dd7..740090c3 100644 --- a/test/_features/gro/certificate_not_received.feature +++ b/test/_features/gro/certificate_not_received.feature @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' diff --git a/test/_features/gro/existing_enquiry.feature b/test/_features/gro/existing_enquiry.feature index 8cd2b725..6a9ba68f 100644 --- a/test/_features/gro/existing_enquiry.feature +++ b/test/_features/gro/existing_enquiry.feature @@ -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?' @@ -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?' @@ -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?' diff --git a/test/_features/gro/new_enquiry.feature b/test/_features/gro/new_enquiry.feature index 25727d67..daea9d4f 100644 --- a/test/_features/gro/new_enquiry.feature +++ b/test/_features/gro/new_enquiry.feature @@ -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?' diff --git a/test/_features/gro/nonUkCountries.feature b/test/_features/gro/nonUkCountries.feature index 04f2249b..29fbb2bd 100644 --- a/test/_features/gro/nonUkCountries.feature +++ b/test/_features/gro/nonUkCountries.feature @@ -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' diff --git a/test/_features/gro/other-issues-and-feedback.feature b/test/_features/gro/other-issues-and-feedback.feature index 44e87347..ff153200 100644 --- a/test/_features/gro/other-issues-and-feedback.feature +++ b/test/_features/gro/other-issues-and-feedback.feature @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' diff --git a/test/_features/gro/poor_quality_certificate.feature b/test/_features/gro/poor_quality_certificate.feature index 76eb0796..5c8619a1 100644 --- a/test/_features/gro/poor_quality_certificate.feature +++ b/test/_features/gro/poor_quality_certificate.feature @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' diff --git a/test/_features/gro/refund_query.feature b/test/_features/gro/refund_query.feature index 259debef..ba0f1146 100644 --- a/test/_features/gro/refund_query.feature +++ b/test/_features/gro/refund_query.feature @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' @@ -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?' diff --git a/test/_features/gro/service_complaint.feature b/test/_features/gro/service_complaint.feature index 628e94c9..6a118e97 100644 --- a/test/_features/gro/service_complaint.feature +++ b/test/_features/gro/service_complaint.feature @@ -44,7 +44,7 @@ Feature: Service complaint 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?' @@ -176,7 +176,7 @@ Feature: Service complaint 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?' @@ -311,7 +311,7 @@ Feature: Service complaint 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?' @@ -443,7 +443,7 @@ Feature: Service complaint 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?' @@ -576,7 +576,7 @@ Feature: Service complaint 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?' @@ -712,7 +712,7 @@ Feature: Service complaint 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?' @@ -849,7 +849,7 @@ Feature: Service complaint 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?' diff --git a/test/_features/gro/wrong_certificate_received.feature b/test/_features/gro/wrong_certificate_received.feature index 315de3d1..b2b2dd23 100644 --- a/test/_features/gro/wrong_certificate_received.feature +++ b/test/_features/gro/wrong_certificate_received.feature @@ -44,7 +44,7 @@ Feature: Wrong certificate 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?' @@ -150,7 +150,7 @@ Feature: Wrong certificate 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?' @@ -281,7 +281,7 @@ Feature: Wrong certificate 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?' @@ -409,7 +409,7 @@ Feature: Wrong certificate 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?' @@ -538,7 +538,7 @@ Feature: Wrong certificate 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?' @@ -670,7 +670,7 @@ Feature: Wrong certificate 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?' @@ -803,7 +803,7 @@ Feature: Wrong certificate 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?' diff --git a/test/_integration/gro/validations.spec.js b/test/_integration/gro/validations.spec.js index d472f926..7de1b291 100644 --- a/test/_integration/gro/validations.spec.js +++ b/test/_integration/gro/validations.spec.js @@ -364,7 +364,7 @@ describe('Validation - queries', () => { expect(validationSummary.length === 1).to.be.true; expect(validationSummary.html()) - .to.match(/Enter a county or state/); + .to.match(/Enter a county/); }); it('does not pass /address if countryOrState includes digits', async () => { @@ -383,7 +383,7 @@ describe('Validation - queries', () => { expect(validationSummary.length === 1).to.be.true; expect(validationSummary.html()) - .to.match(/Enter a county or state without including digits/); + .to.match(/Enter a county without including digits/); }); it('does not pass /address if postcodeOrZIPcode is left empty', async () => { @@ -402,7 +402,7 @@ describe('Validation - queries', () => { expect(validationSummary.length === 1).to.be.true; expect(validationSummary.html()) - .to.match(/Enter your postcode or ZIP Code/); + .to.match(/Enter your postcode/); }); });