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

Merge pull request #2132 from betagouv/fix_2067_confirmation_mail_lost

Browse source 
[fix #2067] Resend confirmation mail if the user is not confirmed
This commit is contained in:
Mathieu Magnin 2018-06-20 17:39:25 +02:00 committed by GitHub
commit d6e211f2df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,11 @@ class Users::RegistrationsController < Devise::RegistrationsController
def create
user = User.find_by(email: params[:user][:email])
if user.present?
UserMailer.new_account_warning(user).deliver_later
if user.confirmed?
UserMailer.new_account_warning(user).deliver_later
else
user.resend_confirmation_instructions
end
flash.notice = t('devise.registrations.signed_up_but_unconfirmed')
redirect_to root_path
else

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

@ -34,16 +34,34 @@ describe Users::RegistrationsController, type: :controller do
end
context 'when the user already exists' do
let!(:existing_user) { create(:user, email: email, password: password) }
let!(:existing_user) { create(:user, email: email, password: password, confirmed_at: confirmed_at) }
before do
allow(UserMailer).to receive(:new_account_warning).and_return(double(deliver_later: 'deliver'))
subject
end
it { expect(response).to redirect_to(root_path) }
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) }
it { expect(UserMailer).to have_received(:new_account_warning) }
context 'and the user is confirmed' do
let(:confirmed_at) { DateTime.now }
before { subject }
it { expect(response).to redirect_to(root_path) }
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) }
it { expect(UserMailer).to have_received(:new_account_warning) }
end
context 'and the user is not confirmed' do
let(:confirmed_at) { nil }
before do
expect_any_instance_of(User).to receive(:resend_confirmation_instructions)
subject
end
it { expect(response).to redirect_to(root_path) }
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) }
it { expect(UserMailer).not_to have_received(:new_account_warning) }
end
end
end
end