summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-06-07 10:41:10 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-06-07 10:41:10 +0000
commit7c179bf39ec3d0f8e22ad71608546273bb0760db (patch)
tree68532a7f2127e4dce530982e0bda3861bbbc39fc
parent95b3e51f117167d48ba04f2dcef6922aff885617 (diff)
parentd3659575469bb8a7a5f6bd4ecb86de88d5c2672c (diff)
downloadgitlab-ce-7c179bf39ec3d0f8e22ad71608546273bb0760db.tar.gz
Merge branch 'qa-268-fix-pipeline-spec' into 'master'
Fix default wait argument in QA Pipelines spec Closes gitlab-qa#268 See merge request gitlab-org/gitlab-ce!19517
-rw-r--r--qa/qa/page/project/pipeline/show.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/page/project/pipeline/show.rb b/qa/qa/page/project/pipeline/show.rb
index de849b3eee8..babc0079f3f 100644
--- a/qa/qa/page/project/pipeline/show.rb
+++ b/qa/qa/page/project/pipeline/show.rb
@@ -24,10 +24,10 @@ module QA::Page
end
end
- def has_build?(name, status: :success, wait:)
+ def has_build?(name, status: :success, wait: nil)
within('.pipeline-graph') do
within('.ci-job-component', text: name) do
- has_selector?(".ci-status-icon-#{status}", wait: wait)
+ has_selector?(".ci-status-icon-#{status}", { wait: wait }.compact)
end
end
end