consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #370 from AyuntamientoMadrid/verified_users

Browse Source 
Verified users
This commit is contained in:
Juanjo Bazán
2015-09-06 11:35:56 +02:00
parent 5aed99000c cbd4e30e80
commit e3449723b3
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/verification/residence.rb
View File

@@ -19,6 +19,7 @@ class Verification::Residence
self.date_of_birth = parse_date('date_of_birth', attrs) self.date_of_birth = parse_date('date_of_birth', attrs)
attrs = remove_date('date_of_birth', attrs) attrs = remove_date('date_of_birth', attrs)
super super
self.document_number.upcase! unless self.document_number.blank?
end end
def save def save

3
app/models/verified_user.rb
View File

@@ -1,6 +1,5 @@
class VerifiedUser < ActiveRecord::Base class VerifiedUser < ActiveRecord::Base
scope :by_user, -> (user) { where(document_number: user.document_number, scope :by_user, -> (user) { where(document_number: user.document_number) }
document_type: user.document_type) }
scope :by_email, -> (email) { where(email: email) } scope :by_email, -> (email) { where(email: email) }
scope :by_phone, -> (phone) { where(phone: phone) } scope :by_phone, -> (phone) { where(phone: phone) }

24
spec/features/verification/verified_user_spec.rb
View File

@@ -5,22 +5,18 @@ feature 'Verified users' do
scenario "Verified emails" do scenario "Verified emails" do
user = create(:user, user = create(:user,
residence_verified_at: Time.now, residence_verified_at: Time.now,
document_number: '12345678Z', document_number: '12345678Z')
document_type: '2')
create(:verified_user, create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
email: 'rock@example.com') email: 'rock@example.com')
create(:verified_user, create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
email: 'roll@example.com') email: 'roll@example.com')
create(:verified_user, create(:verified_user,
document_number: '99999999R', document_number: '99999999R',
document_type: '2',
email: 'another@example.com') email: 'another@example.com')
login_as(user) login_as(user)
@@ -33,22 +29,18 @@ feature 'Verified users' do
scenario "Verified phones" do scenario "Verified phones" do
user = create(:user, user = create(:user,
residence_verified_at: Time.now, residence_verified_at: Time.now,
document_number: '12345678Z', document_number: '12345678Z')
document_type: '2')
create(:verified_user, create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
phone: '611111111') phone: '611111111')
create(:verified_user, create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
phone: '622222222') phone: '622222222')
create(:verified_user, create(:verified_user,
document_number: '99999999R', document_number: '99999999R',
document_type: '2',
phone: '633333333') phone: '633333333')
login_as(user) login_as(user)
@@ -61,12 +53,10 @@ feature 'Verified users' do
scenario "Select a verified email" do scenario "Select a verified email" do
user = create(:user, user = create(:user,
residence_verified_at: Time.now, residence_verified_at: Time.now,
document_number: '12345678Z', document_number: '12345678Z')
document_type: '2')
verified_user = create(:verified_user, verified_user = create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
email: 'rock@example.com') email: 'rock@example.com')
login_as(user) login_as(user)
@@ -83,12 +73,10 @@ feature 'Verified users' do
scenario "Select a verified phone" do scenario "Select a verified phone" do
user = create(:user, user = create(:user,
residence_verified_at: Time.now, residence_verified_at: Time.now,
document_number: '12345678Z', document_number: '12345678Z')
document_type: '2')
verified_user = create(:verified_user, verified_user = create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
phone: '611111111') phone: '611111111')
login_as(user) login_as(user)
@@ -104,12 +92,10 @@ feature 'Verified users' do
scenario "Continue without selecting any verified information" do scenario "Continue without selecting any verified information" do
user = create(:user, user = create(:user,
residence_verified_at: Time.now, residence_verified_at: Time.now,
document_number: '12345678Z', document_number: '12345678Z')
document_type: '2')
create(:verified_user, create(:verified_user,
document_number: '12345678Z', document_number: '12345678Z',
document_type: '2',
phone: '611111111') phone: '611111111')
login_as(user) login_as(user)

7
spec/models/residence_spec.rb
View File

@@ -40,6 +40,13 @@ describe Verification::Residence do
end end
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 describe "save" do
it "should store document number and type" do it "should store document number and type" do