From 17a1bedec0aebfea6f4459788758d55dbfd6db13 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 5 Sep 2015 01:44:06 +0200 Subject: [PATCH] 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)