Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 1 deletions

diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index a4c44f78ad4..f07d56e85c3 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -177,7 +177,7 @@ module QA
         # The number of selectors should be able to be reduced after
         # migration to the new spinner is complete.
         # https://gitlab.com/groups/gitlab-org/-/epics/956
-        has_no_css?('.gl-spinner, .fa-spinner, .spinner', wait: Capybara.default_max_wait_time)
+        has_no_css?('.gl-spinner, .fa-spinner, .spinner', wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
       end
 
       def finished_loading_block?
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index ad5b3c97cb9..940b7f332c7 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -155,6 +155,8 @@ module QA
         def merge!
           click_element :merge_button if ready_to_merge?
 
+          finished_loading?
+
           raise "Merge did not appear to be successful" unless merged?
         end
 
diff --git a/qa/qa/resource/api_fabricator.rb b/qa/qa/resource/api_fabricator.rb
index e6057433b55..3c06f139738 100644
--- a/qa/qa/resource/api_fabricator.rb
+++ b/qa/qa/resource/api_fabricator.rb
@@ -31,6 +31,12 @@ module QA
         resource_web_url(api_post)
       end
 
+      def reload!
+        api_get
+
+        self
+      end
+
       def remove_via_api!
         api_delete
       end
diff --git a/qa/qa/resource/group.rb b/qa/qa/resource/group.rb
index 0824512d238..a30bb8cbc77 100644
--- a/qa/qa/resource/group.rb
+++ b/qa/qa/resource/group.rb
@@ -16,6 +16,7 @@ module QA
 
       attribute :id
       attribute :name
+      attribute :runners_token
 
       def initialize
         @path = Runtime::Namespace.name