Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 114 deletions

diff --git a/spec/frontend/snippet/snippet_bundle_spec.js b/spec/frontend/snippet/snippet_bundle_spec.js
deleted file mode 100644
index 208d2fea804..00000000000
--- a/spec/frontend/snippet/snippet_bundle_spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import { setHTMLFixture } from 'helpers/fixtures';
-import Editor from '~/editor/editor_lite';
-import initEditor from '~/snippet/snippet_bundle';
-
-jest.mock('~/editor/editor_lite', () => jest.fn());
-
-describe('Snippet editor', () => {
-  let editorEl;
-  let contentEl;
-  let fileNameEl;
-  let form;
-
-  const mockName = 'foo.bar';
-  const mockContent = 'Foo Bar';
-  const updatedMockContent = 'New Foo Bar';
-
-  const mockEditor = {
-    updateModelLanguage: jest.fn(),
-    getValue: jest.fn().mockReturnValueOnce(updatedMockContent),
-  };
-  const createInstance = jest.fn().mockImplementation(() => ({ ...mockEditor }));
-  Editor.mockImplementation(() => ({
-    createInstance,
-  }));
-
-  function setUpFixture(name, content) {
-    setHTMLFixture(`
-      <div class="snippet-form-holder">
-        <form>
-          <input class="js-snippet-file-name" type="text" value="${name}">
-          <input class="snippet-file-content" type="hidden" value="${content}">
-          <pre id="editor"></pre>
-        </form>
-      </div>
-    `);
-  }
-
-  function bootstrap(name = '', content = '') {
-    setUpFixture(name, content);
-    editorEl = document.getElementById('editor');
-    contentEl = document.querySelector('.snippet-file-content');
-    fileNameEl = document.querySelector('.js-snippet-file-name');
-    form = document.querySelector('.snippet-form-holder form');
-
-    initEditor();
-  }
-
-  function createEvent(name) {
-    return new Event(name, {
-      view: window,
-      bubbles: true,
-      cancelable: true,
-    });
-  }
-
-  beforeEach(() => {
-    bootstrap(mockName, mockContent);
-  });
-
-  it('correctly initializes Editor', () => {
-    expect(createInstance).toHaveBeenCalledWith({
-      el: editorEl,
-      blobPath: mockName,
-      blobContent: mockContent,
-    });
-  });
-
-  it('listens to file name changes and updates syntax highlighting of code', () => {
-    expect(mockEditor.updateModelLanguage).not.toHaveBeenCalled();
-
-    const event = createEvent('change');
-
-    fileNameEl.value = updatedMockContent;
-    fileNameEl.dispatchEvent(event);
-
-    expect(mockEditor.updateModelLanguage).toHaveBeenCalledWith(updatedMockContent);
-  });
-
-  it('listens to form submit event and populates the hidden field with most recent version of the content', () => {
-    expect(contentEl.value).toBe(mockContent);
-
-    const event = createEvent('submit');
-
-    form.dispatchEvent(event);
-    expect(contentEl.value).toBe(updatedMockContent);
-  });
-});
diff --git a/spec/frontend/snippet/snippet_edit_spec.js b/spec/frontend/snippet/snippet_edit_spec.js
index 42a55ac0d3e..0a07adb0e22 100644
--- a/spec/frontend/snippet/snippet_edit_spec.js
+++ b/spec/frontend/snippet/snippet_edit_spec.js
@@ -1,45 +1,20 @@
 import '~/snippet/snippet_edit';
 import { triggerDOMEvent } from 'jest/helpers/dom_events_helper';
 import { SnippetEditInit } from '~/snippets';
-import initSnippet from '~/snippet/snippet_bundle';
 
-jest.mock('~/snippet/snippet_bundle');
 jest.mock('~/snippets');
 jest.mock('~/gl_form');
 
 describe('Snippet edit form initialization', () => {
-  const setFF = flag => {
-    gon.features = { snippetsEditVue: flag };
-  };
-  let features;
-
   beforeEach(() => {
-    features = gon.features;
     setFixtures('<div class="snippet-form"></div>');
   });
 
-  afterEach(() => {
-    gon.features = features;
-  });
-
-  it.each`
-    name         | flag     | isVue
-    ${'Regular'} | ${false} | ${false}
-    ${'Vue'}     | ${true}  | ${true}
-  `('correctly initializes $name Snippet Edit form', ({ flag, isVue }) => {
-    initSnippet.mockClear();
+  it('correctly initializes Vue Snippet Edit form', () => {
     SnippetEditInit.mockClear();
 
-    setFF(flag);
-
     triggerDOMEvent('DOMContentLoaded');
 
-    if (isVue) {
-      expect(initSnippet).not.toHaveBeenCalled();
-      expect(SnippetEditInit).toHaveBeenCalled();
-    } else {
-      expect(initSnippet).toHaveBeenCalled();
-      expect(SnippetEditInit).not.toHaveBeenCalled();
-    }
+    expect(SnippetEditInit).toHaveBeenCalled();
   });
 });