diff --git a/app/models/verification/letter.rb b/app/models/verification/letter.rb index 897960a72..a239dd2a9 100644 --- a/app/models/verification/letter.rb +++ b/app/models/verification/letter.rb @@ -3,11 +3,12 @@ class Verification::Letter attr_accessor :user, :verification_code, :email, :password, :verify - validates :email, presence: true - validates :password, presence: true - validates :verification_code, presence: true - validate :validate_existing_user + + validates :email, presence: true, if: :verify? + validates :password, presence: true, if: :verify? + validates :verification_code, presence: true, if: :verify? + validate :validate_correct_code, if: :verify? def save diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb index 00baef12d..9ceb97335 100644 --- a/spec/features/verification/letter_spec.rb +++ b/spec/features/verification/letter_spec.rb @@ -12,6 +12,11 @@ feature 'Verify Letter' do click_link "Request a letter" expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account." + + user.reload + + expect(user.letter_requested_at).to be + expect(user.letter_verification_code).to be end scenario 'Go to office instead of send letter' do