Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 1 deletions

diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js
index a74d709ed3a..add2ed1ba8a 100644
--- a/spec/frontend/notes/components/discussion_notes_spec.js
+++ b/spec/frontend/notes/components/discussion_notes_spec.js
@@ -1,6 +1,5 @@
 import { getByRole } from '@testing-library/dom';
 import { shallowMount, mount } from '@vue/test-utils';
-import '~/behaviors/markdown/render_gfm';
 import { nextTick } from 'vue';
 import DiscussionNotes from '~/notes/components/discussion_notes.vue';
 import NoteableNote from '~/notes/components/noteable_note.vue';
@@ -11,6 +10,8 @@ import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_sys
 import SystemNote from '~/vue_shared/components/notes/system_note.vue';
 import { noteableDataMock, discussionMock, notesDataMock } from '../mock_data';
 
+jest.mock('~/behaviors/markdown/render_gfm');
+
 const LINE_RANGE = {};
 const DISCUSSION_WITH_LINE_RANGE = {
   ...discussionMock,