Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 5 insertions, 14 deletions

diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index d0fe2987b0a..45496c6b245 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -25,19 +25,10 @@ module QA
         end
       end
 
-      def retry_until(max_attempts: 3, reload: false)
-        attempts = 0
-
-        while attempts < max_attempts
-          result = yield
-          return result if result
-
-          refresh if reload
-
-          attempts += 1
+      def retry_until(max_attempts: 3, reload: false, sleep_interval: 0)
+        QA::Support::Retrier.retry_until(max_attempts: max_attempts, reload_page: (reload && self), sleep_interval: sleep_interval) do
+          yield
         end
-
-        false
       end
 
       def retry_on_exception(max_attempts: 3, reload: false, sleep_interval: 0.5)
@@ -190,11 +181,11 @@ module QA
           return ["Page class does not have views / elements defined!"]
         end
 
-        views.map(&:errors).flatten
+        views.flat_map(&:errors)
       end
 
       def self.elements
-        views.map(&:elements).flatten
+        views.flat_map(&:elements)
       end
 
       def send_keys_to_element(name, keys)