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
11 changes: 10 additions & 1 deletion app/controllers/concerns/idv/choose_id_type_concern.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,21 @@ def set_passport_requested
if chosen_id_type == 'passport'
document_capture_session.update!(passport_status: 'requested')
else
document_capture_session.update!(passport_status: 'allowed')
document_capture_session.update!(passport_status: 'not_requested')
end
end

def choose_id_type_form_params
params.require(:doc_auth).permit(:choose_id_type_preference)
end

def auto_check_value
case document_capture_session.passport_status
when 'requested'
:passport
when 'not_requested'
:drivers_license
end
end
end
end
4 changes: 3 additions & 1 deletion app/controllers/idv/choose_id_type_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ class ChooseIdTypeController < ApplicationController
def show
analytics.idv_doc_auth_choose_id_type_visited(**analytics_arguments)
render 'idv/shared/choose_id_type',
locals: { form_url: idv_choose_id_type_path, is_hybrid: false },
locals: { form_url: idv_choose_id_type_path,
is_hybrid: false,
auto_check_value: auto_check_value },
layout: true
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ class ChooseIdTypeController < ApplicationController
def show
analytics.idv_doc_auth_choose_id_type_visited(**analytics_arguments)
render 'idv/shared/choose_id_type',
locals: { form_url: idv_hybrid_mobile_choose_id_type_path, is_hybrid: true }
locals: { form_url: idv_hybrid_mobile_choose_id_type_path,
is_hybrid: true,
auto_check_value: auto_check_value }
end

def update
Expand Down
1 change: 1 addition & 0 deletions app/models/document_capture_session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class DocumentCaptureSession < ApplicationRecord

PASSPORT_STATUSES = [
'allowed',
'not_requested',
'requested',
].freeze

Expand Down
1 change: 1 addition & 0 deletions app/views/idv/shared/choose_id_type.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
name: :choose_id_type_preference,
required: true,
wrapper: :uswds_radio_buttons,
checked: auto_check_value,
error_messages: { valueMissing: t('doc_auth.errors.choose_id_type_check') },
) %>
<%= f.submit t('forms.buttons.continue'), class: 'margin-y-2' %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
context 'user chooses drivers_license' do
it 'maintains passport_status as allowed and redirects to correct vendor' do
put :update, params: params
expect(document_capture_session.passport_status).to eq('allowed')
expect(document_capture_session.passport_status).to eq('not_requested')
expect(response).to redirect_to idv_hybrid_mobile_document_capture_url
end
end
Expand Down
10 changes: 10 additions & 0 deletions spec/features/idv/doc_auth/choose_id_type_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
choose(t('doc_auth.forms.id_type_preference.passport'))
click_on t('forms.buttons.continue')
expect(page).to have_current_path(idv_document_capture_url)
visit idv_choose_id_type_url
expect(page).to have_checked_field(
'doc_auth_choose_id_type_preference_passport',
visible: :all,
)
end
end

Expand All @@ -45,6 +50,11 @@
choose(t('doc_auth.forms.id_type_preference.drivers_license'))
click_on t('forms.buttons.continue')
expect(page).to have_current_path(idv_document_capture_url)
visit idv_choose_id_type_url
expect(page).to have_checked_field(
'doc_auth_choose_id_type_preference_drivers_license',
visible: :all,
)
end
end
end
10 changes: 10 additions & 0 deletions spec/features/idv/hybrid_mobile/hybrid_choose_id_type_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
choose(t('doc_auth.forms.id_type_preference.passport'))
click_on t('forms.buttons.continue')
expect(page).to have_current_path(idv_hybrid_mobile_document_capture_url)
visit idv_hybrid_mobile_choose_id_type_url
expect(page).to have_checked_field(
'doc_auth_choose_id_type_preference_passport',
visible: :all,
)
end
end

Expand All @@ -62,6 +67,11 @@
choose(t('doc_auth.forms.id_type_preference.drivers_license'))
click_on t('forms.buttons.continue')
expect(page).to have_current_path(idv_hybrid_mobile_document_capture_url)
visit idv_hybrid_mobile_choose_id_type_url
expect(page).to have_checked_field(
'doc_auth_choose_id_type_preference_drivers_license',
visible: :all,
)
end
end
end