OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Extrude `fill_in_auth_details` method to `ProfileStories` spec support module (#31163)

pull/31186/head
Matt Jankowski 2024-07-29 04:31:42 -04:00 committed by GitHub
parent 6ad477d146
commit 95eadabe44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/support/stories/profile_stories.rb
View File

@ -3,6 +3,12 @@
module ProfileStories module ProfileStories
attr_reader :bob, :alice, :alice_bio 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 def as_a_registered_user
@bob = Fabricate( @bob = Fabricate(
:user, :user,
@ -16,9 +22,7 @@ module ProfileStories
def as_a_logged_in_user def as_a_logged_in_user
as_a_registered_user as_a_registered_user
visit new_user_session_path visit new_user_session_path
fill_in 'user_email', with: email fill_in_auth_details(email, password)
fill_in 'user_password', with: password
click_on I18n.t('auth.login')
end end
def as_a_logged_in_admin def as_a_logged_in_admin

12
spec/system/log_in_spec.rb
View File

@ -17,17 +17,13 @@ describe 'Log in' do
end end
it 'A valid email and password user is able to log in' do it 'A valid email and password user is able to log in' do
fill_in 'user_email', with: email fill_in_auth_details(email, password)
fill_in 'user_password', with: password
click_on I18n.t('auth.login')
expect(subject).to have_css('div.app-holder') expect(subject).to have_css('div.app-holder')
end end
it 'A invalid email and password user is not able to log in' do it 'A invalid email and password user is not able to log in' do
fill_in 'user_email', with: 'invalid_email' fill_in_auth_details('invalid_email', 'invalid_password')
fill_in 'user_password', with: 'invalid_password'
click_on I18n.t('auth.login')
expect(subject).to have_css('.flash-message', text: failure_message('invalid')) expect(subject).to have_css('.flash-message', text: failure_message('invalid'))
end end
@ -36,9 +32,7 @@ describe 'Log in' do
let(:confirmed_at) { nil } let(:confirmed_at) { nil }
it 'A unconfirmed user is able to log in' do it 'A unconfirmed user is able to log in' do
fill_in 'user_email', with: email fill_in_auth_details(email, password)
fill_in 'user_password', with: password
click_on I18n.t('auth.login')
expect(subject).to have_css('div.admin-wrapper') expect(subject).to have_css('div.admin-wrapper')
end end

8
spec/system/oauth_spec.rb
View File

@ -3,6 +3,8 @@
require 'rails_helper' require 'rails_helper'
describe 'Using OAuth from an external app' do describe 'Using OAuth from an external app' do
include ProfileStories
subject { visit "/oauth/authorize?#{params.to_query}" } 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') } 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 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) def fill_in_otp_details(value)
fill_in 'user_otp_attempt', with: value fill_in 'user_otp_attempt', with: value
click_on I18n.t('auth.login') click_on I18n.t('auth.login')