From 7f190c0e0a7275e7e68a396dd97b17aaea92cebc Mon Sep 17 00:00:00 2001 From: Iain McNulty Date: Wed, 27 Nov 2024 13:39:12 +0000 Subject: [PATCH] Downcase Number --- app/components/providers/provider_list/view.html.erb | 2 +- app/views/support/providers/_list.html.erb | 2 +- app/views/support/providers/edit.html.erb | 2 +- .../support/providers/onboarding/checks/show.html.erb | 4 ++-- app/views/support/providers/onboardings/new.html.erb | 2 +- config/locales/en.yml | 8 ++++---- .../support/providers/onboarding_a_new_provider_spec.rb | 8 ++++---- spec/forms/support/provider_form_spec.rb | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/components/providers/provider_list/view.html.erb b/app/components/providers/provider_list/view.html.erb index 12c5e9cac1..1cbeaf6d87 100644 --- a/app/components/providers/provider_list/view.html.erb +++ b/app/components/providers/provider_list/view.html.erb @@ -25,7 +25,7 @@ if @provider.accredited_provider? component.with_row do |row| - row.with_key { "Accredited provider Number" } + row.with_key { "Accredited provider number" } row.with_value { value_provided?(@provider.accredited_provider_number.to_s) } row.with_action(text: "Change", href: edit_support_recruitment_cycle_provider_path(@provider.recruitment_cycle_year, @provider), visually_hidden_text: "accredited provider id") end diff --git a/app/views/support/providers/_list.html.erb b/app/views/support/providers/_list.html.erb index 567492455b..4ce388f188 100644 --- a/app/views/support/providers/_list.html.erb +++ b/app/views/support/providers/_list.html.erb @@ -3,7 +3,7 @@ Provider name Provider code - Accredited Provider Number + Accredited provider number UKPRN diff --git a/app/views/support/providers/edit.html.erb b/app/views/support/providers/edit.html.erb index cb83ff9fa5..e51542f808 100644 --- a/app/views/support/providers/edit.html.erb +++ b/app/views/support/providers/edit.html.erb @@ -36,7 +36,7 @@ <%= f.govuk_radio_buttons_fieldset :accrediting_provider, legend: { text: "Is the organisation an accredited provider?", size: "s" } do %> <%= f.govuk_radio_button :accrediting_provider, :accredited_provider, label: { text: "Yes", size: "s" } do %> <%= f.govuk_text_field :accredited_provider_number, - label: { text: "Accredited provider Number" }, + label: { text: "Accredited provider number" }, width: 10 %> <% end %> <%= f.govuk_radio_button :accrediting_provider, :not_an_accredited_provider, label: { text: "No", size: "s" } %> diff --git a/app/views/support/providers/onboarding/checks/show.html.erb b/app/views/support/providers/onboarding/checks/show.html.erb index f6d12c3b82..6c259a7e19 100644 --- a/app/views/support/providers/onboarding/checks/show.html.erb +++ b/app/views/support/providers/onboarding/checks/show.html.erb @@ -37,9 +37,9 @@ if @provider_form.accredited_provider? component.with_row do |row| - row.with_key { "Accredited provider Number" } + row.with_key { "Accredited provider number" } row.with_value { @provider_form.accredited_provider_number } - row.with_action(text: "Change", href: new_support_recruitment_cycle_providers_onboarding_path(goto_confirmation: true), visually_hidden_text: "accredited provider Number") + row.with_action(text: "Change", href: new_support_recruitment_cycle_providers_onboarding_path(goto_confirmation: true), visually_hidden_text: "accredited provider number") end end diff --git a/app/views/support/providers/onboardings/new.html.erb b/app/views/support/providers/onboardings/new.html.erb index cb8dcba4c7..a029ca7f88 100644 --- a/app/views/support/providers/onboardings/new.html.erb +++ b/app/views/support/providers/onboardings/new.html.erb @@ -27,7 +27,7 @@ <%= f.govuk_radio_button :accredited_provider, :accredited_provider, label: { text: "Yes" }, link_errors: true do %> <%= f.govuk_text_field :accredited_provider_number, width: 10, - label: { text: "Accredited provider Number" }, + label: { text: "Accredited provider number" }, autocomplete: :disabled %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ea316f6bdb..1e470d0741 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -902,8 +902,8 @@ en: blank: Enter a UK provider reference number (UKPRN) contains_eight_numbers_starting_with_one: Enter a valid UK provider reference number (UKPRN) - it must be 8 digits starting with a 1, like 12345678 accredited_provider_number: - blank: Enter the accredited provider Number - format: Enter a valid accredited provider Number - it must be 4 digits starting with a 1 or a 5 + blank: Enter the accredited provider number + format: Enter a valid accredited provider number - it must be 4 digits starting with a 1 or a 5 organisation: attributes: name: @@ -1093,8 +1093,8 @@ en: blank: "Select a provider type" school_is_an_invalid_accredited_provider: "Accredited provider cannot be a school" accredited_provider_number: - blank: "Enter an accredited provider Number" - invalid: "Enter a valid accredited provider Number" + blank: "Enter an accredited provider number" + invalid: "Enter a valid accredited provider number" urn: blank: "Enter a unique reference number (URN)" invalid: "Enter a valid unique reference number (URN)" diff --git a/spec/features/support/providers/onboarding_a_new_provider_spec.rb b/spec/features/support/providers/onboarding_a_new_provider_spec.rb index 8926a1c3b0..d706e7d261 100644 --- a/spec/features/support/providers/onboarding_a_new_provider_spec.rb +++ b/spec/features/support/providers/onboarding_a_new_provider_spec.rb @@ -159,12 +159,12 @@ def when_i_fill_in_a_valid_provider_details(provider_type:) fill_in 'Unique reference number (URN)', with: '54321' when :university choose 'Yes' - fill_in 'Accredited provider Number', with: '1111' + fill_in 'Accredited provider number', with: '1111' choose 'Higher education institution (HEI)' when :scitt choose 'Yes' - fill_in 'Accredited provider Number', with: '5555' + fill_in 'Accredited provider number', with: '5555' choose 'School centred initial teacher training (SCITT)' end @@ -192,12 +192,12 @@ def and_the_provider_form_should_be_prefilled_with_the_provider_details(provider expect(page).to have_field('Unique reference number (URN)', with: '54321') when :university expect(page).to have_checked_field('Yes') - expect(page).to have_field('Accredited provider Number', with: '1111') + expect(page).to have_field('Accredited provider number', with: '1111') expect(page).to have_checked_field('Higher education institution (HEI)') when :scitt expect(page).to have_checked_field('Yes') - expect(page).to have_field('Accredited provider Number', with: '5555') + expect(page).to have_field('Accredited provider number', with: '5555') expect(page).to have_checked_field('School centred initial teacher training (SCITT)') end diff --git a/spec/forms/support/provider_form_spec.rb b/spec/forms/support/provider_form_spec.rb index 09359b977c..b0a2c64b26 100644 --- a/spec/forms/support/provider_form_spec.rb +++ b/spec/forms/support/provider_form_spec.rb @@ -127,7 +127,7 @@ module Support { accredited_provider: :accredited_provider } end - include_examples 'blank validation', :accredited_provider_number, 'Enter an accredited provider Number' + include_examples 'blank validation', :accredited_provider_number, 'Enter an accredited provider number' end context 'urn set to invalid' do @@ -208,7 +208,7 @@ module Support end end - blank_accredited_provider_number_message = 'Enter an accredited provider Number' + blank_accredited_provider_number_message = 'Enter an accredited provider number' [nil, ''].each do |blank_accredited_provider_number| include_examples 'accredited provider number validation', nil, blank_accredited_provider_number, blank_accredited_provider_number_message @@ -216,7 +216,7 @@ module Support include_examples 'accredited provider number validation', :university, blank_accredited_provider_number, blank_accredited_provider_number_message end - invalid_accredited_provider_number_message = 'Enter a valid accredited provider Number' + invalid_accredited_provider_number_message = 'Enter a valid accredited provider number' %w[a aaaa 12345 54321 abcde 1 5].each do |invalid_accredited_provider_number| include_examples 'accredited provider number validation', nil, invalid_accredited_provider_number, invalid_accredited_provider_number_message