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/vue_mr_widget/components | |
parent | 62ddd3a00522d62ab23c7804e24dbe1c941bc0a7 (diff) | |
download | gitlab-ce-b085478c4c2bed74fdc6eb2c33bfc62e791baf03.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/vue_mr_widget/components')
3 files changed, 8 insertions, 3 deletions
diff --git a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js index 5f101ba4cf6..a7ecb863cfb 100644 --- a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js @@ -42,6 +42,7 @@ describe('Merge Request Collapsible Extension', () => { describe('onClick', () => { beforeEach(() => { wrapper.find('button').trigger('click'); + return wrapper.vm.$nextTick(); }); it('rendes the provided slot', () => { diff --git a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js index 994d6255324..6483fec4121 100644 --- a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js @@ -55,8 +55,10 @@ describe('Commits edit component', () => { findTextarea().element.value = changedCommitMessage; findTextarea().trigger('input'); - expect(wrapper.emitted().input[0]).toEqual([changedCommitMessage]); - expect(findTextarea().element.value).toBe(changedCommitMessage); + return wrapper.vm.$nextTick().then(() => { + expect(wrapper.emitted().input[0]).toEqual([changedCommitMessage]); + expect(findTextarea().element.value).toBe(changedCommitMessage); + }); }); }); diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js index 9ee2f88c78d..3176a288d49 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js @@ -64,7 +64,9 @@ describe('Commits header component', () => { createComponent(); wrapper.setData({ expanded: false }); - expect(findIcon().props('name')).toBe('chevron-right'); + return wrapper.vm.$nextTick().then(() => { + expect(findIcon().props('name')).toBe('chevron-right'); + }); }); describe('when squash is disabled', () => { |