Add latest changes from gitlab-org/gitlab@master

6 files changed, 6 insertions, 10 deletions

diff --git a/qa/qa/page/component/ci_badge_link.rb b/qa/qa/page/component/ci_badge_link.rb
index aad8dc1d3df..d3e44fd867d 100644
--- a/qa/qa/page/component/ci_badge_link.rb
+++ b/qa/qa/page/component/ci_badge_link.rb
@@ -26,7 +26,7 @@ module QA
         private
 
         def completed?(timeout: 60)
-          wait(reload: false, max: timeout) do
+          wait_until(reload: false, max_duration: timeout) do
             COMPLETED_STATUSES.include?(status_badge)
           end
         end
diff --git a/qa/qa/page/component/clone_panel.rb b/qa/qa/page/component/clone_panel.rb
index b80877f5ecd..fbe19e5802b 100644
--- a/qa/qa/page/component/clone_panel.rb
+++ b/qa/qa/page/component/clone_panel.rb
@@ -24,7 +24,7 @@ module QA
         private
 
         def repository_clone_location(kind)
-          wait(reload: false) do
+          wait_until(reload: false) do
             click_element :clone_dropdown
 
             within_element :clone_options do
diff --git a/qa/qa/page/component/dropdown_filter.rb b/qa/qa/page/component/dropdown_filter.rb
index e896c382779..a39a04a668d 100644
--- a/qa/qa/page/component/dropdown_filter.rb
+++ b/qa/qa/page/component/dropdown_filter.rb
@@ -5,9 +5,7 @@ module QA
     module Component
       module DropdownFilter
         def filter_and_select(item)
-          wait(reload: false) do
-            page.has_css?('.dropdown-input-field')
-          end
+          page.has_css?('.dropdown-input-field', wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
           find('.dropdown-input-field').set(item)
           click_link item
diff --git a/qa/qa/page/component/dropzone.rb b/qa/qa/page/component/dropzone.rb
index 757111f240b..2efb96a02bc 100644
--- a/qa/qa/page/component/dropzone.rb
+++ b/qa/qa/page/component/dropzone.rb
@@ -23,7 +23,7 @@ module QA
           page.attach_file(attachment, class: 'dz-hidden-input', make_visible: field_style)
 
           # Wait for link to be appended to dropzone text
-          page.wait(reload: false) do
+          page.wait_until(reload: false) do
             page.find("#{container} textarea").value.match(filename)
           end
         end
diff --git a/qa/qa/page/component/groups_filter.rb b/qa/qa/page/component/groups_filter.rb
index cc50bb439b4..7eb1257db71 100644
--- a/qa/qa/page/component/groups_filter.rb
+++ b/qa/qa/page/component/groups_filter.rb
@@ -23,9 +23,7 @@ module QA
           # Since we submitted after filtering, the presence of
           # groups_list_tree_container means we have the complete filtered list
           # of groups
-          wait(reload: false) do
-            page.has_css?(element_selector_css(:groups_list_tree_container))
-          end
+          has_element?(:groups_list_tree_container, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
           # If there are no groups we'll know immediately because we filtered the list
           return false if page.has_text?('No groups or projects matched your search', wait: 0)
diff --git a/qa/qa/page/component/legacy_clone_panel.rb b/qa/qa/page/component/legacy_clone_panel.rb
index e495cf4ef04..7b4b30623a6 100644
--- a/qa/qa/page/component/legacy_clone_panel.rb
+++ b/qa/qa/page/component/legacy_clone_panel.rb
@@ -30,7 +30,7 @@ module QA
         private
 
         def choose_repository_clone(kind, detect_text)
-          wait(reload: false) do
+          wait_until(reload: false) do
             click_element :clone_dropdown
 
             page.within('.clone-options-dropdown') do