diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-12-12 14:20:27 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-14 12:04:29 +0000 |
| commit | 8e347203657630643cf24bfc501b35f0f9276943 (patch) | |
| tree | 9f8122b57871467df5278c4afbfde3b448825152 /qa | |
| parent | 2d123a5075af2f73a1a4ea7ae60bea70e468e522 (diff) | |
| download | gitlab-ce-8e347203657630643cf24bfc501b35f0f9276943.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
(cherry picked from commit c6db4471aa73e68e558c22b8009be826a267d565)
249a2c0e Wait for push before trying to create a new MR
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 77afb3cfcba..cdfcf2b8742 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) |