diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-01 06:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-01 06:09:01 +0000 |
commit | b085478c4c2bed74fdc6eb2c33bfc62e791baf03 (patch) | |
tree | 71473cafdfc2f941933d326e6beb319bdbcdc79a /spec/frontend/diffs/components/edit_button_spec.js | |
parent | 62ddd3a00522d62ab23c7804e24dbe1c941bc0a7 (diff) | |
download | gitlab-ce-b085478c4c2bed74fdc6eb2c33bfc62e791baf03.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/diffs/components/edit_button_spec.js')
-rw-r--r-- | spec/frontend/diffs/components/edit_button_spec.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/spec/frontend/diffs/components/edit_button_spec.js b/spec/frontend/diffs/components/edit_button_spec.js index 4e2cfc75212..fc53f26bd42 100644 --- a/spec/frontend/diffs/components/edit_button_spec.js +++ b/spec/frontend/diffs/components/edit_button_spec.js @@ -36,7 +36,9 @@ describe('EditButton', () => { }); wrapper.trigger('click'); - expect(wrapper.emitted('showForkMessage')).toBeTruthy(); + return wrapper.vm.$nextTick().then(() => { + expect(wrapper.emitted('showForkMessage')).toBeTruthy(); + }); }); it('doesnt emit a show fork message event if current user cannot fork', () => { @@ -46,7 +48,9 @@ describe('EditButton', () => { }); wrapper.trigger('click'); - expect(wrapper.emitted('showForkMessage')).toBeFalsy(); + return wrapper.vm.$nextTick().then(() => { + expect(wrapper.emitted('showForkMessage')).toBeFalsy(); + }); }); it('doesnt emit a show fork message event if current user can modify blob', () => { @@ -57,6 +61,8 @@ describe('EditButton', () => { }); wrapper.trigger('click'); - expect(wrapper.emitted('showForkMessage')).toBeFalsy(); + return wrapper.vm.$nextTick().then(() => { + expect(wrapper.emitted('showForkMessage')).toBeFalsy(); + }); }); }); |