summaryrefslogtreecommitdiff
path: root/qa/qa/flow/login.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/flow/login.rb')
-rw-r--r--qa/qa/flow/login.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/qa/qa/flow/login.rb b/qa/qa/flow/login.rb
index 05a509588f1..5f7e0227ac5 100644
--- a/qa/qa/flow/login.rb
+++ b/qa/qa/flow/login.rb
@@ -23,8 +23,11 @@ module QA
end
def sign_in(as: nil, address: :gitlab, skip_page_validation: false, admin: false)
- Page::Main::Menu.perform(&:sign_out) if Page::Main::Menu.perform(&:signed_in?)
- Runtime::Browser.visit(address, Page::Main::Login)
+ unless Page::Main::Login.perform(&:on_login_page?)
+ Page::Main::Menu.perform(&:sign_out) if Page::Main::Menu.perform(&:signed_in?)
+ Runtime::Browser.visit(address, Page::Main::Login)
+ end
+
Page::Main::Login.perform do |login|
if admin
login.sign_in_using_admin_credentials