Merge branch 'dev'

This commit is contained in:
gregoirenovel 2018-06-07 15:23:37 +02:00
commit 2568b8d1e0
3 changed files with 3 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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