Skip to content

Commit

Permalink
Implement content audit suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
richardpattinson committed Aug 8, 2024
1 parent 086ad6e commit 66f1635
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion app/components/trn_details_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/date_of_birth/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
)
%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/email/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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.' }
)
%>
Expand Down
6 changes: 3 additions & 3 deletions app/views/itt_providers/edit.html.erb
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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 %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/name/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
What’s your name?
What is your name?
</h1>

<p>Use the name on your official documents, such as your passport.</p>
<p>Use the name on your official documents, such as your passport, driving licence or birth certificate</p>

<%= f.govuk_text_field(:first_name,
label: { size: 's', text: 'First name' },
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/you_dont_have_a_trn.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<h2 class="govuk-heading-l" id="how-to-get-a-trn">How to get a TRN</h2>
<p class="govuk-body">If you’re eligible for a TRN in England, you should be allocated one automatically by the Teaching Regulation Agency or Capita Teachers’ Pensions.</p>

<p class="govuk-body">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" %>.</p>
<p class="govuk-body">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" %>.</p>

<h2 class="govuk-heading-l" id="what-a-trn-is-for">What a TRN is for</h2>
<p class="govuk-body">You need a TRN to:</p>
<ul class="govuk-list govuk-list--bullet">
<li><a class="govuk-link" href="https://access-your-teaching-qualifications.education.gov.uk">access your teaching qualifications</a> to download your certificates, change the name on them or check details of your initial teacher training and induction</li>
<li>give to employers so they can complete mandatory teacher status checks</li>
<li>manage records of your contributions to the Teachers’ Pensions scheme</li>
<li>give to the Department for Education (DfE) when you have been awarded QTS so you can begin your early career teacher induction</li>
<li>give to the DfE when you have been awarded QTS so you can begin your early career teacher induction</li>
<li>register for an NPQ</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion spec/components/trn_details_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
Expand Down
2 changes: 1 addition & 1 deletion spec/system/active_sanctions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
end
alias_method :and_i_fill_in_my_email_address, :when_i_fill_in_my_email_address

Expand Down
4 changes: 2 additions & 2 deletions spec/system/identity/identity_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions spec/system/matching_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
end

def when_i_fill_in_my_itt_provider
Expand Down
6 changes: 3 additions & 3 deletions spec/system/smoke_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
end

def when_i_fill_in_my_itt_provider
Expand Down
12 changes: 6 additions & 6 deletions spec/system/trn_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
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: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
end
alias_method :and_i_fill_in_my_new_email_address,
:when_i_fill_in_my_new_email_address
Expand Down
2 changes: 1 addition & 1 deletion spec/system/zendesk_tickets_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def given_there_is_a_completed_trn_request
click_on "Continue"
click_on "Continue"

fill_in "Your email address", with: "[email protected]"
fill_in "What is your email address?", with: "[email protected]"
click_on "Continue"

fill_in "First name", with: "Not"
Expand Down

0 comments on commit 66f1635

Please sign in to comment.