summaryrefslogtreecommitdiff
path: root/spec/frontend/notes/components
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-31 12:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-31 12:08:51 +0000
commit7ac9cddf764fe60a7f86ae9b0bfb5c30825d9a4e (patch)
tree75aabc7bde10a11819d48d6f2e64667c0e4bd183 /spec/frontend/notes/components
parentfe98ad8383b9528553329a2a164173ba52c86168 (diff)
downloadgitlab-ce-7ac9cddf764fe60a7f86ae9b0bfb5c30825d9a4e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/notes/components')
-rw-r--r--spec/frontend/notes/components/diff_discussion_header_spec.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/frontend/notes/components/diff_discussion_header_spec.js b/spec/frontend/notes/components/diff_discussion_header_spec.js
index f90147f9105..be912777d64 100644
--- a/spec/frontend/notes/components/diff_discussion_header_spec.js
+++ b/spec/frontend/notes/components/diff_discussion_header_spec.js
@@ -38,7 +38,9 @@ describe('diff_discussion_header component', () => {
wrapper.setProps({ discussion });
- expect(wrapper.find('.user-avatar-link').exists()).toBe(true);
+ return wrapper.vm.$nextTick().then(() => {
+ expect(wrapper.find('.user-avatar-link').exists()).toBe(true);
+ });
});
describe('action text', () => {