From cb58e3d987bf4e850c8494409a7ce52700a0db9a Mon Sep 17 00:00:00 2001 From: Jack Cody Date: Mon, 24 Apr 2023 17:39:09 -0500 Subject: [PATCH 1/3] Add page titles, specs [skip changelog] --- app/presenters/webauthn_setup_presenter.rb | 9 +++++++++ .../users/backup_code_setup/index.html.erb | 2 ++ app/views/users/webauthn_setup/new.html.erb | 2 +- .../presenters/webauthn_setup_presenter_spec.rb | 16 ++++++++++++++-- .../backup_code_setup/index.html.erb_spec.rb | 17 +++++++++++++++++ .../users/webauthn_setup/new.html.erb_spec.rb | 6 ++++++ 6 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 spec/views/users/backup_code_setup/index.html.erb_spec.rb diff --git a/app/presenters/webauthn_setup_presenter.rb b/app/presenters/webauthn_setup_presenter.rb index 4b620568f8f..b6cd67268e7 100644 --- a/app/presenters/webauthn_setup_presenter.rb +++ b/app/presenters/webauthn_setup_presenter.rb @@ -27,6 +27,15 @@ def image_path end end + def page_title + if @platform_authenticator + # TODO: A new key will likely be needed + t('headings.webauthn_platform_setup.new') + else + t('headings.webauthn_setup.new') + end + end + def heading if @platform_authenticator t('headings.webauthn_platform_setup.new') diff --git a/app/views/users/backup_code_setup/index.html.erb b/app/views/users/backup_code_setup/index.html.erb index 5c8d14f271c..d09ffb4df31 100644 --- a/app/views/users/backup_code_setup/index.html.erb +++ b/app/views/users/backup_code_setup/index.html.erb @@ -1,3 +1,5 @@ +<% title t('forms.backup_code.are_you_sure_title') %> + <%= render PageHeadingComponent.new.with_content(t('forms.backup_code.are_you_sure_title')) %> <% t('forms.backup_code.are_you_sure_desc_html').each do |desc_p| %> diff --git a/app/views/users/webauthn_setup/new.html.erb b/app/views/users/webauthn_setup/new.html.erb index 611731e5386..b1e78fd3c74 100644 --- a/app/views/users/webauthn_setup/new.html.erb +++ b/app/views/users/webauthn_setup/new.html.erb @@ -1,4 +1,4 @@ -<% title t('titles.totp_setup.new') %> +<% title @presenter.page_title %> <%= image_tag asset_url(@presenter.image_path), alt: '', width: '90', class: 'margin-left-1 margin-bottom-2' %> diff --git a/spec/presenters/webauthn_setup_presenter_spec.rb b/spec/presenters/webauthn_setup_presenter_spec.rb index 04472d8e458..a084707e294 100644 --- a/spec/presenters/webauthn_setup_presenter_spec.rb +++ b/spec/presenters/webauthn_setup_presenter_spec.rb @@ -25,7 +25,13 @@ describe '#image_path' do subject { presenter.image_path } - it { is_expected.to eq('security-key.svg') } + it { is_expected.to eq('security-key.svg') } + end + + describe '#page_title' do + subject { presenter.image_path } + + it { is_expected.to t('headings.webauthn_setup.new') } end describe '#heading' do @@ -71,7 +77,13 @@ describe '#image_path' do subject { presenter.image_path } - it { is_expected.to eq('platform-authenticator.svg') } + it { is_expected.to eq('platform-authenticator.svg') } + end + + describe '#page_title' do + subject { presenter.image_path } + + it { is_expected.to t('headings.webauthn_platform_setup.new') } end describe '#heading' do diff --git a/spec/views/users/backup_code_setup/index.html.erb_spec.rb b/spec/views/users/backup_code_setup/index.html.erb_spec.rb new file mode 100644 index 00000000000..28893e7c37d --- /dev/null +++ b/spec/views/users/backup_code_setup/index.html.erb_spec.rb @@ -0,0 +1,17 @@ +require 'rails_helper' + +describe 'users/backup_code_setup/index.html.erb' do + let(:user) { build(:user) } + + before do + allow(view).to receive(:current_user).and_return(user) + end + + it 'has a localized title' do + expect(view).to receive(:title).with( \ + t('forms.backup_code.are_you_sure_title'), + ) + + render + end +end diff --git a/spec/views/users/webauthn_setup/new.html.erb_spec.rb b/spec/views/users/webauthn_setup/new.html.erb_spec.rb index 0b14be8b7aa..a9a3f515c6e 100644 --- a/spec/views/users/webauthn_setup/new.html.erb_spec.rb +++ b/spec/views/users/webauthn_setup/new.html.erb_spec.rb @@ -27,6 +27,12 @@ assign(:presenter, presenter) end + it 'has a localized title' do + expect(view).to receive(:title).with(presenter.page_title) + + render + end + it 'displays warning alert' do render From b449282f255b3888c0b877d5c32b59845866299a Mon Sep 17 00:00:00 2001 From: Jack Cody Date: Tue, 25 Apr 2023 10:21:15 -0500 Subject: [PATCH 2/3] Change key name --- app/presenters/webauthn_setup_presenter.rb | 4 ++-- config/locales/titles/en.yml | 1 + config/locales/titles/es.yml | 1 + config/locales/titles/fr.yml | 1 + spec/presenters/webauthn_setup_presenter_spec.rb | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/presenters/webauthn_setup_presenter.rb b/app/presenters/webauthn_setup_presenter.rb index b6cd67268e7..f1241403156 100644 --- a/app/presenters/webauthn_setup_presenter.rb +++ b/app/presenters/webauthn_setup_presenter.rb @@ -29,10 +29,10 @@ def image_path def page_title if @platform_authenticator - # TODO: A new key will likely be needed + # Note: The following title is incorrect and awaiting copy t('headings.webauthn_platform_setup.new') else - t('headings.webauthn_setup.new') + t('titles.webauthn_setup') end end diff --git a/config/locales/titles/en.yml b/config/locales/titles/en.yml index 69b0502a0ca..70a7f7aa22e 100644 --- a/config/locales/titles/en.yml +++ b/config/locales/titles/en.yml @@ -84,3 +84,4 @@ en: verify_profile: Activate your account visitors: index: Welcome + webauthn_setup: Add your security key diff --git a/config/locales/titles/es.yml b/config/locales/titles/es.yml index b81e037632d..f98580f21fa 100644 --- a/config/locales/titles/es.yml +++ b/config/locales/titles/es.yml @@ -85,3 +85,4 @@ es: verify_profile: Active su cuenta visitors: index: Bienvenido/a + webauthn_setup: Añade tu clave de seguridad diff --git a/config/locales/titles/fr.yml b/config/locales/titles/fr.yml index 086c69e29eb..f5abb22876f 100644 --- a/config/locales/titles/fr.yml +++ b/config/locales/titles/fr.yml @@ -85,3 +85,4 @@ fr: verify_profile: Activez votre compte visitors: index: Bienvenue + webauthn_setup: Ajoutez votre clé de sécurité diff --git a/spec/presenters/webauthn_setup_presenter_spec.rb b/spec/presenters/webauthn_setup_presenter_spec.rb index a084707e294..9ce0721f16a 100644 --- a/spec/presenters/webauthn_setup_presenter_spec.rb +++ b/spec/presenters/webauthn_setup_presenter_spec.rb @@ -31,7 +31,7 @@ describe '#page_title' do subject { presenter.image_path } - it { is_expected.to t('headings.webauthn_setup.new') } + it { is_expected.to t('titles.webauthn_setup') } end describe '#heading' do From 0444c3a023a157b6a372905d0782bf4af9dbfaca Mon Sep 17 00:00:00 2001 From: Jack Cody Date: Tue, 25 Apr 2023 11:08:56 -0500 Subject: [PATCH 3/3] Add page titles, specs changelog: Bug Fixes, Authentication, Fix page titles on backup codes and webauthn setup pages --- app/presenters/webauthn_setup_presenter.rb | 2 +- spec/presenters/webauthn_setup_presenter_spec.rb | 8 ++++---- spec/views/users/backup_code_setup/index.html.erb_spec.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/presenters/webauthn_setup_presenter.rb b/app/presenters/webauthn_setup_presenter.rb index f1241403156..8ad094cee34 100644 --- a/app/presenters/webauthn_setup_presenter.rb +++ b/app/presenters/webauthn_setup_presenter.rb @@ -33,7 +33,7 @@ def page_title t('headings.webauthn_platform_setup.new') else t('titles.webauthn_setup') - end + end end def heading diff --git a/spec/presenters/webauthn_setup_presenter_spec.rb b/spec/presenters/webauthn_setup_presenter_spec.rb index 9ce0721f16a..a0f380c1c91 100644 --- a/spec/presenters/webauthn_setup_presenter_spec.rb +++ b/spec/presenters/webauthn_setup_presenter_spec.rb @@ -29,9 +29,9 @@ end describe '#page_title' do - subject { presenter.image_path } + subject { presenter.page_title } - it { is_expected.to t('titles.webauthn_setup') } + it { is_expected.to eq(t('titles.webauthn_setup')) } end describe '#heading' do @@ -81,9 +81,9 @@ end describe '#page_title' do - subject { presenter.image_path } + subject { presenter.page_title } - it { is_expected.to t('headings.webauthn_platform_setup.new') } + it { is_expected.to eq(t('headings.webauthn_platform_setup.new')) } end describe '#heading' do diff --git a/spec/views/users/backup_code_setup/index.html.erb_spec.rb b/spec/views/users/backup_code_setup/index.html.erb_spec.rb index 28893e7c37d..c849f03e7dd 100644 --- a/spec/views/users/backup_code_setup/index.html.erb_spec.rb +++ b/spec/views/users/backup_code_setup/index.html.erb_spec.rb @@ -8,7 +8,7 @@ end it 'has a localized title' do - expect(view).to receive(:title).with( \ + expect(view).to receive(:title).with( t('forms.backup_code.are_you_sure_title'), )