modifies email controllers: management email makes users level two verified, and sets their document number permanently. Fixes failing test

This commit is contained in:
kikito
2015-10-13 17:20:39 +02:00
parent 8d82ca05c0
commit 050971c459
3 changed files with 8 additions and 7 deletions

View File

@@ -6,11 +6,7 @@ class Verification::EmailController < ApplicationController
def show def show
if Verification::Email.find(current_user, params[:email_verification_token]) if Verification::Email.find(current_user, params[:email_verification_token])
current_user.update(verified_at: Time.now)
current_user.update(verified_at: Time.now,
document_number: current_user.document_number || current_user.unconfirmed_document_number,
residence_verified_at: current_user.residence_verified_at || Time.now)
redirect_to account_path, notice: t('verification.email.show.flash.success') redirect_to account_path, notice: t('verification.email.show.flash.success')
else else
redirect_to verified_user_path, alert: t('verification.email.show.alert.failure') redirect_to verified_user_path, alert: t('verification.email.show.alert.failure')

View File

@@ -26,7 +26,9 @@ class Verification::Management::Email
plain_token, encrypted_token = Devise.token_generator.generate(User, :email_verification_token) plain_token, encrypted_token = Devise.token_generator.generate(User, :email_verification_token)
user.update(document_type: document_type, user.update(document_type: document_type,
unconfirmed_document_number: document_number, document_number: document_number,
residence_verified_at: Time.now,
level_two_verified_at: Time.now,
email_verification_token: plain_token) email_verification_token: plain_token)
Mailer.email_verification(user, email, encrypted_token, document_type, document_number).deliver_later Mailer.email_verification(user, email, encrypted_token, document_type, document_number).deliver_later

View File

@@ -40,10 +40,13 @@ describe Verification::Management::Email do
allow(validation).to receive(:user).and_return user allow(validation).to receive(:user).and_return user
expect(mail).to receive(:deliver_later) expect(mail).to receive(:deliver_later)
expect(Devise.token_generator).to receive(:generate).with(User, :email_verification_token).and_return(["1","2"]) expect(Devise.token_generator).to receive(:generate).with(User, :email_verification_token).and_return(["1","2"])
expect(user).to receive(:update).with(document_type: "1", unconfirmed_document_number: "1234", email_verification_token: "1")
expect(Mailer).to receive(:email_verification).with(user, user.email, "2", "1", "1234").and_return(mail) expect(Mailer).to receive(:email_verification).with(user, user.email, "2", "1", "1234").and_return(mail)
validation.save validation.save
expect(user.reload).to be_level_two_verified
expect(user.document_type).to eq("1")
expect(user.document_number).to eq("1234")
end end
end end
end end