Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ h1.h3.my0 = decorated_session.new_session_heading
html: { autocomplete: 'off', role: 'form' }) do |f|
= f.input :email, required: true
= f.input :password, required: true
= f.button :submit, t('links.sign_in'), class: 'btn-wide'
= f.button :submit, t('links.next'), class: 'btn-wide'

- link = link_to t('notices.sign_in_consent.link'), privacy_path
p.my3 == t('notices.sign_in_consent.text', app: APP_NAME, link: link)
Expand Down
1 change: 1 addition & 0 deletions config/locales/links/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ en:
create_account: Create account
edit: Edit
help: Help
next: Next
passwords:
forgot: Forgot your password?
phone_confirmation:
Expand Down
2 changes: 1 addition & 1 deletion spec/features/flows/sp_authentication_flows_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

context 'with valid credentials entered' do
before do
fill_in_credentials_and_click_sign_in(@user.email, @user.password)
fill_in_credentials_and_submit(@user.email, @user.password)
end

it 'prompts for 2FA delivery method' do
Expand Down
4 changes: 2 additions & 2 deletions spec/features/users/sign_in_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@
Timecop.travel(Devise.timeout_in + 1.minute) do
expect(page).to_not have_content(t('forms.buttons.continue'))

fill_in_credentials_and_click_sign_in(user.email, user.password)
fill_in_credentials_and_submit(user.email, user.password)
expect(page).to have_content t('errors.invalid_authenticity_token')

fill_in_credentials_and_click_sign_in(user.email, user.password)
fill_in_credentials_and_submit(user.email, user.password)
expect(current_path).to eq user_two_factor_authentication_path
end
end
Expand Down
4 changes: 1 addition & 3 deletions spec/features/visitors/password_recovery_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
def reset_password_and_sign_back_in(user, password = 'a really long password')
fill_in 'New password', with: password
click_button t('forms.passwords.edit.buttons.submit')
fill_in 'Email', with: user.email
fill_in 'user_password', with: password
click_button t('links.sign_in')
fill_in_credentials_and_submit(user.email, password)
end

context 'user can reset their password via email', email: true do
Expand Down
6 changes: 3 additions & 3 deletions spec/support/features/session_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ def sign_up_with(email)

def signin(email, password)
visit new_user_session_path
fill_in_credentials_and_click_sign_in(email, password)
fill_in_credentials_and_submit(email, password)
end

def fill_in_credentials_and_click_sign_in(email, password)
def fill_in_credentials_and_submit(email, password)
fill_in 'Email', with: email
fill_in 'Password', with: password
click_button t('links.sign_in')
click_button t('links.next')
end

def sign_up
Expand Down