From 66f1635868bc9c4ac7dc041b0282b43c0d2caaff Mon Sep 17 00:00:00 2001 From: Richard Pattinson Date: Thu, 8 Aug 2024 09:23:52 +0100 Subject: [PATCH] Implement content audit suggestions --- app/components/trn_details_component.rb | 2 +- app/views/date_of_birth/edit.html.erb | 2 +- app/views/email/edit.html.erb | 2 +- app/views/itt_providers/edit.html.erb | 6 +++--- app/views/name/edit.html.erb | 4 ++-- app/views/pages/you_dont_have_a_trn.html.erb | 4 ++-- spec/components/trn_details_component_spec.rb | 2 +- spec/system/active_sanctions_spec.rb | 2 +- spec/system/identity/identity_spec.rb | 4 ++-- spec/system/matching_spec.rb | 8 ++++---- spec/system/smoke_spec.rb | 6 +++--- spec/system/trn_requests_spec.rb | 12 ++++++------ spec/system/zendesk_tickets_spec.rb | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app/components/trn_details_component.rb b/app/components/trn_details_component.rb index 6315b0e22..2c05de777 100644 --- a/app/components/trn_details_component.rb +++ b/app/components/trn_details_component.rb @@ -76,7 +76,7 @@ def awarded_qts_value def itt_provider_key return "Where did you get your QTS?" if @trn_request.itt_provider_enrolled - "Did a university, SCITT or school award your QTS?" + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?" end def itt_provider_value diff --git a/app/views/date_of_birth/edit.html.erb b/app/views/date_of_birth/edit.html.erb index 8203019b7..086020737 100644 --- a/app/views/date_of_birth/edit.html.erb +++ b/app/views/date_of_birth/edit.html.erb @@ -8,7 +8,7 @@ <%= f.govuk_date_field( :date_of_birth, date_of_birth: true, - legend: { tag: 'h1', size: 'xl', text: 'Your date of birth' }, + legend: { tag: 'h1', size: 'xl', text: 'What is your date of birth?' }, hint: { text: 'For example, 27 3 1987' } ) %> diff --git a/app/views/email/edit.html.erb b/app/views/email/edit.html.erb index fafc6036b..a24bb80eb 100644 --- a/app/views/email/edit.html.erb +++ b/app/views/email/edit.html.erb @@ -5,7 +5,7 @@ <%= f.govuk_error_summary %> <%= f.govuk_email_field( :email, - label: { tag: 'h1', size: 'xl', text: 'Your email address' }, + label: { tag: 'h1', size: 'xl', text: 'What is your email address' }, hint: { text: 'If we can find your TRN, we’ll send it to the email address you give.' } ) %> diff --git a/app/views/itt_providers/edit.html.erb b/app/views/itt_providers/edit.html.erb index 347d65c6d..f61918788 100644 --- a/app/views/itt_providers/edit.html.erb +++ b/app/views/itt_providers/edit.html.erb @@ -1,9 +1,9 @@ -<% content_for :page_title, "#{'Error: ' if @itt_provider_form.errors.any?}Did a university, SCITT or school award your QTS?" %> +<% content_for :page_title, "#{'Error: ' if @itt_provider_form.errors.any?}Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?" %> <%= content_for :back_link_url, back_link_url(awarded_qts_path) %> <%= form_with model: @itt_provider_form, url: itt_provider_path do |f| %> <%= f.govuk_error_summary %> - <%= f.govuk_radio_buttons_fieldset(:itt_provider_enrolled, legend: { tag: 'h1', size: 'xl', text: 'Did a university, SCITT or school award your QTS?' }) do %> + <%= f.govuk_radio_buttons_fieldset(:itt_provider_enrolled, legend: { tag: 'h1', size: 'l', text: 'Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?' }) do %> <%= f.govuk_radio_button :itt_provider_enrolled, true, label: { text: 'Yes' }, link_errors: true do %> <% if FeatureFlag.active?(:use_dqt_api_itt_providers) %> <%= render DfE::Autocomplete::View.new( @@ -16,7 +16,7 @@ f.object.itt_provider_name, ), label: { text: 'Where did you get your QTS?', class: 'govuk-label govuk-label--s' }, - hint: { text: 'Your university, SCITT, school or other training provider' }, + hint: { text: 'Enter your university, SCITT, school or other training provider' }, ) ) %> <% else %> diff --git a/app/views/name/edit.html.erb b/app/views/name/edit.html.erb index 998429f0d..07da35091 100644 --- a/app/views/name/edit.html.erb +++ b/app/views/name/edit.html.erb @@ -7,10 +7,10 @@ <%= f.govuk_error_summary %>

- What’s your name? + What is your name?

-

Use the name on your official documents, such as your passport.

+

Use the name on your official documents, such as your passport, driving licence or birth certificate

<%= f.govuk_text_field(:first_name, label: { size: 's', text: 'First name' }, diff --git a/app/views/pages/you_dont_have_a_trn.html.erb b/app/views/pages/you_dont_have_a_trn.html.erb index f62b26729..aaa570bc0 100644 --- a/app/views/pages/you_dont_have_a_trn.html.erb +++ b/app/views/pages/you_dont_have_a_trn.html.erb @@ -8,7 +8,7 @@

How to get a TRN

If you’re eligible for a TRN in England, you should be allocated one automatically by the Teaching Regulation Agency or Capita Teachers’ Pensions.

-

If you do not have a TRN but need one to do a national professional qualification (NPQ), you can <%= govuk_link_to "request a TRN", "https://www.gov.uk/guidance/teacher-reference-number-trn" %>.

+

If you do not have a TRN but need one to do an NPQ, you can <%= govuk_link_to "request a TRN", "https://www.gov.uk/guidance/teacher-reference-number-trn" %>.

What a TRN is for

You need a TRN to:

@@ -16,7 +16,7 @@
  • access your teaching qualifications to download your certificates, change the name on them or check details of your initial teacher training and induction
  • give to employers so they can complete mandatory teacher status checks
  • manage records of your contributions to the Teachers’ Pensions scheme
    • -
  • give to the Department for Education (DfE) when you have been awarded QTS so you can begin your early career teacher induction
    • +
  • give to the DfE when you have been awarded QTS so you can begin your early career teacher induction
  • register for an NPQ
    • diff --git a/spec/components/trn_details_component_spec.rb b/spec/components/trn_details_component_spec.rb index 72470be61..137369429 100644 --- a/spec/components/trn_details_component_spec.rb +++ b/spec/components/trn_details_component_spec.rb @@ -218,7 +218,7 @@ it do is_expected.to include( - "Did a university, SCITT or school award your QTS?", + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?", ) end it { is_expected.to include("No, I was awarded QTS another way") } diff --git a/spec/system/active_sanctions_spec.rb b/spec/system/active_sanctions_spec.rb index d105e9049..c976cdb1b 100644 --- a/spec/system/active_sanctions_spec.rb +++ b/spec/system/active_sanctions_spec.rb @@ -72,7 +72,7 @@ def when_i_fill_in_my_ni_number alias_method :and_i_fill_in_my_ni_number, :when_i_fill_in_my_ni_number def when_i_fill_in_my_email_address - fill_in "Your email address", with: "test@example.com" + fill_in "What is your email address?", with: "test@example.com" end alias_method :and_i_fill_in_my_email_address, :when_i_fill_in_my_email_address diff --git a/spec/system/identity/identity_spec.rb b/spec/system/identity/identity_spec.rb index 356dfe14d..0c973739f 100644 --- a/spec/system/identity/identity_spec.rb +++ b/spec/system/identity/identity_spec.rb @@ -284,11 +284,11 @@ def then_i_see_the_check_answers_page end def then_i_see_the_name_page - expect(page).to have_content("What’s your name?") + expect(page).to have_content("What is your name?") end def then_i_see_the_date_of_birth_page - expect(page).to have_content("Your date of birth") + expect(page).to have_content("What is your date of birth") end def then_i_see_the_have_ni_number_page diff --git a/spec/system/matching_spec.rb b/spec/system/matching_spec.rb index 000534508..caf0abbef 100644 --- a/spec/system/matching_spec.rb +++ b/spec/system/matching_spec.rb @@ -85,11 +85,11 @@ def then_i_see_the_check_trn_page end def then_i_see_the_date_of_birth_page - expect(page).to have_content("Your date of birth") + expect(page).to have_content("What is your date of birth") end def then_i_see_the_email_page - expect(page).to have_content("Your email address") + expect(page).to have_content("What is your email address") end def then_i_see_the_have_ni_page @@ -100,7 +100,7 @@ def then_i_see_the_have_ni_page def then_i_see_the_itt_provider_page expect(page).to have_content( - "Did a university, SCITT or school award your QTS?", + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?", ) end @@ -171,7 +171,7 @@ def when_i_confirm_i_have_a_trn_number end def when_i_fill_in_my_email_address - fill_in "Your email address", with: "kevin.e@example.com" + fill_in "What is your email address?", with: "kevin.e@example.com" end def when_i_fill_in_my_itt_provider diff --git a/spec/system/smoke_spec.rb b/spec/system/smoke_spec.rb index 32f617947..c2de5bf90 100644 --- a/spec/system/smoke_spec.rb +++ b/spec/system/smoke_spec.rb @@ -76,7 +76,7 @@ def then_i_see_the_check_trn_page end def then_i_see_the_date_of_birth_page - expect(page).to have_content("Your date of birth") + expect(page).to have_content("What is your date of birth") end def then_i_see_the_email_page @@ -89,7 +89,7 @@ def then_i_see_the_have_ni_page def then_i_see_the_itt_provider_page expect(page).to have_content( - "Did a university, SCITT or school award your QTS?", + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?", ) end @@ -129,7 +129,7 @@ def when_i_confirm_i_have_a_trn_number end def when_i_fill_in_my_email_address - fill_in "Your email address", with: "kevin@kevin.com" + fill_in "What is your email address?", with: "kevin@kevin.com" end def when_i_fill_in_my_itt_provider diff --git a/spec/system/trn_requests_spec.rb b/spec/system/trn_requests_spec.rb index 431f68eda..4180b4d4a 100644 --- a/spec/system/trn_requests_spec.rb +++ b/spec/system/trn_requests_spec.rb @@ -761,7 +761,7 @@ def then_i_see_the_date_of_birth_page expect(page.driver.browser.current_title).to start_with( "Your date of birth", ) - expect(page).to have_content("Your date of birth") + expect(page).to have_content("What is your date of birth") end alias_method :then_i_am_redirected_to_the_date_of_birth_page, :then_i_see_the_date_of_birth_page @@ -771,7 +771,7 @@ def then_i_see_the_email_page expect(page.driver.browser.current_title).to start_with( "Your email address", ) - expect(page).to have_content("Your email address") + expect(page).to have_content("What is your email address") end def then_i_see_the_existing_name @@ -787,10 +787,10 @@ def then_i_see_the_home_page def then_i_see_the_itt_provider_page expect(page).to have_current_path("/itt-provider") expect(page.driver.browser.current_title).to start_with( - "Did a university, SCITT or school award your QTS?", + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?", ) expect(page).to have_content( - "Did a university, SCITT or school award your QTS?", + "Did a university, School Centred Initial Teacher Training (SCITT) provider or school award your QTS?", ) end @@ -1055,12 +1055,12 @@ def when_i_press_back alias_method :and_i_press_back, :when_i_press_back def when_i_fill_in_my_email_address - fill_in "Your email address", with: "kevin@kevin.com" + fill_in "What is your email address?", with: "kevin@kevin.com" end alias_method :and_i_fill_in_my_email_address, :when_i_fill_in_my_email_address def when_i_fill_in_my_new_email_address - fill_in "Your email address", with: "new@example.com" + fill_in "What is your email address?", with: "new@example.com" end alias_method :and_i_fill_in_my_new_email_address, :when_i_fill_in_my_new_email_address diff --git a/spec/system/zendesk_tickets_spec.rb b/spec/system/zendesk_tickets_spec.rb index b9b57a4c6..c8cb79de8 100644 --- a/spec/system/zendesk_tickets_spec.rb +++ b/spec/system/zendesk_tickets_spec.rb @@ -90,7 +90,7 @@ def given_there_is_a_completed_trn_request click_on "Continue" click_on "Continue" - fill_in "Your email address", with: "kevin@kevin.com" + fill_in "What is your email address?", with: "kevin@kevin.com" click_on "Continue" fill_in "First name", with: "Not"