Skip to content

Fix untranslated email input in password reset #7537

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
mitchellhenke merged 3 commits into from
Dec 23, 2022
Merged

Fix untranslated email input in password reset #7537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3c74e5
Fix untranslated email input in password reset
Dec 22, 2022
05493f9
fix specs
Dec 22, 2022
e7498fe
Update app/views/devise/passwords/new.html.erb
Dec 23, 2022
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
12 changes: 8 additions & 4 deletions app/views/devise/passwords/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
url: user_password_path,
html: { autocomplete: 'off', method: :post },
) do |f| %>
<%= f.input :email,
required: true,
input_html: { autocorrect: 'off',
aria: { invalid: false, describedby: 'email-description' } } %>
<%= render ValidatedFieldComponent.new(
form: f,
name: :email,
label: t('account.index.email'),
required: true,
input_html: { autocorrect: 'off',
aria: { describedby: 'email-description' } },
) %>
<%= f.input :request_id, as: :hidden, input_html: { value: request_id } %>
<%= f.submit t('forms.buttons.continue'), class: 'display-block margin-y-5' %>
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions spec/features/multiple_emails/reset_password_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

visit root_path
click_link t('links.passwords.forgot')
fill_in 'Email', with: email1
fill_in t('account.index.email'), with: email1
click_button t('forms.buttons.continue')

expect_delivered_email_count(1)
Expand All @@ -20,7 +20,7 @@

visit root_path
click_link t('links.passwords.forgot')
fill_in 'Email', with: email2
fill_in t('account.index.email'), with: email2
click_button t('forms.buttons.continue')

expect_delivered_email_count(2)
Expand All @@ -42,7 +42,7 @@

visit root_path
click_link t('links.passwords.forgot')
fill_in 'Email', with: unconfirmed_email_address.email
fill_in t('account.index.email'), with: unconfirmed_email_address.email
click_button t('forms.buttons.continue')

expect_delivered_email_count(1)
Expand Down
2 changes: 1 addition & 1 deletion spec/features/users/sign_in_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
allow(Devise).to receive(:timeout_in).and_return(1)
user = create(:user)
visit root_path
fill_in 'Email', with: user.email
fill_in t('account.index.email'), with: user.email
fill_in 'Password', with: user.password

expect(page).to have_content(
Expand Down
10 changes: 5 additions & 5 deletions spec/features/visitors/password_recovery_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

visit root_path
click_link t('links.passwords.forgot')
fill_in 'Email', with: user.email
fill_in t('account.index.email'), with: user.email

expect(PushNotification::HttpPush).to receive(:deliver).
with(PushNotification::RecoveryActivatedEvent.new(user: user))
Expand Down Expand Up @@ -99,7 +99,7 @@
before do
user = create(:user)
visit new_user_password_path
fill_in 'Email', with: user.email
fill_in t('account.index.email'), with: user.email
click_button t('forms.buttons.continue')
visit edit_user_password_path(reset_password_token: 'invalid_token')
end
Expand Down Expand Up @@ -143,7 +143,7 @@
@user = create(:user, :signed_up)

visit new_user_password_path
fill_in 'Email', with: @user.email
fill_in t('account.index.email'), with: @user.email
click_button t('forms.buttons.continue')

raw_reset_token, db_confirmation_token =
Expand Down Expand Up @@ -226,7 +226,7 @@
user = create(:user, :signed_up)

visit new_user_password_path
fill_in 'Email', with: user.email
fill_in t('account.index.email'), with: user.email
click_button t('forms.buttons.continue')

user.reset_password_sent_at =
Expand Down Expand Up @@ -261,7 +261,7 @@

def submit_email_for_password_reset(email)
visit new_user_password_path
fill_in 'Email', with: email
fill_in t('account.index.email'), with: email
click_button t('forms.buttons.continue')
end
end
2 changes: 1 addition & 1 deletion spec/support/features/personal_key_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def personal_key_from_pii(user, pii)

def trigger_reset_password_and_click_email_link(email)
visit new_user_password_path
fill_in 'Email', with: email
fill_in t('account.index.email'), with: email
click_button t('forms.buttons.continue')
open_last_email
click_email_link_matching(/reset_password_token/)
Expand Down