From 8846ca0ed691f35ceb91dc4c924cb105a611bea4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 31 Aug 2020 18:10:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/blob_edit/edit_blob_spec.js | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'spec/frontend/blob_edit/edit_blob_spec.js') diff --git a/spec/frontend/blob_edit/edit_blob_spec.js b/spec/frontend/blob_edit/edit_blob_spec.js index 9642b55b9b4..8f92e8498b9 100644 --- a/spec/frontend/blob_edit/edit_blob_spec.js +++ b/spec/frontend/blob_edit/edit_blob_spec.js @@ -1,15 +1,18 @@ import EditBlob from '~/blob_edit/edit_blob'; import EditorLite from '~/editor/editor_lite'; import MarkdownExtension from '~/editor/editor_markdown_ext'; +import FileTemplateExtension from '~/editor/editor_file_template_ext'; jest.mock('~/editor/editor_lite'); jest.mock('~/editor/editor_markdown_ext'); describe('Blob Editing', () => { + const mockInstance = 'foo'; beforeEach(() => { setFixtures( - `
`, + `
`, ); + jest.spyOn(EditorLite.prototype, 'createInstance').mockReturnValue(mockInstance); }); const initEditor = (isMarkdown = false) => { @@ -19,13 +22,29 @@ describe('Blob Editing', () => { }); }; - it('does not load MarkdownExtension by default', async () => { + it('loads FileTemplateExtension by default', async () => { await initEditor(); - expect(EditorLite.prototype.use).not.toHaveBeenCalled(); + expect(EditorLite.prototype.use).toHaveBeenCalledWith( + expect.arrayContaining([FileTemplateExtension]), + mockInstance, + ); }); - it('loads MarkdownExtension only for the markdown files', async () => { - await initEditor(true); - expect(EditorLite.prototype.use).toHaveBeenCalledWith(MarkdownExtension); + describe('Markdown', () => { + it('does not load MarkdownExtension by default', async () => { + await initEditor(); + expect(EditorLite.prototype.use).not.toHaveBeenCalledWith( + expect.arrayContaining([MarkdownExtension]), + mockInstance, + ); + }); + + it('loads MarkdownExtension only for the markdown files', async () => { + await initEditor(true); + expect(EditorLite.prototype.use).toHaveBeenCalledWith( + [MarkdownExtension, FileTemplateExtension], + mockInstance, + ); + }); }); }); -- cgit v1.2.1