mirror of https://github.com/mastodon/mastodon
Extrude `fill_in_auth_details` method to `ProfileStories` spec support module (#31163)
This commit is contained in:
parent
6ad477d146
commit
95eadabe44
|
@ -3,6 +3,12 @@
|
|||
module ProfileStories
|
||||
attr_reader :bob, :alice, :alice_bio
|
||||
|
||||
def fill_in_auth_details(email, password)
|
||||
fill_in 'user_email', with: email
|
||||
fill_in 'user_password', with: password
|
||||
click_on I18n.t('auth.login')
|
||||
end
|
||||
|
||||
def as_a_registered_user
|
||||
@bob = Fabricate(
|
||||
:user,
|
||||
|
@ -16,9 +22,7 @@ module ProfileStories
|
|||
def as_a_logged_in_user
|
||||
as_a_registered_user
|
||||
visit new_user_session_path
|
||||
fill_in 'user_email', with: email
|
||||
fill_in 'user_password', with: password
|
||||
click_on I18n.t('auth.login')
|
||||
fill_in_auth_details(email, password)
|
||||
end
|
||||
|
||||
def as_a_logged_in_admin
|
||||
|
|
|
@ -17,17 +17,13 @@ describe 'Log in' do
|
|||
end
|
||||
|
||||
it 'A valid email and password user is able to log in' do
|
||||
fill_in 'user_email', with: email
|
||||
fill_in 'user_password', with: password
|
||||
click_on I18n.t('auth.login')
|
||||
fill_in_auth_details(email, password)
|
||||
|
||||
expect(subject).to have_css('div.app-holder')
|
||||
end
|
||||
|
||||
it 'A invalid email and password user is not able to log in' do
|
||||
fill_in 'user_email', with: 'invalid_email'
|
||||
fill_in 'user_password', with: 'invalid_password'
|
||||
click_on I18n.t('auth.login')
|
||||
fill_in_auth_details('invalid_email', 'invalid_password')
|
||||
|
||||
expect(subject).to have_css('.flash-message', text: failure_message('invalid'))
|
||||
end
|
||||
|
@ -36,9 +32,7 @@ describe 'Log in' do
|
|||
let(:confirmed_at) { nil }
|
||||
|
||||
it 'A unconfirmed user is able to log in' do
|
||||
fill_in 'user_email', with: email
|
||||
fill_in 'user_password', with: password
|
||||
click_on I18n.t('auth.login')
|
||||
fill_in_auth_details(email, password)
|
||||
|
||||
expect(subject).to have_css('div.admin-wrapper')
|
||||
end
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
require 'rails_helper'
|
||||
|
||||
describe 'Using OAuth from an external app' do
|
||||
include ProfileStories
|
||||
|
||||
subject { visit "/oauth/authorize?#{params.to_query}" }
|
||||
|
||||
let(:client_app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: about_url(host: Rails.application.config.x.local_domain), scopes: 'read') }
|
||||
|
@ -246,12 +248,6 @@ describe 'Using OAuth from an external app' do
|
|||
|
||||
private
|
||||
|
||||
def fill_in_auth_details(email, password)
|
||||
fill_in 'user_email', with: email
|
||||
fill_in 'user_password', with: password
|
||||
click_on I18n.t('auth.login')
|
||||
end
|
||||
|
||||
def fill_in_otp_details(value)
|
||||
fill_in 'user_otp_attempt', with: value
|
||||
click_on I18n.t('auth.login')
|
||||
|
|
Loading…
Reference in New Issue