From e9beb93471c90ec4afa7e7e647e6830da23aea24 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 17 Nov 2023 14:35:41 +0000 Subject: [PATCH] Update error messages --- config/locales/devise.en.yml | 2 +- config/locales/en.yml | 2 +- spec/requests/auth/passwords_controller_spec.rb | 2 +- spec/requests/users_controller_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 16299ea10..e40af1d37 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -62,7 +62,7 @@ en: messages: already_confirmed: "Email has already been confirmed. Sign in." blank: "can’t be blank" - confirmation: "Password confirmation doesn’t match new password" + confirmation: "The passwords you entered do not match. Try again." confirmation_period_expired: "Email needs to be confirmed within %{period}. Request a new link below." expired: "Token has expired. Request a new token." not_found: "was not found" diff --git a/config/locales/en.yml b/config/locales/en.yml index 69a4a8bb9..198589720 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -164,7 +164,7 @@ en: blank: "Select role" password: blank: Enter a password - too_short: Password is too short (minimum is %{count} characters) + too_short: The password you entered is too short. Enter a password that is %{count} characters or longer. merge_request: attributes: absorbing_organisation_id: diff --git a/spec/requests/auth/passwords_controller_spec.rb b/spec/requests/auth/passwords_controller_spec.rb index 29a032395..92c36608c 100644 --- a/spec/requests/auth/passwords_controller_spec.rb +++ b/spec/requests/auth/passwords_controller_spec.rb @@ -107,7 +107,7 @@ RSpec.describe Auth::PasswordsController, type: :request do put "/account/password", headers: headers, params: params expect(response).to have_http_status(:unprocessable_entity) expect(page).to have_css("h1", text: "Reset your password") - expect(page).to have_content("doesn’t match new password") + expect(page).to have_content("passwords you entered do not match") end end diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 958f2187a..aad0b9f28 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -67,7 +67,7 @@ RSpec.describe UsersController, type: :request do expect(response).to have_http_status(:unprocessable_entity) expect(page).to have_css("h1", class: "govuk-heading-l", text: "Change your password") expect(page).to have_selector("#error-summary-title") - expect(page).to have_content("Password confirmation doesn’t match new password") + expect(page).to have_content("passwords you entered do not match") end end end