diff options
author | Phil Hughes <me@iamphill.com> | 2019-05-09 07:39:08 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-05-09 07:39:08 +0000 |
commit | a64904e41f30e0013c44dd9dcb7ca797bd16a447 (patch) | |
tree | 781eafb0dc311e77193f43a1eeeca7e9daf52fe4 | |
parent | 12e12d9672a628e87968148879fdaa16d3fa436f (diff) | |
parent | 85cf320258a5c5de855d5238843c1593d8b70826 (diff) | |
download | gitlab-ce-a64904e41f30e0013c44dd9dcb7ca797bd16a447.tar.gz |
Merge branch '61596-increase-timeout-for-discussion-notes-spec' into 'master'
Fix discussion notes spec timeout
Closes #61596
See merge request gitlab-org/gitlab-ce!28212
-rw-r--r-- | spec/frontend/notes/components/discussion_notes_spec.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js index 392c1b6533e..7e037beca9d 100644 --- a/spec/frontend/notes/components/discussion_notes_spec.js +++ b/spec/frontend/notes/components/discussion_notes_spec.js @@ -1,4 +1,4 @@ -import { mount, createLocalVue } from '@vue/test-utils'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import '~/behaviors/markdown/render_gfm'; import { SYSTEM_NOTE } from '~/notes/constants'; import DiscussionNotes from '~/notes/components/discussion_notes.vue'; @@ -8,6 +8,7 @@ import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_sys import SystemNote from '~/vue_shared/components/notes/system_note.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import createStore from '~/notes/stores'; +import { setTestTimeout } from 'helpers/timeout'; import { noteableDataMock, discussionMock, @@ -17,6 +18,8 @@ import { const localVue = createLocalVue(); describe('DiscussionNotes', () => { + setTestTimeout(500); + let wrapper; const createComponent = props => { @@ -24,7 +27,7 @@ describe('DiscussionNotes', () => { store.dispatch('setNoteableData', noteableDataMock); store.dispatch('setNotesData', notesDataMock); - wrapper = mount(DiscussionNotes, { + wrapper = shallowMount(DiscussionNotes, { localVue, store, propsData: { |