diff --git a/app/models/verification/letter.rb b/app/models/verification/letter.rb index 0dcaf1c83..2124e1664 100644 --- a/app/models/verification/letter.rb +++ b/app/models/verification/letter.rb @@ -5,7 +5,6 @@ class Verification::Letter validates :user, presence: true - validate :letter_sent, if: :verify? validate :correct_code, if: :verify? def save @@ -17,13 +16,8 @@ class Verification::Letter user.update(letter_requested_at: Time.now, letter_verification_code: generate_verification_code) end - def letter_sent - errors.add(:verification_code, I18n.t('verification.letter.errors.letter_not_sent')) unless - user.letter_sent_at.present? - end - def correct_code - errors.add(:verification_code, I18n.t('verification.letter.errors.incorect_code')) unless + errors.add(:verification_code, I18n.t('verification.letter.errors.incorrect_code')) unless user.letter_verification_code == verification_code end diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 68aba1603..014f143ab 100644 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -92,8 +92,7 @@ en: alert: unconfirmed_code: "You have not yet enter the confirmation code" errors: - letter_not_sent: "We have not sent you the letter with the code yet" - incorect_code: "Incorrect confirmation code" + incorrect_code: "Incorrect confirmation code" verified_user: show: title: "Available information" diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index 859eadf3a..57ffeff43 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -92,8 +92,7 @@ es: alert: unconfirmed_code: "Todavía no has introducido el código de confirmación" errors: - letter_not_sent: "Aún no te hemos enviado la carta con el código" - incorect_code: "Código de verificación incorrecto" + incorrect_code: "Código de verificación incorrecto" verified_user: show: title: "Información disponible" diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb index e1fe948f5..656f6708e 100644 --- a/spec/features/verification/letter_spec.rb +++ b/spec/features/verification/letter_spec.rb @@ -4,8 +4,7 @@ feature 'Verify Letter' do scenario 'Request a letter' do user = create(:user, residence_verified_at: Time.now, - confirmed_phone: "611111111", - letter_sent_at: 1.day.ago) + confirmed_phone: "611111111") login_as(user) visit new_letter_path @@ -17,8 +16,7 @@ feature 'Verify Letter' do scenario 'Go to office instead of send letter' do user = create(:user, residence_verified_at: Time.now, - confirmed_phone: "611111111", - letter_sent_at: 1.day.ago) + confirmed_phone: "611111111") login_as(user) visit new_letter_path @@ -51,7 +49,6 @@ feature 'Verify Letter' do scenario "Valid verification user logged in" do user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111", - letter_sent_at: 1.day.ago, letter_verification_code: "123456") login_as(user) @@ -69,7 +66,6 @@ feature 'Verify Letter' do scenario "Valid verification user not logged in" do user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111", - letter_sent_at: 1.day.ago, letter_verification_code: "123456") visit edit_letter_path @@ -106,7 +102,6 @@ feature 'Verify Letter' do scenario '6 tries allowed' do user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111", - letter_sent_at: 1.day.ago, letter_verification_code: "123456") visit edit_letter_path diff --git a/spec/models/letter_spec.rb b/spec/models/letter_spec.rb index 6b5e10d77..3b774b618 100644 --- a/spec/models/letter_spec.rb +++ b/spec/models/letter_spec.rb @@ -37,23 +37,16 @@ describe 'Verification::Letter' do let(:letter) { build(:verification_letter, verify: true) } - it "letter not sent" do - letter.user.update(letter_sent_at: nil) - - expect(letter.valid?).to eq(false) - expect(letter.errors[:verification_code].first).to eq("We have not sent you the letter with the code yet") - end - - it "letter sent but incorrect code" do - letter.user.update(letter_sent_at: 1.day.ago, letter_verification_code: "123456") + it "incorrect code" do + letter.user.update(letter_verification_code: "123456") letter.verification_code = nil expect(letter.valid?).to eq(false) expect(letter.errors[:verification_code].first).to eq("Incorrect confirmation code") end - it "letter sent and correct code" do - letter.user.update(letter_sent_at: 1.day.ago, letter_verification_code: "123456") + it "correct code" do + letter.user.update(letter_verification_code: "123456") letter.verification_code = "123456" expect(letter.valid?).to eq(true) @@ -61,4 +54,4 @@ describe 'Verification::Letter' do end end -end \ No newline at end of file +end