Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/qa/qa/resource/events/base.rb b/qa/qa/resource/events/base.rb
index b50b620b143..f98a54a6f57 100644
--- a/qa/qa/resource/events/base.rb
+++ b/qa/qa/resource/events/base.rb
@@ -4,6 +4,7 @@ module QA
   module Resource
     module Events
       MAX_WAIT = 10
+      RAISE_ON_FAILURE = true
 
       EventNotFoundError = Class.new(RuntimeError)
 
@@ -21,7 +22,7 @@ module QA
         end
 
         def wait_for_event
-          event_found = QA::Support::Waiter.wait(max: max_wait) do
+          event_found = Support::Waiter.wait_until(max_duration: max_wait, raise_on_failure: raise_on_failure) do
             yield
           end
 
@@ -31,6 +32,10 @@ module QA
         def max_wait
           MAX_WAIT
         end
+
+        def raise_on_failure
+          RAISE_ON_FAILURE
+        end
       end
     end
   end