Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
49471b6
change text for start over verify screen
theabrad Oct 2, 2023
4540ba6
add translations for page
theabrad Oct 4, 2023
6fdc740
add changelog
theabrad Oct 4, 2023
5429f9a
remove unused i18n
theabrad Oct 4, 2023
d8dd952
create new translation with question mark added
theabrad Oct 10, 2023
8aca6b2
Merge branch 'main' of github.com:18F/identity-idp into abrad-lg-1112…
theabrad Oct 11, 2023
c2c9aaf
Merge branch 'main' of github.com:18F/identity-idp into abrad-lg-1112…
theabrad Oct 13, 2023
c330a57
current step indicator for user not in gpo flow yet
theabrad Oct 13, 2023
6e52ef1
a missing period
solipet Oct 16, 2023
f8b463a
Restore deleted translations, and rename start_over to start_over_new…
soniaconnolly Oct 17, 2023
57c1d7e
New template for confirm start over from request_letter
soniaconnolly Oct 18, 2023
140e798
Update specs to check for correct template
soniaconnolly Oct 18, 2023
39d9724
Add before_letter route for new screen, don't use it yet
soniaconnolly Oct 19, 2023
b7c5ee4
Lint, unused arg in analytics_events
soniaconnolly Oct 19, 2023
c10217f
Merge remote-tracking branch 'origin/main' into abrad-lg-11126-update…
soniaconnolly Oct 19, 2023
150335a
alphabetization lint
soniaconnolly Oct 19, 2023
20a6186
Add suggested comment
soniaconnolly Oct 19, 2023
138977b
Merge remote-tracking branch 'origin/main' into abrad-lg-11126-update…
soniaconnolly Oct 19, 2023
4d788d2
Start using new confirm_start_over_before_letter route
soniaconnolly Oct 19, 2023
5d37d4d
Merge remote-tracking branch 'origin/main' into sonia-lg-11126-use-ne…
soniaconnolly Oct 20, 2023
9df91f7
changelog
soniaconnolly Oct 20, 2023
03836bf
Merge remote-tracking branch 'origin/main' into sonia-lg-11126-use-ne…
soniaconnolly Oct 24, 2023
405112a
Fix fallback_path from new before_letter template
soniaconnolly Oct 24, 2023
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
13 changes: 2 additions & 11 deletions app/controllers/idv/confirm_start_over_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,13 @@ class ConfirmStartOverController < ApplicationController
def index
@step_indicator_step = requested_letter_before? ? :get_a_letter : :verify_phone_or_address

# Temporarily check referer until request letter view is updated to link to
# the before_letter route
if request.referer == idv_request_letter_url
analytics.idv_gpo_confirm_start_over_before_letter_visited
render 'idv/confirm_start_over/before_letter'
else
analytics.idv_gpo_confirm_start_over_visited
render :index
end
analytics.idv_gpo_confirm_start_over_visited
end

def before_letter
@step_indicator_step = requested_letter_before? ? :get_a_letter : :verify_phone_or_address
analytics.idv_gpo_confirm_start_over_before_letter_visited

render 'idv/confirm_start_over/before_letter'
analytics.idv_gpo_confirm_start_over_before_letter_visited
end

private
Expand Down
2 changes: 1 addition & 1 deletion app/views/idv/by_mail/request_letter/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<p>
<%= start_over_link_html = link_to(
t('idv.messages.gpo.start_over_link_text'),
idv_confirm_start_over_path,
idv_confirm_start_over_before_letter_path,
)
t(
'idv.messages.gpo.start_over_html',
Expand Down
4 changes: 2 additions & 2 deletions app/views/idv/confirm_start_over/before_letter.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<div class="margin-y-5">
<%= render ButtonComponent.new(
action: ->(**tag_options, &block) do
button_to(idv_session_path(step: :gpo_verify), **tag_options, &block)
button_to(idv_session_path(step: :request_letter), **tag_options, &block)
end,
method: :delete,
big: true,
wide: true,
).with_content(t('idv.buttons.continue_plain')) %>
</div>
<% end %>
<%= render('idv/shared/back', step: 'gpo_verify', fallback_path: idv_verify_by_mail_enter_code_path) %>
<%= render('idv/shared/back', step: 'request_letter', fallback_path: idv_request_letter_path) %>
17 changes: 0 additions & 17 deletions spec/features/idv/confirm_start_over_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,6 @@
complete_idv_steps_before_gpo_step
click_on t('idv.messages.gpo.start_over_link_text')

expect(current_path).to eq idv_confirm_start_over_path
expect(page).to have_content(t('idv.cancel.description.gpo.start_over_new_address'))
expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_phone_or_address'))
expect(fake_analytics).to have_logged_event(:idv_gpo_confirm_start_over_before_letter_visited)
click_idv_continue

expect(current_path).to eq idv_welcome_path
end
end

context 'user decides to start over from request letter page with new route' do
it 'allows user to start over' do
start_idv_from_sp
complete_idv_steps_before_gpo_step
click_on t('idv.messages.gpo.start_over_link_text')
visit idv_confirm_start_over_before_letter_path

expect(current_path).to eq idv_confirm_start_over_before_letter_path
expect(page).to have_content(t('idv.cancel.description.gpo.start_over_new_address'))
expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_phone_or_address'))
Expand Down