Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 6 deletions

diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index d79d2766248..3a836210dea 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -259,13 +259,10 @@ module QA
           wait_for_gitlab_to_respond
 
           Page::Main::Menu.perform(&:enable_new_navigation) if Runtime::Env.super_sidebar_enabled?
-          Page::Main::Menu.validate_elements_present! unless skip_page_validation
-        end
 
-        def wait_for_gitlab_to_respond
-          wait_until(sleep_interval: 5, message: '502 - GitLab is taking too much time to respond') do
-            has_no_text?('GitLab is taking too much time to respond')
-          end
+          wait_for_gitlab_to_respond
+
+          Page::Main::Menu.validate_elements_present! unless skip_page_validation
         end
 
         def fill_in_credential(user)
diff --git a/qa/qa/support/wait_for_requests.rb b/qa/qa/support/wait_for_requests.rb
index 2856602629a..ef7875eb838 100644
--- a/qa/qa/support/wait_for_requests.rb
+++ b/qa/qa/support/wait_for_requests.rb
@@ -39,6 +39,12 @@ module QA
           Capybara.page.has_no_css?('.gl-spinner', wait: wait)
         end
       end
+
+      def wait_for_gitlab_to_respond
+        Waiter.wait_until(sleep_interval: 5, message: '502 - GitLab is taking too much time to respond') do
+          Capybara.page.has_no_text?('GitLab is taking too much time to respond')
+        end
+      end
     end
   end
 end