Add latest changes from gitlab-org/gitlab@master

5 files changed, 7 insertions, 13 deletions

diff --git a/qa/qa/page/project/settings/ci_variables.rb b/qa/qa/page/project/settings/ci_variables.rb
index ff61e2d2c0c..64a182e5b3a 100644
--- a/qa/qa/page/project/settings/ci_variables.rb
+++ b/qa/qa/page/project/settings/ci_variables.rb
@@ -55,7 +55,7 @@ module QA
           private
 
           def toggle_masked(masked_node, masked)
-            wait(reload: false) do
+            wait_until(reload: false) do
               masked_node.click
 
               masked ? masked_enabled?(masked_node) : masked_disabled?(masked_node)
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index 12d7c0a396e..c330d090ce6 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -56,9 +56,7 @@ module QA
           private
 
           def within_project_deploy_keys
-            wait(reload: false) do
-              has_element?(:project_deploy_keys)
-            end
+            has_element?(:project_deploy_keys, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
             within_element(:project_deploy_keys) do
               yield
diff --git a/qa/qa/page/project/settings/deploy_tokens.rb b/qa/qa/page/project/settings/deploy_tokens.rb
index ad34ebc13c2..3173752d40a 100644
--- a/qa/qa/page/project/settings/deploy_tokens.rb
+++ b/qa/qa/page/project/settings/deploy_tokens.rb
@@ -51,9 +51,7 @@ module QA
           private
 
           def within_new_project_deploy_token
-            wait(reload: false) do
-              has_css?(element_selector_css(:created_deploy_token_section))
-            end
+            has_element?(:created_deploy_token_section, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
 
             within_element(:created_deploy_token_section) do
               yield
diff --git a/qa/qa/page/project/settings/mirroring_repositories.rb b/qa/qa/page/project/settings/mirroring_repositories.rb
index cae5831f100..517163a22f1 100644
--- a/qa/qa/page/project/settings/mirroring_repositories.rb
+++ b/qa/qa/page/project/settings/mirroring_repositories.rb
@@ -77,9 +77,7 @@ module QA
 
             # The host key detection process is interrupted if we navigate away
             # from the page before the fingerprint appears.
-            wait(max: 5) do
-              find_element(:fingerprints_list).has_text? /.*/
-            end
+            find_element(:fingerprints_list, text: /.*/)
           end
 
           def mirror_repository
@@ -100,7 +98,7 @@ module QA
             sleep 5
             refresh
 
-            wait(interval: 1) do
+            wait_until(sleep_interval: 1) do
               within_element_by_index(:mirrored_repository_row, row_index) do
                 last_update = find_element(:mirror_last_update_at_cell, wait: 0)
                 last_update.has_text?('just now') || last_update.has_text?('seconds')
@@ -117,7 +115,7 @@ module QA
           private
 
           def find_repository_row_index(target_url)
-            wait(max: 5, reload: false) do
+            wait_until(max_duration: 5, reload: false) do
               all_elements(:mirror_repository_url_cell, minimum: 1).index do |url|
                 # The url might be a sanitized url but the target_url won't be so
                 # we compare just the paths instead of the full url
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index 3f8aba78f44..ce17ca986a6 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -46,7 +46,7 @@ module QA
           end
 
           def protect_branch
-            click_element :protect_button
+            click_element(:protect_button, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
           end
 
           private