Skip to content

Add spinner button to phone step #4546

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
zachmargolis merged 2 commits into from
Dec 30, 2020
Merged

Add spinner button to phone step #4546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41913c9
Add spinner button to phone step
zachmargolis Dec 30, 2020
fa6379b
add wait to accessibility spec
zachmargolis Dec 30, 2020
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
23 changes: 20 additions & 3 deletions app/views/idv/phone/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@
<br/>
</div>

<%= validated_form_for(@idv_form, url: idv_phone_path,
html: { autocomplete: 'off', method: :put, role: 'form', class: 'mt2' }) do |f| %>
<%= validated_form_for(@idv_form,
url: idv_phone_path,
data: {
form_steps_wait: '',
wait_step_path: idv_phone_path,
poll_interval_ms: AppConfig.env.poll_rate_for_verify_in_seconds.to_i * 1000,
},
html: {
autocomplete: 'off',
method: :put,
role: 'form',
class: 'mt2',
}) do |f| %>
<%= f.label :phone, label: t('idv.form.phone'), class: 'bold' %>
<%= f.input :phone, required: true, input_html: { aria: { invalid: false }, class: 'sm-col-8' }, label: false,
wrapper_html: { class: 'mr2' } %>
Expand All @@ -36,9 +47,15 @@
<%= render 'idv/phone/verification_options' %>
<% end %>

<%= f.button :submit, t('forms.buttons.continue'), class: 'btn-wide mt3 sm-col-6 col-12' %>
<%= render 'shared/spinner-button',
action_message: t('doc_auth.info.verifying'),
class: 'mt3' do %>
<%= f.button :submit, t('forms.buttons.continue'), class: 'btn-wide sm-col-6 col-12' %>
<% end %>
<% end %>

<div class="mt2 pt1 border-top">
<%= link_to t('links.cancel'), idv_cancel_path, class: 'h5' %>
</div>

<% javascript_pack_tag_once 'form-steps-wait' %>
2 changes: 1 addition & 1 deletion spec/features/accessibility/idv_pages_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
complete_all_doc_auth_steps
click_continue

expect(current_path).to eq idv_review_path
expect(page).to have_current_path(idv_review_path, wait: 5)
expect(page).to be_accessible.according_to :section508, :"best-practice"
expect(page).to label_required_fields
expect(page).to be_uniquely_titled
Expand Down
7 changes: 5 additions & 2 deletions spec/features/idv/steps/phone_step_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
expect(page).to have_current_path(idv_otp_delivery_method_path)
end

it 'redirects to the confirmation step when the phone matches the 2fa phone number' do
it 'redirects to the confirmation step when the phone matches the 2fa phone number', js: true do
user = user_with_2fa
start_idv_from_sp
complete_idv_steps_before_phone_step(user)
fill_out_phone_form_ok(MfaContext.new(user).phone_configurations.first.phone)

expect(page).to have_selector('.spinner-button')
click_idv_continue
expect(page).to have_selector('.spinner-button--spinner-active')

expect(page).to have_content(t('idv.titles.session.review'))
expect(page).to have_content(t('idv.titles.session.review'), wait: 1)
expect(page).to have_current_path(idv_review_path)
end

Expand Down