DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev'

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users/registrations_controller.rb
View file

@ -17,7 +17,7 @@ class Users::RegistrationsController < Devise::RegistrationsController
def create def create
user = User.find_by(email: params[:user][:email]) user = User.find_by(email: params[:user][:email])
if user.present? 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') flash.notice = t('devise.registrations.signed_up_but_unconfirmed')
redirect_to root_path redirect_to root_path
else else

2
app/mailers/user_mailer.rb
View file

@ -5,6 +5,6 @@ class UserMailer < ApplicationMailer
@user = user @user = user
@subject = "Demande de création de compte" @subject = "Demande de création de compte"
mail(to: user.email, subject: subject) mail(to: user.email, subject: @subject)
end end
end end

2
spec/controllers/users/registrations_controller_spec.rb
View file

@ -37,7 +37,7 @@ describe Users::RegistrationsController, type: :controller do
let!(:existing_user) { create(:user, email: email, password: password) } let!(:existing_user) { create(:user, email: email, password: password) }
before do 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 subject
end end