Merge branch 'qa-nightly-41-fix-ldap-user-leak' into 'master'

Fix LDAP user leak into other tests

Closes gitlab-org/quality/nightly#41

See merge request gitlab-org/gitlab-ee!8788

qa/qa/page/main/login.rb

@@ -55,13 +55,11 @@ module QA
             raise NotImplementedError if Runtime::User.ldap_user? && user&.credentials_given?
 
             if Runtime::User.ldap_user?
-              sign_in_using_ldap_credentials
+              sign_in_using_ldap_credentials(user || Runtime::User)
             else
               sign_in_using_gitlab_credentials(user || Runtime::User)
             end
           end
-
-          Page::Main::Menu.act { has_personal_area? }
         end
 
         def sign_in_using_admin_credentials
@@ -76,6 +74,25 @@ module QA
             sign_in_using_gitlab_credentials(admin)
           end
 
+          Page::Main::Menu.perform(&:has_personal_area?)
+        end
+
+        def sign_in_using_ldap_credentials(user)
+          # Don't try to log-in if we're already logged-in
+          return if Page::Main::Menu.perform do |page|
+            page.has_personal_area?(wait: 0)
+          end
+
+          using_wait_time 0 do
+            set_initial_password_if_present
+
+            switch_to_ldap_tab
+
+            fill_element :username_field, user.ldap_username
+            fill_element :password_field, user.ldap_password
+            click_element :sign_in_button
+          end
+
           Page::Main::Menu.act { has_personal_area? }
         end
 
@@ -126,14 +143,6 @@ module QA
 
         private
 
-        def sign_in_using_ldap_credentials
-          switch_to_ldap_tab
-
-          fill_element :username_field, Runtime::User.ldap_username
-          fill_element :password_field, Runtime::User.ldap_password
-          click_element :sign_in_button
-        end
-
         def sign_in_with_saml
           set_initial_password_if_present
           click_element :saml_login_button
@@ -146,6 +155,8 @@ module QA
           fill_element :login_field, user.username
           fill_element :password_field, user.password
           click_element :sign_in_button
+
+          Page::Main::Menu.act { has_personal_area? }
         end
 
         def set_initial_password_if_present

qa/qa/specs/features/browser_ui/1_manage/ee_group/group_ldap_sync_spec.rb

@@ -144,12 +144,11 @@ module QA
       end
 
       def signin_and_visit_group_as_user(user_name, group)
-        Runtime::Env.ldap_username = user_name
-        Runtime::Env.ldap_password = 'password'
+        user = Struct.new(:ldap_username, :ldap_password).new(user_name, 'password')
 
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform do |login_page|
-          login_page.sign_in_using_credentials
+          login_page.sign_in_using_ldap_credentials(user)
         end
 
         group.visit!