1 files changed, 35 insertions, 30 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 596205fe540..26c99efc53d 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -26,53 +26,58 @@ 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')
+            page.has_css?('.login-page') ||
+              Page::Menu::Main.act { has_personal_area? }
           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'
+        def sign_in_using_credentials
+          # Don't try to log-in if we're already logged-in
+          return if Page::Menu::Main.act { has_personal_area? }
+
+          using_wait_time 0 do
+            set_initial_password_if_present
+
+            if Runtime::User.ldap_user?
+              sign_in_using_ldap_credentials
+            else
+              sign_in_using_gitlab_credentials
+            end
           end
         end
 
-        def sign_in_using_credentials
-          if Runtime::User.ldap_user?
-            sign_in_using_ldap_credentials
-          else
-            sign_in_using_gitlab_credentials
-          end
+        def self.path
+          '/users/sign_in'
         end
 
-        def sign_in_using_ldap_credentials
-          using_wait_time 0 do
-            set_initial_password_if_present
+        private
 
-            click_link 'LDAP'
+        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
+          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
-          using_wait_time 0 do
-            set_initial_password_if_present
-
-            click_link 'Standard' if page.has_content?('LDAP')
+          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
+          fill_in :user_login, with: Runtime::User.name
+          fill_in :user_password, with: Runtime::User.password
+          click_button 'Sign in'
         end
 
-        def self.path
-          '/users/sign_in'
+        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