diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 8a501a8c8..190b53941 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -57,7 +57,7 @@ en: errors: messages: already_confirmed: "Email has already been confirmed. Sign in." - blank: "Email can’t be blank" + blank: "can’t be blank" confirmation: "Password confirmation doesn’t match new password" confirmation_period_expired: "Email needs to be confirmed within %{period}. Request a new account." expired: "Token has expired. Request a new token." diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 71e572493..4ed4ab8ed 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -9,8 +9,13 @@ describe Admin::UsersController, type: :controller do let(:resource_title) { "Users" } let(:valid_session) { {} } let!(:admin_user) { FactoryBot.create(:admin_user) } + let(:notify_client) { instance_double(Notifications::Client) } + let(:devise_notify_mailer) { DeviseNotifyMailer.new } before do + allow(DeviseNotifyMailer).to receive(:new).and_return(devise_notify_mailer) + allow(devise_notify_mailer).to receive(:notify_client).and_return(notify_client) + allow(notify_client).to receive(:send_email).and_return(true) sign_in admin_user end diff --git a/spec/services/imports/case_logs_import_service_spec.rb b/spec/services/imports/case_logs_import_service_spec.rb index 82f05472c..64fb16700 100644 --- a/spec/services/imports/case_logs_import_service_spec.rb +++ b/spec/services/imports/case_logs_import_service_spec.rb @@ -10,6 +10,14 @@ RSpec.describe Imports::CaseLogsImportService do let(:real_2021_2022_form) { Form.new("config/forms/2021_2022.json", "2021_2022") } let(:real_2022_2023_form) { Form.new("config/forms/2022_2023.json", "2022_2023") } let(:logger) { instance_double(ActiveSupport::Logger) } + let(:notify_client) { instance_double(Notifications::Client) } + let(:devise_notify_mailer) { DeviseNotifyMailer.new } + + before do + allow(DeviseNotifyMailer).to receive(:new).and_return(devise_notify_mailer) + allow(devise_notify_mailer).to receive(:notify_client).and_return(notify_client) + allow(notify_client).to receive(:send_email).and_return(true) + end context "when importing users" do subject(:case_log_service) { described_class.new(storage_service, logger) }