kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'qa-improve-main-login-page' into 'master'

Browse source 
Make Page::Main::Login#sign_in_using_credentials gracefully bail out when user is already logged-in

See merge request gitlab-org/gitlab-ce!19964
This commit is contained in:
Robert Speicher 2018-06-19 16:01:04 +00:00
commit d229e7d3f5
2 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
qa/qa/page/main/login.rb
View file

@ -26,54 +26,59 @@ module QA
end
def initialize
# The login page is usually the entry point for all the scenarios so
# we need to wait for the instance to start. That said, in some cases
# we are already logged-in so we check both cases here.
wait(max: 500) do
page.has_css?('.application')
end
end
def set_initial_password_if_present
if page.has_content?('Change your password')
fill_in :user_password, with: Runtime::User.password
fill_in :user_password_confirmation, with: Runtime::User.password
click_button 'Change your password'
page.has_css?('.login-page') ||
Page::Menu::Main.act { has_personal_area? }
end
end
def sign_in_using_credentials
if Runtime::User.ldap_user?
sign_in_using_ldap_credentials
else
sign_in_using_gitlab_credentials
end
end
# Don't try to log-in if we're already logged-in
return if Page::Menu::Main.act { has_personal_area? }
def sign_in_using_ldap_credentials
using_wait_time 0 do
set_initial_password_if_present
click_link 'LDAP'
fill_in :username, with: Runtime::User.ldap_username
fill_in :password, with: Runtime::User.ldap_password
click_button 'Sign in'
end
end
def sign_in_using_gitlab_credentials
using_wait_time 0 do
set_initial_password_if_present
click_link 'Standard' if page.has_content?('LDAP')
fill_in :user_login, with: Runtime::User.name
fill_in :user_password, with: Runtime::User.password
click_button 'Sign in'
if Runtime::User.ldap_user?
sign_in_using_ldap_credentials
else
sign_in_using_gitlab_credentials
end
end
end
def self.path
'/users/sign_in'
end
private
def sign_in_using_ldap_credentials
click_link 'LDAP'
fill_in :username, with: Runtime::User.ldap_username
fill_in :password, with: Runtime::User.ldap_password
click_button 'Sign in'
end
def sign_in_using_gitlab_credentials
click_link 'Standard' if page.has_content?('LDAP')
fill_in :user_login, with: Runtime::User.name
fill_in :user_password, with: Runtime::User.password
click_button 'Sign in'
end
def set_initial_password_if_present
return unless page.has_content?('Change your password')
fill_in :user_password, with: Runtime::User.password
fill_in :user_password_confirmation, with: Runtime::User.password
click_button 'Change your password'
end
end
end
end

3
qa/qa/page/menu/main.rb
View file

@ -55,7 +55,8 @@ module QA
end
def has_personal_area?
page.has_selector?('.qa-user-avatar')
# No need to wait, either we're logged-in, or not.
using_wait_time(0) { page.has_selector?('.qa-user-avatar') }
end
private