Skip to content

Commit

Permalink
Update handoff page Continue button to "Agree and continue" (#3619)
Browse files Browse the repository at this point in the history
* Update handoff page Continue button to "Agree and continue"

**Why**: Make it more clear this is for consent
  • Loading branch information
zachmargolis authored Mar 10, 2020
1 parent e8153a0 commit c206f4d
Show file tree
Hide file tree
Showing 32 changed files with 74 additions and 61 deletions.
2 changes: 1 addition & 1 deletion app/views/sign_up/completions/_show_sp.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ p.sm-mr1.sm-ml1.mt3.mb3
sp: content_tag(:strong, decorated_session.sp_agency))
p
.center
= button_to t('forms.buttons.continue'), sign_up_completed_path, \
= button_to t('sign_up.agree_and_continue'), sign_up_completed_path, \
class: 'btn btn-primary btn-wide'
1 change: 1 addition & 0 deletions config/locales/sign_up/en.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
en:
sign_up:
agree_and_continue: Agree and continue
cancel:
success: Your account has been deleted. We did not save your information.
warning_header: If you cancel now
Expand Down
1 change: 1 addition & 0 deletions config/locales/sign_up/es.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
es:
sign_up:
agree_and_continue: Aceptar y continuar
cancel:
success: Su cuenta ha sido eliminada. No guardamos su información.
warning_header: Si cancela ahora
Expand Down
1 change: 1 addition & 0 deletions config/locales/sign_up/fr.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
fr:
sign_up:
agree_and_continue: Acceptez et continuez
cancel:
success: Le dossier contenant votre information a été effacé
warning_header: Si vous annulez maintenant
Expand Down
2 changes: 1 addition & 1 deletion spec/features/backup_mfa/sign_up_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

expect(page).to have_current_path(sign_up_completed_path)

click_button t('forms.buttons.continue')
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
expect(user.reload.encrypted_recovery_code_digest).to be_empty
Expand Down
2 changes: 1 addition & 1 deletion spec/features/idv/uak_password_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

expect(page).to have_current_path(sign_up_completed_path)

click_on t('forms.buttons.continue')
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand Down
4 changes: 2 additions & 2 deletions spec/features/multiple_emails/sp_sign_in_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
signin(email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue if current_path == sign_up_completed_path
click_agree_and_continue if current_path == sign_up_completed_path

expect_oidc_sp_to_receive_email(email)

Expand All @@ -33,7 +33,7 @@
signin(email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue if current_path == sign_up_completed_path
click_agree_and_continue if current_path == sign_up_completed_path

xmldoc = SamlResponseDoc.new('feature', 'response_assertion')
email_from_saml_response = xmldoc.attribute_value_for('email')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def create_user_and_remember_device
check :remember_device
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

visit sign_out_url

Expand Down
14 changes: 7 additions & 7 deletions spec/features/openid_connect/openid_connect_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
handoff_page_steps: proc do
expect(page).to have_content(t('help_text.requested_attributes.verified_at'))

click_button t('forms.buttons.continue')
click_agree_and_continue
end,
)

Expand All @@ -175,7 +175,7 @@
expect(page).to have_content(t('help_text.requested_attributes.verified_at'))
expect(page).to have_content(t('help_text.requested_attributes.verified_at_blank'))

click_button t('forms.buttons.continue')
click_agree_and_continue
end,
)

Expand Down Expand Up @@ -208,7 +208,7 @@
expect(page).to have_content(t('titles.sign_up.refresh_consent'))
expect(page).to_not have_content(t('titles.sign_up.new_sp'))

click_button t('forms.buttons.continue')
click_agree_and_continue
end,
)
end
Expand Down Expand Up @@ -302,7 +302,7 @@
perform_in_browser(:two) do
confirm_email_in_a_different_browser(email)

click_button t('forms.buttons.continue')
click_agree_and_continue
continue_as(email)
redirect_uri = URI(current_url)
expect(redirect_uri.to_s).to start_with('gov.gsa.openidconnect.test://result')
Expand Down Expand Up @@ -333,7 +333,7 @@
expect(current_url).to eq(sign_up_completed_url)
expect(page).to have_content(t('titles.sign_up.new_sp'))

click_continue
click_agree_and_continue
expect(current_url).to start_with('http://localhost:7654/auth/result')
visit sign_out_url
visit oidc_path
Expand Down Expand Up @@ -416,7 +416,7 @@

perform_in_browser(:two) do
confirm_email_in_a_different_browser(email)
click_button t('forms.buttons.continue')
click_agree_and_continue

expect(current_url).to eq new_user_session_url
expect(page).
Expand Down Expand Up @@ -581,7 +581,7 @@ def oidc_end_client_secret_jwt(prompt: nil, user: nil, redirs_to: nil)
pii: { first_name: 'John', ssn: '111223333' }).user

sign_in_live_with_2fa(user)
click_continue
click_agree_and_continue_optional
redirect_uri = URI(current_url)
redirect_params = Rack::Utils.parse_query(redirect_uri.query).with_indifferent_access

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

redirect_host = URI.parse(current_url).host
redirect_scheme = URI.parse(current_url).scheme
Expand Down
2 changes: 1 addition & 1 deletion spec/features/personal_key_upgrade_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def expect_user_to_go_to_sp
expect(page).to have_content(t('help_text.requested_attributes.intro_html', sp: 'Test SP'))
expect(page).to have_current_path(sign_up_completed_path)

click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand Down
4 changes: 2 additions & 2 deletions spec/features/reports/sp_active_users_report_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue
expect(current_url).to start_with('http://localhost:7654/auth/result')

results = [{ 'issuer': 'urn:gov:gsa:openidconnect:sp:server',
Expand All @@ -26,7 +26,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue
expect(current_url).to start_with('http://localhost:7654/auth/result')

results = [{ 'issuer': 'urn:gov:gsa:openidconnect:sp:server',
Expand Down
2 changes: 1 addition & 1 deletion spec/features/reports/sp_success_rate_report_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ def visit_idp_from_sp_and_back_again
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue
end
end
2 changes: 1 addition & 1 deletion spec/features/saml/authorization_confirmation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def create_user_and_remember_device
fill_in_code_with_last_phone_otp
click_submit_default
visit saml_authn_request
click_continue
click_agree_and_continue
visit sign_out_url

user
Expand Down
12 changes: 6 additions & 6 deletions spec/features/saml/ial1_sso_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
to_not have_content t('help_text.requested_attributes.social_security_number')
end

click_on t('forms.buttons.continue')
click_agree_and_continue

continue_as(email)

Expand All @@ -45,7 +45,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

expect(current_url).to eq saml_authn_request

Expand Down Expand Up @@ -92,7 +92,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

expect(current_url).to eq saml_authn_request
end
Expand All @@ -115,12 +115,12 @@
end

it 'returns to sp after clicking continue' do
click_continue
click_agree_and_continue
expect(current_url).to eq(saml_authn_request)
end

it 'it confirms the user wants to continue to the SP after signing in again' do
click_continue
click_agree_and_continue

set_new_browser_session

Expand Down Expand Up @@ -216,7 +216,7 @@
expect(page).to have_content(t('help_text.requested_attributes.verified_at'))
expect(page).to have_content(t('help_text.requested_attributes.verified_at_blank'))

click_continue
click_agree_and_continue

xmldoc = SamlResponseDoc.new('feature', 'response_assertion')

Expand Down
4 changes: 2 additions & 2 deletions spec/features/saml/multiple_endpoints_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
it 'creates a valid auth request' do
sign_in_and_2fa_user(user)
visit endpoint_authn_request
click_continue
click_agree_and_continue

response_node = page.find('#SAMLResponse', visible: false)
decoded_response = Base64.decode64(response_node.value)
Expand All @@ -43,7 +43,7 @@
it 'create a valid logout request' do
sign_in_and_2fa_user(user)
visit endpoint_authn_request
click_continue
click_agree_and_continue

service_provider = ServiceProvider.from_issuer(endpoint_saml_settings.issuer)
uuid = user.decorate.active_identity_for(service_provider).uuid
Expand Down
2 changes: 1 addition & 1 deletion spec/features/saml/redirect_uri_validation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue
click_submit_default

expect(current_url).to eq sp.acs_url
Expand Down
4 changes: 2 additions & 2 deletions spec/features/saml/saml_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class MockSession; end
before do
sign_in_and_2fa_user(user)
visit sp1_authnrequest
click_continue
click_agree_and_continue
end

let(:xmldoc) { SamlResponseDoc.new('feature', 'response_assertion') }
Expand All @@ -61,7 +61,7 @@ class MockSession; end
before do
sign_in_and_2fa_user(user)
visit authnrequest_get
click_continue
click_agree_and_continue
end

let(:xmldoc) { SamlResponseDoc.new('feature', 'response_assertion') }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

expect(page).to have_current_path(sign_up_completed_path)

click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
click_idv_continue
complete_idv_profile_ok(user, new_password)
acknowledge_and_confirm_personal_key
click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')

Expand Down
13 changes: 7 additions & 6 deletions spec/features/users/sign_in_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
click_submit_default
click_continue
end
click_agree_and_continue
expect(current_url).to start_with('http://localhost:7654/auth/result')
end
scenario 'user cannot sign in with certificate timeout error' do
Expand Down Expand Up @@ -706,7 +707,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

redirect_uri = URI(current_url)

Expand All @@ -721,7 +722,7 @@
fill_in_credentials_and_submit(user.email, user.password)
fill_in_code_with_last_phone_otp
click_submit_default
click_continue
click_agree_and_continue

visit_idp_from_oidc_sp_with_loa1_prompt_login
expect(current_path).to eq(bounced_path)
Expand Down Expand Up @@ -786,7 +787,7 @@
expect(current_path).to eq sign_up_completed_path
expect(page).to have_content(user.email)

click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand All @@ -802,7 +803,7 @@
expect(current_path).to eq sign_up_completed_path
expect(page).to have_content('111223333')

click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand All @@ -819,7 +820,7 @@
expect(current_path).to eq sign_up_completed_path
expect(page).to have_content(user.email)

click_continue
click_agree_and_continue

expect(current_url).to eq @saml_authn_request
end
Expand All @@ -835,7 +836,7 @@
expect(current_path).to eq sign_up_completed_path
expect(page).to have_content('111223333')

click_continue
click_agree_and_continue

expect(current_url).to eq @saml_authn_request
end
Expand Down
2 changes: 1 addition & 1 deletion spec/features/users/user_profile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@

expect(current_path).to eq(sign_up_completed_path)

click_continue
click_agree_and_continue

expect(current_url).to start_with('http://localhost:7654/auth/result')
end
Expand Down
4 changes: 2 additions & 2 deletions spec/support/features/idv_from_sp_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ def create_ial2_user_from_sp(email)
fill_in 'Password', with: password
click_continue
click_acknowledge_personal_key
click_continue
click_agree_and_continue
end

def create_ial1_user_from_sp(email)
visit_idp_from_sp_with_ial1(:oidc)
register_user(email)
click_on t('forms.buttons.continue')
click_agree_and_continue
end

def create_ial1_user_directly(email)
Expand Down
Loading

0 comments on commit c206f4d

Please sign in to comment.