Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/qa/qa/page/component/select2.rb b/qa/qa/page/component/select2.rb
index d05c44d22b2..8fe6a4a75b3 100644
--- a/qa/qa/page/component/select2.rb
+++ b/qa/qa/page/component/select2.rb
@@ -20,12 +20,20 @@ module QA
 
         def search_and_select(item_text)
           find('.select2-input').set(item_text)
+
+          wait_for_search_to_complete
+
           select_item(item_text)
         end
 
         def expand_select_list
           find('span.select2-arrow').click
         end
+
+        def wait_for_search_to_complete
+          has_css?('.select2-active')
+          has_no_css?('.select2-active', wait: 30)
+        end
       end
     end
   end
diff --git a/qa/qa/page/file/shared/commit_button.rb b/qa/qa/page/file/shared/commit_button.rb
index d8e751dd7b6..559b4c6ceea 100644
--- a/qa/qa/page/file/shared/commit_button.rb
+++ b/qa/qa/page/file/shared/commit_button.rb
@@ -13,6 +13,10 @@ module QA
 
           def commit_changes
             click_element(:commit_button)
+
+            wait(reload: false, max: 60) do
+              finished_loading?
+            end
           end
         end
       end