Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 8 deletions

diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index ca93663dba2..c373ec6d4fd 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -42,7 +42,7 @@ module QA
           element :login_page, required: true
         end
 
-        def sign_in_using_credentials(user = nil)
+        def sign_in_using_credentials(user: nil, skip_page_validation: false)
           # Don't try to log-in if we're already logged-in
           return if Page::Main::Menu.perform(&:signed_in?)
 
@@ -52,9 +52,9 @@ module QA
             raise NotImplementedError if Runtime::User.ldap_user? && user&.credentials_given?
 
             if Runtime::User.ldap_user?
-              sign_in_using_ldap_credentials(user || Runtime::User)
+              sign_in_using_ldap_credentials(user: user || Runtime::User)
             else
-              sign_in_using_gitlab_credentials(user || Runtime::User)
+              sign_in_using_gitlab_credentials(user: user || Runtime::User, skip_page_validation: skip_page_validation)
             end
           end
         end
@@ -68,13 +68,13 @@ module QA
           using_wait_time 0 do
             set_initial_password_if_present
 
-            sign_in_using_gitlab_credentials(admin)
+            sign_in_using_gitlab_credentials(user: admin)
           end
 
           Page::Main::Menu.perform(&:has_personal_area?)
         end
 
-        def sign_in_using_ldap_credentials(user)
+        def sign_in_using_ldap_credentials(user:)
           Page::Main::Menu.perform(&:sign_out_if_signed_in)
 
           using_wait_time 0 do
@@ -148,18 +148,18 @@ module QA
         def sign_out_and_sign_in_as(user:)
           Menu.perform(&:sign_out_if_signed_in)
           has_sign_in_tab?
-          sign_in_using_credentials(user)
+          sign_in_using_credentials(user: user)
         end
 
         private
 
-        def sign_in_using_gitlab_credentials(user)
+        def sign_in_using_gitlab_credentials(user:, skip_page_validation: false)
           switch_to_sign_in_tab if has_sign_in_tab?
           switch_to_standard_tab if has_standard_tab?
 
           fill_element :login_field, user.username
           fill_element :password_field, user.password
-          click_element :sign_in_button, Page::Main::Menu
+          click_element :sign_in_button, !skip_page_validation && Page::Main::Menu
         end
 
         def set_initial_password_if_present
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 751b67d7695..3391ef454ee 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -13,6 +13,7 @@ module QA
           element :navbar, required: true
           element :user_avatar, required: true
           element :user_menu, required: true
+          element :stop_impersonation_link
         end
 
         view 'app/views/layouts/nav/_dashboard.html.haml' do
@@ -95,6 +96,10 @@ module QA
           has_element?(:admin_area_link, wait: wait)
         end
 
+        def click_stop_impersonation_link
+          click_element(:stop_impersonation_link)
+        end
+
         private
 
         def within_top_menu