summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/job/show.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-15 12:08:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-15 12:08:34 +0000
commit0820b29dca14bd22c2cee6d9ee2900b64385bfa6 (patch)
tree3637b0c997f5764c7255b830ffe32e53ac7ce078 /qa/qa/page/project/job/show.rb
parent778772c8d97adc025c126a941a1bd37bf72419ac (diff)
downloadgitlab-ce-0820b29dca14bd22c2cee6d9ee2900b64385bfa6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/page/project/job/show.rb')
-rw-r--r--qa/qa/page/project/job/show.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb
index 451ac8069e5..07dea3449f1 100644
--- a/qa/qa/page/project/job/show.rb
+++ b/qa/qa/page/project/job/show.rb
@@ -24,7 +24,7 @@ module QA::Page
def output(wait: 5)
result = ''
- wait(reload: false, max: wait, interval: 1) do
+ wait_until(reload: false, max_duration: wait, sleep_interval: 1) do
result = find_element(:job_log_content).text
result.include?('Job')
@@ -36,7 +36,7 @@ module QA::Page
private
def loaded?(wait: 60)
- wait(reload: true, max: wait, interval: 1) do
+ wait_until(reload: true, max_duration: wait, sleep_interval: 1) do
has_element?(:job_log_content, wait: 1)
end
end