Skip to content

LG-373 Use correct 2FA options link for PIV/CAC #2253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monfresh merged 1 commit into from
Jun 15, 2018
Merged

LG-373 Use correct 2FA options link for PIV/CAC #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/views/users/phone_setup/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ p.mt-tiny.mb0 = @presenter.info
input_html: { class: 'phone col-8 mb4' }
= f.button :submit, t('forms.buttons.send_security_code')
.mt2.pt1.border-top
= link_to t('devise.two_factor_authentication.two_factor_choice_cancel'), two_factor_options_path
- path = current_user.piv_cac_enabled? ? account_recovery_setup_path : two_factor_options_path
= link_to t('devise.two_factor_authentication.two_factor_choice_cancel'), path

= stylesheet_link_tag 'intl-tel-number/intlTelInput'
= javascript_pack_tag 'intl-tel-input'
6 changes: 6 additions & 0 deletions spec/support/shared_examples/account_creation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@

expect(page).to have_current_path(account_recovery_setup_path)
expect(page).to have_content t('instructions.account_recovery_setup.piv_cac_next_step')

select_2fa_option('sms')
click_link t('devise.two_factor_authentication.two_factor_choice_cancel')

expect(page).to have_current_path account_recovery_setup_path

configure_backup_phone
click_acknowledge_personal_key

Expand Down