Merge branch 'dev'
This commit is contained in:
commit
2568b8d1e0
3 changed files with 3 additions and 3 deletions
|
@ -17,7 +17,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
|
|||
def create
|
||||
user = User.find_by(email: params[:user][:email])
|
||||
if user.present?
|
||||
UserMailer.new_account_warning(user).deliver
|
||||
UserMailer.new_account_warning(user).deliver_later
|
||||
flash.notice = t('devise.registrations.signed_up_but_unconfirmed')
|
||||
redirect_to root_path
|
||||
else
|
||||
|
|
|
@ -5,6 +5,6 @@ class UserMailer < ApplicationMailer
|
|||
@user = user
|
||||
@subject = "Demande de création de compte"
|
||||
|
||||
mail(to: user.email, subject: subject)
|
||||
mail(to: user.email, subject: @subject)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -37,7 +37,7 @@ describe Users::RegistrationsController, type: :controller do
|
|||
let!(:existing_user) { create(:user, email: email, password: password) }
|
||||
|
||||
before do
|
||||
allow(UserMailer).to receive(:new_account_warning).and_return(double(deliver: 'deliver'))
|
||||
allow(UserMailer).to receive(:new_account_warning).and_return(double(deliver_later: 'deliver'))
|
||||
subject
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue