summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2018-12-11 12:10:51 -0500
committerMark Lapierre <mlapierre@gitlab.com>2018-12-11 12:10:51 -0500
commit249a2c0ea9ebe091183f2a66341960f6b09e6243 (patch)
tree0f941a85a3fe9f8b556a4be3573101cf2f9d13ae /qa
parentcc7353523bc1d19054769d7a0a61b0cb7f6ce4e3 (diff)
downloadgitlab-ce-249a2c0ea9ebe091183f2a66341960f6b09e6243.tar.gz
Wait for push before trying to create a new MR
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/resource/merge_request.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index 45cb317e0eb..7150098a00a 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -58,7 +58,10 @@ module QA
populate(:target, :source)
project.visit!
- Page::Project::Show.perform(&:new_merge_request)
+ Page::Project::Show.perform do |project|
+ project.wait_for_push
+ project.new_merge_request
+ end
Page::MergeRequest::New.perform do |page|
page.fill_title(@title)
page.fill_description(@description)