summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2018-05-03 10:34:42 -0700
committerMichael Kozono <mkozono@gmail.com>2018-06-08 09:05:06 -0700
commit700e15a8e79fbb9d53b1a2bf803135a3dfa637ce (patch)
tree03ddb9b84ba4a3af5ee73f3d60dc4a54c9d06ece
parentbe806549cad030df4a081acc748bd703d140ff9d (diff)
downloadgitlab-ce-700e15a8e79fbb9d53b1a2bf803135a3dfa637ce.tar.gz
Remove arbitrary 5 second wait
-rw-r--r--qa/qa/factory/resource/branch.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/qa/factory/resource/branch.rb b/qa/qa/factory/resource/branch.rb
index 1785441f5a8..f273df98bd3 100644
--- a/qa/qa/factory/resource/branch.rb
+++ b/qa/qa/factory/resource/branch.rb
@@ -46,7 +46,9 @@ module QA
resource.remote_branch = @branch_name
end
- Page::Project::Show.act { wait_for_push }
+ Page::Project::Show.perform do |page|
+ page.wait { page.has_content?(branch_name) }
+ end
# The upcoming process will make it access the Protected Branches page,
# select the already created branch and protect it according