diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2018-10-26 15:47:30 -0400 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2018-10-26 15:47:30 -0400 |
| commit | f875a6f96c3460b7b81964579a57269f01ca2e68 (patch) | |
| tree | 40963d36cb273320254110da29cb53f2a512fc15 /qa | |
| parent | e997b22df50a46759cac9936a6557993310f8888 (diff) | |
| download | gitlab-ce-f875a6f96c3460b7b81964579a57269f01ca2e68.tar.gz | |
Wait for push before checking for new commitml-qa-squash-fix
Wait for the push to be completed before checking that the merge
request shows the change
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index 46e1005829d..724c48cd125 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -25,6 +25,7 @@ module QA push.file_content = "Test with unicode characters ❤✓€❄" end + Page::Project::Show.perform(&:wait_for_push) merge_request.visit! expect(page).to have_text('to be squashed') |