From 291298755d47561bed39aba5b0ff10e8da7b60b7 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 18:34:57 +0000 Subject: [PATCH 1/6] [653] Change i to lowercase --- config/locales/candidate_interface/personal_details.yml | 2 +- ...idate_choosing_visa_or_immigration_status_non_eu_spec.rb | 2 +- ...tering_personal_details_when_requiring_visa_2022_spec.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/candidate_interface/personal_details.yml b/config/locales/candidate_interface/personal_details.yml index 6e02f91575b..a22afe3b973 100644 --- a/config/locales/candidate_interface/personal_details.yml +++ b/config/locales/candidate_interface/personal_details.yml @@ -35,7 +35,7 @@ en: label: Do you have the right to work or study in the UK? change_action: if you have the right to work or study in the UK visa_or_immigration_status: - label: Visa or Immigration status + label: Visa or immigration status change_action: visa or immigration status immigration_status: label: Immigration status diff --git a/spec/system/candidate_interface/entering_details/candidate_choosing_visa_or_immigration_status_non_eu_spec.rb b/spec/system/candidate_interface/entering_details/candidate_choosing_visa_or_immigration_status_non_eu_spec.rb index cd4a30a0c3b..c82d075d5ec 100644 --- a/spec/system/candidate_interface/entering_details/candidate_choosing_visa_or_immigration_status_non_eu_spec.rb +++ b/spec/system/candidate_interface/entering_details/candidate_choosing_visa_or_immigration_status_non_eu_spec.rb @@ -135,7 +135,7 @@ def and_i_click_save_and_continue end def then_i_see_the_correct_visa_in_the_summary(visa_summary_text) - within '.govuk-summary-list__row', text: 'Immigration status' do + within '.govuk-summary-list__row', text: 'immigration status' do expect(page).to have_text(visa_summary_text) end end diff --git a/spec/system/candidate_interface/entering_details/candidate_entering_personal_details_when_requiring_visa_2022_spec.rb b/spec/system/candidate_interface/entering_details/candidate_entering_personal_details_when_requiring_visa_2022_spec.rb index b4a60d737e1..75f56d35d22 100644 --- a/spec/system/candidate_interface/entering_details/candidate_entering_personal_details_when_requiring_visa_2022_spec.rb +++ b/spec/system/candidate_interface/entering_details/candidate_entering_personal_details_when_requiring_visa_2022_spec.rb @@ -65,7 +65,7 @@ def and_i_can_change_state_that_i_have_permanent_residence expect(page).to have_content('Lando Calrissian') expect(page).to have_content('Pakistani') expect(page).to have_content('Do you have the right to work or study in the UK? Yes') - expect(page).to have_content('Immigration status I have permanent residence') + expect(page).to have_content('immigration status I have permanent residence') end def and_i_can_change_nationality_to_an_eu_country_with_settled_status @@ -88,7 +88,7 @@ def and_i_can_change_nationality_to_an_eu_country_with_settled_status expect(page).to have_current_path candidate_interface_personal_details_show_path expect(page).to have_content('Nationality French') expect(page).to have_content('Do you have the right to work or study in the UK? Yes') - expect(page).to have_content('Immigration status EU settled status') + expect(page).to have_content('immigration status EU settled status') end def and_i_can_change_immigration_status @@ -99,7 +99,7 @@ def and_i_can_change_immigration_status click_link_or_button t('save_and_continue') expect(page).to have_current_path candidate_interface_personal_details_show_path - expect(page).to have_content('Immigration status EU pre-settled status') + expect(page).to have_content('immigration status EU pre-settled status') end def and_i_can_mark_the_section_complete From ebcc50231d3a9d6fa74aa5b32ccd082d322fb098 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 18:48:04 +0000 Subject: [PATCH 2/6] [653] Ensure ordering is consistent The order on the review page should match that of the question page --- .../ielts_review_component.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/candidate_interface/english_foreign_language/ielts_review_component.rb b/app/components/candidate_interface/english_foreign_language/ielts_review_component.rb index 1e01f22fd4f..a6a42b10363 100644 --- a/app/components/candidate_interface/english_foreign_language/ielts_review_component.rb +++ b/app/components/candidate_interface/english_foreign_language/ielts_review_component.rb @@ -23,19 +23,19 @@ def ielts_rows }, }, { - key: 'Year completed', - value: ielts_qualification.award_year, + key: 'Overall band score', + value: ielts_qualification.band_score, action: { href: candidate_interface_edit_ielts_path(return_to_params(return_to_application_review)), - visually_hidden_text: 'year completed', + visually_hidden_text: 'overall band score', }, }, { - key: 'Overall band score', - value: ielts_qualification.band_score, + key: 'Year completed', + value: ielts_qualification.award_year, action: { href: candidate_interface_edit_ielts_path(return_to_params(return_to_application_review)), - visually_hidden_text: 'overall band score', + visually_hidden_text: 'year completed', }, }, ] From 7182e1767c52222fd6343f550104829cc6cd99ce Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 18:56:31 +0000 Subject: [PATCH 3/6] [653] Make card action bold for other qualifications As per the design system --- .../other_qualifications_review_component.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/candidate_interface/other_qualifications_review_component.html.erb b/app/components/candidate_interface/other_qualifications_review_component.html.erb index a818380f93b..71d6e6105df 100644 --- a/app/components/candidate_interface/other_qualifications_review_component.html.erb +++ b/app/components/candidate_interface/other_qualifications_review_component.html.erb @@ -18,7 +18,7 @@ <%= render(SummaryCardHeaderComponent.new(title: qualification.title, heading_level: @heading_level)) do %> <% if deletable? %>
- <%= govuk_link_to candidate_interface_confirm_destroy_other_qualification_path(qualification.id) do %> + <%= govuk_link_to candidate_interface_confirm_destroy_other_qualification_path(qualification.id), class: 'govuk-!-font-weight-bold' do %> <%= t('application_form.other_qualification.delete') %><%= generate_action(qualification: qualification) %> <% end %>
From 77b71d37d93b528e995f820f07587451a8b8d401 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 19:03:20 +0000 Subject: [PATCH 4/6] [653] Make card action bold for degrees As per the design system --- .../candidate_interface/degree_review_component.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/candidate_interface/degree_review_component.html.erb b/app/components/candidate_interface/degree_review_component.html.erb index 4ed86ac29b1..160fac5bc53 100644 --- a/app/components/candidate_interface/degree_review_component.html.erb +++ b/app/components/candidate_interface/degree_review_component.html.erb @@ -3,7 +3,7 @@ <%= render(SummaryCardHeaderComponent.new(title: title(degree), heading_level: @heading_level)) do %> <% if deletable? %>
- <%= govuk_link_to candidate_interface_confirm_degree_destroy_path(degree.id) do %> + <%= govuk_link_to candidate_interface_confirm_degree_destroy_path(degree.id), class: 'govuk-!-font-weight-bold' do %> <%= t('application_form.degree.delete') %><%= generate_action(degree: degree) %> <% end %>
From 1cd1f7762e26cca1868a76d13f0fc204290b61ff Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 19:13:32 +0000 Subject: [PATCH 5/6] [653] Make card action bold for volunteering as per the design system --- .../candidate_interface/volunteering_review_component.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/candidate_interface/volunteering_review_component.html.erb b/app/components/candidate_interface/volunteering_review_component.html.erb index 168c476cffd..1eb3b22a995 100644 --- a/app/components/candidate_interface/volunteering_review_component.html.erb +++ b/app/components/candidate_interface/volunteering_review_component.html.erb @@ -3,7 +3,7 @@ <%= render(SummaryCardHeaderComponent.new(title: volunteering_role.role, heading_level: @heading_level)) do %> <% if deletable? %>
- <%= govuk_link_to candidate_interface_confirm_destroy_volunteering_role_path(volunteering_role.id) do %> + <%= govuk_link_to candidate_interface_confirm_destroy_volunteering_role_path(volunteering_role.id), class: 'govuk-!-font-weight-bold' do %> <%= t('application_form.volunteering.delete.action') %><%= generate_action(volunteering_role: volunteering_role) %> <% end %>
From e9204073c0e079f06bc27c664e50fb6411936691 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 25 Feb 2025 19:18:41 +0000 Subject: [PATCH 6/6] [653] Make card action bold for references As per the design system --- .../candidate_interface/references_review_component.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/candidate_interface/references_review_component.html.erb b/app/components/candidate_interface/references_review_component.html.erb index 9f3030eea2b..56c00afb111 100644 --- a/app/components/candidate_interface/references_review_component.html.erb +++ b/app/components/candidate_interface/references_review_component.html.erb @@ -13,7 +13,7 @@
    <% if deletable? && reference_editable?(reference) %>
  • - <%= govuk_link_to confirm_destroy_path(reference) do %> + <%= govuk_link_to confirm_destroy_path(reference), class: 'govuk-!-font-weight-bold' do %> <%= t('application_form.references.delete_reference.action') %> reference from <%= reference.name %> <% end %>