Revert changes login.rb. LDAP creds provided to runtime

qa/qa/page/main/login.rb

@@ -41,7 +41,7 @@ module QA
           # we are already logged-in so we check both cases here.
           wait(max: 500) do
             has_css?('.login-page') ||
-              Page::Main::Menu.act { has_personal_area?(wait: 0) }
+                Page::Main::Menu.act { has_personal_area?(wait: 0) }
           end
         end
 
@@ -65,16 +65,6 @@ module QA
         end
 
         def sign_in_using_admin_credentials
-          # Don't try to log-in if we're already logged-in as admin
-          return if Page::Main::Menu.perform do |menu|
-            menu.has_admin_area_link?(wait: 0)
-          end
-
-          # If already logged in as non admin, logout first
-          Page::Main::Menu.perform do |menu|
-            menu.sign_out if menu.has_personal_area?(wait: 0)
-          end
-
           admin = QA::Resource::User.new.tap do |user|
             user.username = QA::Runtime::User.admin_username
             user.password = QA::Runtime::User.admin_password
@@ -134,16 +124,16 @@ module QA
           click_element :standard_tab
         end
 
-        def sign_in_using_ldap_credentials(username: Runtime::User.ldap_username, password: Runtime::User.ldap_password)
+        private
+
+        def sign_in_using_ldap_credentials
           switch_to_ldap_tab
 
-          fill_element :username_field, username
-          fill_element :password_field, password
+          fill_element :username_field, Runtime::User.ldap_username
+          fill_element :password_field, Runtime::User.ldap_password
           click_element :sign_in_button
         end
 
-        private
-
         def sign_in_with_saml
           set_initial_password_if_present
           click_element :saml_login_button

qa/qa/runtime/api/client.rb

@@ -31,7 +31,7 @@ module QA
         end
 
         def do_create_personal_access_token
-          Page::Main::Login.act { sign_in_using_admin_credentials }
+          Page::Main::Login.act { sign_in_using_credentials }
           Resource::PersonalAccessToken.fabricate!.access_token
         end
       end

qa/qa/runtime/env.rb

@@ -7,7 +7,7 @@ module QA
 
       extend self
 
-      attr_writer :personal_access_token
+      attr_writer :personal_access_token, :ldap_username, :ldap_password
 
       # The environment variables used to indicate if the environment under test
       # supports the given feature
@@ -94,11 +94,11 @@ module QA
       end
 
       def ldap_username
-        ENV['GITLAB_LDAP_USERNAME']
+        @ldap_username ||= ENV['GITLAB_LDAP_USERNAME']
       end
 
       def ldap_password
-        ENV['GITLAB_LDAP_PASSWORD']
+        @ldap_password ||= ENV['GITLAB_LDAP_PASSWORD']
       end
 
       def sandbox_name

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

@@ -85,8 +85,11 @@ module QA
       end
 
       def create_group_with_user_via_api(user: nil, group_name: nil)
+        Runtime::Env.ldap_username = user
+        Runtime::Env.ldap_password = 'password'
+
         Page::Main::Login.perform do |login_page|
-          login_page.sign_in_using_ldap_credentials(username: user, password: 'password')
+          login_page.sign_in_using_credentials
         end
 
         Page::Main::Menu.perform do |menu|

qa/qa/specs/features/browser_ui/1_manage/ee_ldap/admin_ldap_sync_spec.rb

@@ -7,7 +7,10 @@ module QA
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
 
         Page::Main::Login.perform do |login_page|
-          login_page.sign_in_using_ldap_credentials(username: 'adminuser1', password: 'password')
+          Runtime::Env.ldap_username = 'adminuser1'
+          Runtime::Env.ldap_password = 'password'
+
+          login_page.sign_in_using_credentials
         end
 
         Page::Main::Menu.perform do |menu|