DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

style: signin button styled accordingly to UX

Browse source
This commit is contained in:
Colin Darie 2022-10-05 16:38:49 +02:00
parent 5c36c2e317
commit 10917af523
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_header.haml
View file

@ -38,7 +38,7 @@
- if request.path == new_user_registration_path - if request.path == new_user_registration_path
%li %li
.fr-hidden-sm.fr-unhidden-lg.fr-link--sm= t('views.shared.account.already_user_question') .fr-hidden-sm.fr-unhidden-lg.fr-link--sm= t('views.shared.account.already_user_question')
%li= link_to t('views.shared.account.signin'), new_user_session_path, class: "fr-btn" %li= link_to t('views.shared.account.signin'), new_user_session_path, class: "fr-btn fr-btn--tertiary fr-icon-account-circle-fill fr-btn--icon-left"
%li %li
- if dossier.present? && nav_bar_profile == :user - if dossier.present? && nav_bar_profile == :user

2
config/locales/views/shared/fr.yml
View file

@ -19,4 +19,4 @@ fr:
already_user_question: 'Vous avez déjà un compte ?' already_user_question: 'Vous avez déjà un compte ?'
already_user: 'J’ai déjà un compte' already_user: 'J’ai déjà un compte'
create: 'Créer un compte' create: 'Créer un compte'
signin: 'Connexion' signin: 'Se connecter'

6
spec/system/sessions/sign_in_spec.rb
View file

@ -4,7 +4,7 @@ describe 'Signin in:' do
scenario 'an existing user can sign-in' do scenario 'an existing user can sign-in' do
visit root_path visit root_path
click_on 'Connexion' click_on 'Se connecter', match: :first
sign_in_with user.email, 'invalid-password' sign_in_with user.email, 'invalid-password'
expect(page).to have_content 'Courriel ou mot de passe incorrect.' expect(page).to have_content 'Courriel ou mot de passe incorrect.'
@ -16,7 +16,7 @@ describe 'Signin in:' do
scenario 'an existing user can lock its account' do scenario 'an existing user can lock its account' do
visit root_path visit root_path
click_on 'Connexion' click_on 'Se connecter', match: :first
5.times { sign_in_with user.email, 'bad password' } 5.times { sign_in_with user.email, 'bad password' }
expect(user.reload.access_locked?).to be false expect(user.reload.access_locked?).to be false
@ -60,7 +60,7 @@ describe 'Signin in:' do
# For now only test the default behavior (an error message is displayed). # For now only test the default behavior (an error message is displayed).
scenario 'they get an error message' do scenario 'they get an error message' do
visit root_path visit root_path
click_on 'Connexion' click_on 'Se connecter', match: :first
sign_in_with user.email, password sign_in_with user.email, password
expect(page).to have_content('Vous devez confirmer votre compte par courriel.') expect(page).to have_content('Vous devez confirmer votre compte par courriel.')

4
spec/system/users/managing_password_spec.rb
View file

@ -6,7 +6,7 @@ describe 'Managing password:', js: true do
scenario 'a simple user can reset their password' do scenario 'a simple user can reset their password' do
visit root_path visit root_path
within('.fr-header .fr-container .fr-header__tools .fr-btns-group') do within('.fr-header .fr-container .fr-header__tools .fr-btns-group') do
click_on 'Connexion' click_on 'Se connecter'
end end
click_on 'Mot de passe oublié ?' click_on 'Mot de passe oublié ?'
expect(page).to have_current_path(new_user_password_path) expect(page).to have_current_path(new_user_password_path)
@ -37,7 +37,7 @@ describe 'Managing password:', js: true do
scenario 'an admin can reset their password', js: true do scenario 'an admin can reset their password', js: true do
visit root_path visit root_path
within('.fr-header .fr-container .fr-header__tools .fr-btns-group') do within('.fr-header .fr-container .fr-header__tools .fr-btns-group') do
click_on 'Connexion' click_on 'Se connecter'
end end
click_on 'Mot de passe oublié ?' click_on 'Mot de passe oublié ?'
expect(page).to have_current_path(new_user_password_path) expect(page).to have_current_path(new_user_password_path)