diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 03:07:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 03:07:57 +0000 |
| commit | 330eac18cef61a4f58b3601265f7b631d2311cd0 (patch) | |
| tree | 87eec5d8c441581938ca908ce30199832e118b85 /qa/qa/specs/features/browser_ui/3_create | |
| parent | 3359a5a56337b93cd34b9914b6468395bfb6c514 (diff) | |
| download | gitlab-ce-330eac18cef61a4f58b3601265f7b631d2311cd0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/specs/features/browser_ui/3_create')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 6 |
1 files changed, 4 insertions, 2 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 f1ba726ddec..89f0fc37f3f 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 @@ -26,9 +26,11 @@ module QA merge_request.visit! - expect(page).to have_text('to be squashed') - Page::MergeRequest::Show.perform do |merge_request_page| + merge_request_page.retry_on_exception(reload: true) do + expect(merge_request_page).to have_text('to be squashed') + end + merge_request_page.mark_to_squash merge_request_page.merge! |