From 17a1bedec0aebfea6f4459788758d55dbfd6db13 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 5 Sep 2015 01:44:06 +0200 Subject: [PATCH 1/4] removes document type from verified users query --- app/models/verified_user.rb | 3 +-- .../verification/verified_user_spec.rb | 26 +++++-------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/app/models/verified_user.rb b/app/models/verified_user.rb index 2113ef238..b0c5afd0c 100644 --- a/app/models/verified_user.rb +++ b/app/models/verified_user.rb @@ -1,6 +1,5 @@ class VerifiedUser < ActiveRecord::Base - scope :by_user, -> (user) { where(document_number: user.document_number, - document_type: user.document_type) } + scope :by_user, -> (user) { where(document_number: user.document_number) } scope :by_email, -> (email) { where(email: email) } scope :by_phone, -> (phone) { where(phone: phone) } diff --git a/spec/features/verification/verified_user_spec.rb b/spec/features/verification/verified_user_spec.rb index c0989e180..1778f6459 100644 --- a/spec/features/verification/verified_user_spec.rb +++ b/spec/features/verification/verified_user_spec.rb @@ -1,26 +1,22 @@ require 'rails_helper' -feature 'Verified users' do +feature 'Verified users', :focus do scenario "Verified emails" do user = create(:user, residence_verified_at: Time.now, - document_number: '12345678Z', - document_type: '2') + document_number: '12345678Z') create(:verified_user, document_number: '12345678Z', - document_type: '2', email: 'rock@example.com') create(:verified_user, document_number: '12345678Z', - document_type: '2', email: 'roll@example.com') create(:verified_user, document_number: '99999999R', - document_type: '2', email: 'another@example.com') login_as(user) @@ -33,22 +29,18 @@ feature 'Verified users' do scenario "Verified phones" do user = create(:user, residence_verified_at: Time.now, - document_number: '12345678Z', - document_type: '2') + document_number: '12345678Z') create(:verified_user, document_number: '12345678Z', - document_type: '2', phone: '611111111') create(:verified_user, document_number: '12345678Z', - document_type: '2', phone: '622222222') create(:verified_user, document_number: '99999999R', - document_type: '2', phone: '633333333') login_as(user) @@ -61,12 +53,10 @@ feature 'Verified users' do scenario "Select a verified email" do user = create(:user, residence_verified_at: Time.now, - document_number: '12345678Z', - document_type: '2') + document_number: '12345678Z') verified_user = create(:verified_user, document_number: '12345678Z', - document_type: '2', email: 'rock@example.com') login_as(user) @@ -83,12 +73,10 @@ feature 'Verified users' do scenario "Select a verified phone" do user = create(:user, residence_verified_at: Time.now, - document_number: '12345678Z', - document_type: '2') + document_number: '12345678Z') verified_user = create(:verified_user, document_number: '12345678Z', - document_type: '2', phone: '611111111') login_as(user) @@ -104,12 +92,10 @@ feature 'Verified users' do scenario "Continue without selecting any verified information" do user = create(:user, residence_verified_at: Time.now, - document_number: '12345678Z', - document_type: '2') + document_number: '12345678Z') create(:verified_user, document_number: '12345678Z', - document_type: '2', phone: '611111111') login_as(user) From 2260de945190ef96a30741664fc530c26a3cdc09 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 5 Sep 2015 23:04:13 +0200 Subject: [PATCH 2/4] uppercases document number --- app/models/verification/residence.rb | 1 + spec/models/residence_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb index 26b994c8e..7595549b9 100644 --- a/app/models/verification/residence.rb +++ b/app/models/verification/residence.rb @@ -19,6 +19,7 @@ class Verification::Residence self.date_of_birth = parse_date('date_of_birth', attrs) attrs = remove_date('date_of_birth', attrs) super + self.document_number.upcase! end def save diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb index ab0ab64f3..d4c07d20f 100644 --- a/spec/models/residence_spec.rb +++ b/spec/models/residence_spec.rb @@ -40,6 +40,13 @@ describe Verification::Residence do end end + describe "new" do + it "should upcase document number" do + residence = Verification::Residence.new({document_number: "x1234567z"}) + expect(residence.document_number).to eq("X1234567Z") + end + end + describe "save" do it "should store document number and type" do From 189f94f1d613050501fbdf219fa010ffa05a3093 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 5 Sep 2015 23:20:10 +0200 Subject: [PATCH 3/4] removes spec focus --- spec/features/verification/verified_user_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/verification/verified_user_spec.rb b/spec/features/verification/verified_user_spec.rb index 1778f6459..0a74a7798 100644 --- a/spec/features/verification/verified_user_spec.rb +++ b/spec/features/verification/verified_user_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Verified users', :focus do +feature 'Verified users' do scenario "Verified emails" do user = create(:user, From cbd4e30e80215f5fce7fa7a5e320e06e7fcd10af Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 6 Sep 2015 11:15:24 +0200 Subject: [PATCH 4/4] fixes specs --- app/models/verification/residence.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb index 7595549b9..9215fcebd 100644 --- a/app/models/verification/residence.rb +++ b/app/models/verification/residence.rb @@ -19,7 +19,7 @@ class Verification::Residence self.date_of_birth = parse_date('date_of_birth', attrs) attrs = remove_date('date_of_birth', attrs) super - self.document_number.upcase! + self.document_number.upcase! unless self.document_number.blank? end def save