diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-30 12:07:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-30 12:07:45 +0000 |
| commit | 317554609e350b9d96190aa985d32d8185d76489 (patch) | |
| tree | 7ff15b3f404cebc1aa3b462e70474b3305f7fc01 | |
| parent | f15e537a25735d4f77d5fc09afc2f6c6479661a9 (diff) | |
| parent | f875a6f96c3460b7b81964579a57269f01ca2e68 (diff) | |
| download | gitlab-ce-317554609e350b9d96190aa985d32d8185d76489.tar.gz | |
Merge branch 'ml-qa-squash-fix' into 'master'
Wait for push before checking for new commit
Closes gitlab-org/quality/staging#14
See merge request gitlab-org/gitlab-ce!22633
| -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') |