Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def multiple_identities?
end

def active_profile
profiles.find(&:active?)
@_active_profile ||= profiles.verified.find(&:active?)
end

# This user's most recently activated profile that has also been deactivated
Expand Down
1 change: 1 addition & 0 deletions lib/tasks/dev.rake
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ namespace :dev do
ssn: "666-#{num_created}" # doesn't need to be legit 9 digits, just unique
)
recovery_code = profile.encrypt_pii(user.user_access_key, pii)
profile.verified_at = Time.zone.now
profile.activate

Rails.logger.warn "email=#{email_addr} recovery_code=#{recovery_code}"
Expand Down
10 changes: 5 additions & 5 deletions spec/controllers/verify_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
end

it 'does not track page visit if profile is active' do
profile = create(:profile, :active)
profile = create(:profile, :active, :verified)

stub_sign_in(profile.user)
stub_analytics
Expand All @@ -26,7 +26,7 @@
describe '#activated' do
context 'user has an active profile' do
it 'allows direct access' do
profile = create(:profile, :active)
profile = create(:profile, :active, :verified)

stub_sign_in(profile.user)

Expand All @@ -50,7 +50,7 @@
describe '#cancel' do
context 'user has an active profile' do
it 'does not allow direct access and redirects to activated url' do
profile = create(:profile, :active)
profile = create(:profile, :active, :verified)

stub_sign_in(profile.user)

Expand All @@ -74,7 +74,7 @@
describe '#fail' do
context 'user has an active profile' do
it 'does not allow direct access and redirects to activated url' do
profile = create(:profile, :active)
profile = create(:profile, :active, :verified)

stub_sign_in(profile.user)

Expand Down Expand Up @@ -112,7 +112,7 @@
describe '#retry' do
context 'user has an active profile' do
it 'does not allow direct access and redirects to activated url' do
profile = create(:profile, :active)
profile = create(:profile, :active, :verified)

stub_sign_in(profile.user)

Expand Down
4 changes: 2 additions & 2 deletions spec/decorators/user_decorator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
end

context 'with a verified account' do
let(:user) { build(:user, profiles: [verified_profile]) }
let(:user) { create(:user, profiles: [verified_profile]) }

it { expect(partial).to eq('profile/verified_account_badge') }
end
Expand All @@ -170,7 +170,7 @@
end

context 'with a verified account' do
let(:user) { build(:user, profiles: [verified_profile]) }
let(:user) { create(:user, profiles: [verified_profile]) }

it { expect(partial).to eq('shared/null') }
end
Expand Down