diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 12:06:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 12:06:26 +0000 |
commit | d2798d607e11e0ebae83ae909404834388733428 (patch) | |
tree | 096b7f4d4bdb315d28cdcd4d6db4e80911112e9c /qa/qa/page/main/login.rb | |
parent | d8211a0ed119eada7d292e974a8fc7b0cd982d3c (diff) | |
download | gitlab-ce-d2798d607e11e0ebae83ae909404834388733428.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/page/main/login.rb')
-rw-r--r-- | qa/qa/page/main/login.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 65d83926f38..ca93663dba2 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -44,7 +44,7 @@ module QA def sign_in_using_credentials(user = nil) # Don't try to log-in if we're already logged-in - return if Page::Main::Menu.perform { |menu| menu.has_personal_area?(wait: 0) } + return if Page::Main::Menu.perform(&:signed_in?) using_wait_time 0 do set_initial_password_if_present @@ -75,10 +75,7 @@ module QA end def sign_in_using_ldap_credentials(user) - # Log out if already logged in - Page::Main::Menu.perform do |menu| - menu.sign_out if menu.has_personal_area?(wait: 0) - end + Page::Main::Menu.perform(&:sign_out_if_signed_in) using_wait_time 0 do set_initial_password_if_present @@ -149,7 +146,7 @@ module QA end def sign_out_and_sign_in_as(user:) - Menu.perform(&:sign_out) + Menu.perform(&:sign_out_if_signed_in) has_sign_in_tab? sign_in_using_credentials(user) end |