From ba0f46aef99e166d6d0c4f4b150cee8b1366dc6e Mon Sep 17 00:00:00 2001 From: Bruce Bolt Date: Thu, 16 Feb 2023 09:52:45 +0000 Subject: [PATCH] Make wording of `2-step verification` consistent in views This ensures the name of 2SV is consistent in all public facing views. --- .../two_step_verification_exemptions_controller.rb | 2 +- app/views/organisations/edit.html.erb | 8 ++++---- app/views/two_step_verification_exemptions/edit.html.erb | 6 +++--- app/views/users/_form_fields.html.erb | 2 +- test/integration/change_user_role_test.rb | 2 +- test/support/managing_two_sv_helpers.rb | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/controllers/two_step_verification_exemptions_controller.rb b/app/controllers/two_step_verification_exemptions_controller.rb index ffdbe799e..d7f053669 100644 --- a/app/controllers/two_step_verification_exemptions_controller.rb +++ b/app/controllers/two_step_verification_exemptions_controller.rb @@ -12,7 +12,7 @@ def update else reason_for_2sv_exemption, valid_expiry_date = error_string_or_parsed_params @user.exempt_from_2sv(reason_for_2sv_exemption, current_user, valid_expiry_date) - flash[:notice] = "User exempted from 2SV" + flash[:notice] = "User exempted from 2-step verification" redirect_to edit_user_path(@user) end end diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb index d3bee11e8..2f01ac0be 100644 --- a/app/views/organisations/edit.html.erb +++ b/app/views/organisations/edit.html.erb @@ -1,11 +1,11 @@ -<% content_for :title, "Require 2sv for #{@organisation.name}" %> +<% content_for :title, "Require 2-step verification for #{@organisation.name}" %>
  1. <%= link_to "Organisations", organisations_path %>
    2. -
  2. Require 2sv
    3. +
  3. Require 2-step verification
-

Require 2sv for “<%= @organisation.name %>”

+

Require 2-step verification for “<%= @organisation.name %>”

<%= form_tag organisation_path(@organisation), method: "put", :class => 'well remove-top-padding' do %>
@@ -14,7 +14,7 @@ Mandate 2-step verification for <%= @organisation.name %>
-

This will ensure that all users in an organisation who are not exempted from 2sv must set up 2sv on their next login.

+

This will ensure that all users in an organisation who are not exempted from 2-step verification must set up 2-step verification on their next login.

They will not be able to perform any actions in signon before this is set up.

<%= submit_tag "Update Organisation", class: "btn btn-primary add-right-margin" %> <%= link_to "Cancel", organisations_path, class: "btn btn-default" %> diff --git a/app/views/two_step_verification_exemptions/edit.html.erb b/app/views/two_step_verification_exemptions/edit.html.erb index 4cf85fcdf..6ee80e8b7 100644 --- a/app/views/two_step_verification_exemptions/edit.html.erb +++ b/app/views/two_step_verification_exemptions/edit.html.erb @@ -9,11 +9,11 @@ <%= form_tag two_step_verification_exemption_path(@user), method: "patch", :class => 'well remove-top-padding' do %>
-

You are about to exempt this user from having 2 step verification on their account. This will remove any existing - requirement to log in with, or set up 2 step verification.

+

You are about to exempt this user from having 2-step verification on their account. This will remove any existing + requirement to log in with, or set up 2-step verification.

- + <%= text_field_tag "user[reason_for_2sv_exemption]", @user.reason_for_2sv_exemption, class: 'form-control input-md-6' %>

Please provide a reason for granting this exemption above.

diff --git a/app/views/users/_form_fields.html.erb b/app/views/users/_form_fields.html.erb index d296b0b8b..2d39e72e2 100644 --- a/app/views/users/_form_fields.html.erb +++ b/app/views/users/_form_fields.html.erb @@ -37,7 +37,7 @@

<% elsif policy(User).assign_role? %> -

This user's role is set to <%= @user.role %>. They are currently exempted from 2sv, meaning that their role cannot be changed as admins are required to have 2sv.

+

This user's role is set to <%= @user.role %>. They are currently exempted from 2-step verification, meaning that their role cannot be changed as admins are required to have 2-step verification.

<% end %> <% if policy(current_user).mandate_2sv? && @user.persisted? %> diff --git a/test/integration/change_user_role_test.rb b/test/integration/change_user_role_test.rb index f10c5c5bd..24292a90f 100644 --- a/test/integration/change_user_role_test.rb +++ b/test/integration/change_user_role_test.rb @@ -29,7 +29,7 @@ def sign_in_as_and_edit_user(sign_in_as, user_to_edit) assert page.has_no_select?("Role") - assert page.has_text? "This user's role is set to #{user.role}. They are currently exempted from 2sv, meaning that their role cannot be changed as admins are required to have 2sv." + assert page.has_text? "This user's role is set to #{user.role}. They are currently exempted from 2-step verification, meaning that their role cannot be changed as admins are required to have 2-step verification." end end diff --git a/test/support/managing_two_sv_helpers.rb b/test/support/managing_two_sv_helpers.rb index 40082b17c..e360bf287 100644 --- a/test/support/managing_two_sv_helpers.rb +++ b/test/support/managing_two_sv_helpers.rb @@ -90,7 +90,7 @@ def user_can_be_exempted_from_2sv(signed_in_as, user_being_exempted, reason, exp end def fill_in_exemption_form(reason, expiry_date) - fill_in "Reason for 2sv exemption", with: reason + fill_in "Reason for 2-step verification exemption", with: reason fill_in_expiry_date(expiry_date) click_button "Save" end @@ -109,7 +109,7 @@ def assert_user_has_been_exempted_from_2sv(user, reason, expiry_date) assert_equal reason, user.reason_for_2sv_exemption assert_equal expiry_date, user.expiry_date_for_2sv_exemption - assert page.has_text? "User exempted from 2SV" + assert page.has_text? "User exempted from 2-step verification" assert page.has_text? "The user has been made exempt from 2-step verification for the following reason: #{reason}" end