diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-03 13:18:50 +0000 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-03 13:18:50 +0000 |
commit | 96efba34d32bcde33dbd21e9ef0f181330ddbe96 (patch) | |
tree | 61a598463011a39f3fd602f250cb8d5da86163e2 | |
parent | d427c05f586dc89163105f2b89c8f19b07745966 (diff) | |
parent | f5461d7ba01b8fe2d28c9bf4197ef3a11b3b6d47 (diff) | |
download | gitlab-ce-96efba34d32bcde33dbd21e9ef0f181330ddbe96.tar.gz |
Merge branch 'winh-jest-markdown-header' into 'master'
Migrate markdown header_spec.js to Jest
See merge request gitlab-org/gitlab-ce!30228
-rw-r--r-- | changelogs/unreleased/winh-jest-markdown-header.yml | 5 | ||||
-rw-r--r-- | spec/frontend/vue_shared/components/markdown/header_spec.js (renamed from spec/javascripts/vue_shared/components/markdown/header_spec.js) | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/changelogs/unreleased/winh-jest-markdown-header.yml b/changelogs/unreleased/winh-jest-markdown-header.yml new file mode 100644 index 00000000000..6bf9d75cc93 --- /dev/null +++ b/changelogs/unreleased/winh-jest-markdown-header.yml @@ -0,0 +1,5 @@ +--- +title: Migrate markdown header_spec.js to Jest +merge_request: 30228 +author: Martin Hobert +type: other diff --git a/spec/javascripts/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js index af92e5f5ae2..aa0b544f948 100644 --- a/spec/javascripts/vue_shared/components/markdown/header_spec.js +++ b/spec/frontend/vue_shared/components/markdown/header_spec.js @@ -53,7 +53,7 @@ describe('Markdown field header component', () => { }); it('emits toggle markdown event when clicking preview', () => { - spyOn(vm, '$emit'); + jest.spyOn(vm, '$emit').mockImplementation(); vm.$el.querySelector('.js-preview-link').click(); @@ -65,7 +65,7 @@ describe('Markdown field header component', () => { }); it('does not emit toggle markdown event when triggered from another form', () => { - spyOn(vm, '$emit'); + jest.spyOn(vm, '$emit').mockImplementation(); $(document).triggerHandler('markdown-preview:show', [ $( @@ -76,17 +76,13 @@ describe('Markdown field header component', () => { expect(vm.$emit).not.toHaveBeenCalled(); }); - it('blurs preview link after click', done => { + it('blurs preview link after click', () => { const link = vm.$el.querySelector('li:nth-child(2) button'); - spyOn(HTMLElement.prototype, 'blur'); + jest.spyOn(HTMLElement.prototype, 'blur').mockImplementation(); link.click(); - setTimeout(() => { - expect(link.blur).toHaveBeenCalled(); - - done(); - }); + expect(link.blur).toHaveBeenCalled(); }); it('renders markdown table template', () => { |