diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-12-12 14:20:27 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-12-12 14:20:27 +0000 |
| commit | c6db4471aa73e68e558c22b8009be826a267d565 (patch) | |
| tree | 7a3c3ba7f3a4ca3f5a91e6a1a9440349e42d6779 /qa | |
| parent | 460eb38ce53acff9e4db003eaffa889e6ff40987 (diff) | |
| parent | 249a2c0ea9ebe091183f2a66341960f6b09e6243 (diff) | |
| download | gitlab-ce-c6db4471aa73e68e558c22b8009be826a267d565.tar.gz | |
Merge branch 'qa-mr-wait-for-push' into 'master'
Wait for push before trying to create a new MR
See merge request gitlab-org/gitlab-ce!23745
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/resource/merge_request.rb | 5 |
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) |