Skip to content

Commit

Permalink
Merge pull request #4433 from DFE-Digital/update-mailing-list-postcode
Browse files Browse the repository at this point in the history
Update postcode content on the mailing list
  • Loading branch information
emmaachesongray authored Jan 6, 2025
2 parents 23b5709 + 08e6b4a commit eaecf1b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 29 deletions.
5 changes: 2 additions & 3 deletions app/views/event_steps/_personalised_updates.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
</span>
</summary>
<div class="govuk-details__text">
<p>We run in-person events in the UK that we can tell you about if you give us your UK postcode.</p>
<p>If you do not live in the UK, you do not need to give us your postcode.</p>
<p>Instead, you can just select 'Complete sign up' to finish signing up for your event.</p>
<p>We run in-person events in the UK. We can tell you about these if you give us your UK postcode.</p>
<p>If you do not live in the UK, you do not need to give us your postcode. Instead, you can just select 'Complete sign up' to finish signing up for your event.</p>
</div>
</details>
7 changes: 3 additions & 4 deletions app/views/mailing_list/steps/_postcode.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
size: "xl",
text: t('helpers.label.mailing_list_steps_postcode.address_postcode', **Value.data),
} do %>
<p>If you give us your postcode, we'll let you know about events happening near you.</p>
<p>We'll only use this to send you information about events happening near you.</p>
<% end %>

<details class="govuk-details">
Expand All @@ -16,8 +16,7 @@
</span>
</summary>
<div class="govuk-details__text">
<p>We run in-person events in the UK that we can tell you about if you give us your UK postcode.</p>
<p>If you do not live in the UK, you do not need to give us your postcode.</p>
<p>Instead, you can just select 'Complete sign up' to receive tailored guidance around teacher training.</p>
<p>We run in-person events in the UK. We can tell you about these if you give us your UK postcode.</p>
<p>If you do not live in the UK, you do not need to give us your postcode. Instead, you can just select 'Complete sign up' to receive tailored guidance about teacher training.</p>
</div>
</details>
8 changes: 4 additions & 4 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ en:
events_steps_contact_details:
address_telephone: What is your telephone number? (optional)
events_steps_personalised_updates:
address_postcode: What is your UK postcode? (optional)
address_postcode: What's your UK postcode? (optional)
degree_status_id: Do you have a degree?
consideration_journey_stage_id: How close are you to applying for teacher training?
preferred_teaching_subject_id: What do you want to teach?
Expand All @@ -811,7 +811,7 @@ en:
mailing_list_steps_subject:
preferred_teaching_subject_id: Which subject do you want to teach?
mailing_list_steps_postcode:
address_postcode: Your UK postcode (optional)
address_postcode: What's your UK postcode? (optional)

search:
search: Search for ...
Expand All @@ -826,10 +826,10 @@ en:
resent: We've sent you another email
events_steps_personalised_updates:
address_postcode: |-
If you give us your postcode, we'll let you know about events happening near you.
We'll only use this to send you information about events happening near you.
mailing_list_signup:
address_postcode: |-
If you give us your postcode, we'll let you know about events happening near you.
We'll only use this to send you information about events happening near you.
teacher_training_adviser_steps_what_subject_degree:
degree_subject: "Type to enter your degree subject or select from the suggestions."
degree_subject_nojs: "Type to enter your degree subject."
Expand Down
2 changes: 1 addition & 1 deletion docs/sign-up-journeys.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ graph TD;
teacher_training --> subject[Which subject do you want to teach?]
subject --> postcode["Your UK postcode (optional)"]
subject --> postcode["What's your UK postcode? (optional)"]
postcode --> show_welcome_guide{Show welcome guide?}
Expand Down
6 changes: 3 additions & 3 deletions spec/features/event_wizard_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
end
click_on "Complete sign up"

expect(page).not_to have_text("What is your UK postcode? (optional)")
expect(page).not_to have_text("What's your UK postcode? (optional)")
fill_in_personalised_updates

expect_sign_up_with_attributes(
Expand Down Expand Up @@ -304,8 +304,8 @@ def fill_in_personalised_updates(
)
select_value_or_default "Do you have a degree?", degree_status
select_value_or_default "How close are you to applying for teacher training?", consideration_journey_stage
if page.has_text?("What is your UK postcode? (optional)")
fill_in "What is your UK postcode? (optional)", with: postcode
if page.has_text?("What's your UK postcode? (optional)")
fill_in "What's your UK postcode? (optional)", with: postcode
end
select_value_or_default "What do you want to teach?", preferred_teaching_subject
end
Expand Down
20 changes: 10 additions & 10 deletions spec/features/mailing_list_wizard_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_title("You've signed up | Get Into Teaching")
Expand Down Expand Up @@ -77,8 +77,8 @@
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_text "Test, you're signed up"
Expand Down Expand Up @@ -116,8 +116,8 @@
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_text "Test, you're signed up"
Expand Down Expand Up @@ -155,8 +155,8 @@
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_text "Test, you're signed up"
Expand Down Expand Up @@ -345,8 +345,8 @@
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: ""
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: ""
click_on "Complete sign up"

expect(page).to have_text "you're signed up"
Expand Down
8 changes: 4 additions & 4 deletions spec/integration/mailing_list_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def sign_up(first_name, last_name, email)
select "Chemistry"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_text("you're signed up")
Expand Down Expand Up @@ -88,8 +88,8 @@ def sign_up_if_not_qualified(first_name, last_name, email)
select "Maths"
click_on "Next step"

expect(page).to have_text "If you give us your postcode"
fill_in "Your UK postcode (optional)", with: "TE57 1NG"
expect(page).to have_text "We'll only use this to send you information about events happening near you"
fill_in "What's your UK postcode? (optional)", with: "TE57 1NG"
click_on "Complete sign up"

expect(page).to have_text("you're signed up")
Expand Down

0 comments on commit eaecf1b

Please sign in to comment.