diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 12:09:17 +0000 |
| commit | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (patch) | |
| tree | f1096c68e457aef7f5201acd16e4a751ff538026 /spec/features/merge_request | |
| parent | 18f7828977b74bf6e5153594a098ef90e773b3b7 (diff) | |
| download | gitlab-ce-cd52759ee33051b8ad7b88b02ba7954e4fad7018.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb index 38a31d3bbd9..b8a5a4036a5 100644 --- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb +++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb @@ -568,5 +568,8 @@ describe 'Merge request > User resolves diff notes and threads', :js do def visit_merge_request(mr = nil) mr ||= merge_request visit project_merge_request_path(mr.project, mr) + + # Wait for MR widget to load + wait_for_requests end end |