Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

6 files changed, 30 insertions, 34 deletions

diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
index 1cf1ee74ddf..b0c253bca65 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
@@ -3,15 +3,18 @@
 exports[`Snippet Blob Edit component with loaded blob matches snapshot 1`] = `
 <div
   class="file-holder snippet"
+  data-qa-selector="file_holder_container"
 >
   <blob-header-edit-stub
     candelete="true"
     data-qa-selector="file_name_field"
     id="blob_local_7_file_path"
+    showdelete="true"
     value="foo/bar/test.md"
   />
    
-  <blob-content-edit-stub
+  <editor-lite-stub
+    editoroptions="[object Object]"
     fileglobalid="blob_local_7"
     filename="foo/bar/test.md"
     value="Lorem ipsum dolar sit amet,
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
index 3b101e9e815..93684ed48ee 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
@@ -24,7 +24,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
     </div>
      
     <div
-      class="js-vue-markdown-field md-area position-relative js-expanded gfm-form"
+      class="js-vue-markdown-field md-area position-relative gfm-form js-expanded"
     >
       <markdown-header-stub
         linecontent=""
diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index b6abb9f389a..c1fad8cebe6 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -148,17 +148,17 @@ describe('Snippet Edit app', () => {
 
   // Ideally we wouldn't call this method directly, but we don't have a way to trigger
   // apollo responses yet.
-  const loadSnippet = (...edges) => {
-    if (edges.length) {
+  const loadSnippet = (...nodes) => {
+    if (nodes.length) {
       wrapper.setData({
-        snippet: edges[0],
+        snippet: nodes[0],
       });
     }
 
     wrapper.vm.onSnippetFetch({
       data: {
         snippets: {
-          edges,
+          nodes,
         },
       },
     });
diff --git a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
index 8b2051008d7..055168a1711 100644
--- a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
@@ -19,17 +19,12 @@ const TEST_BLOBS_UNLOADED = TEST_BLOBS.map(blob => ({ ...blob, content: '', isLo
 describe('snippets/components/snippet_blob_actions_edit', () => {
   let wrapper;
 
-  const createComponent = (props = {}, snippetMultipleFiles = true) => {
+  const createComponent = (props = {}) => {
     wrapper = shallowMount(SnippetBlobActionsEdit, {
       propsData: {
         initBlobs: TEST_BLOBS,
         ...props,
       },
-      provide: {
-        glFeatures: {
-          snippetMultipleFiles,
-        },
-      },
     });
   };
 
@@ -69,28 +64,24 @@ describe('snippets/components/snippet_blob_actions_edit', () => {
     wrapper = null;
   });
 
-  describe.each`
-    featureFlag | label      | showDelete | showAdd
-    ${true}     | ${'Files'} | ${true}    | ${true}
-    ${false}    | ${'File'}  | ${false}   | ${false}
-  `('with feature flag = $featureFlag', ({ featureFlag, label, showDelete, showAdd }) => {
+  describe('multi-file snippets rendering', () => {
     beforeEach(() => {
-      createComponent({}, featureFlag);
+      createComponent();
     });
 
     it('renders label', () => {
-      expect(findLabel().text()).toBe(label);
+      expect(findLabel().text()).toBe('Files');
     });
 
-    it(`renders delete button (show=${showDelete})`, () => {
+    it(`renders delete button (show=true)`, () => {
       expect(findFirstBlobEdit().props()).toMatchObject({
-        showDelete,
+        showDelete: true,
         canDelete: true,
       });
     });
 
-    it(`renders add button (show=${showAdd})`, () => {
-      expect(findAddButton().exists()).toBe(showAdd);
+    it(`renders add button (show=true)`, () => {
+      expect(findAddButton().exists()).toBe(true);
     });
   });
 
diff --git a/spec/frontend/snippets/components/snippet_blob_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_edit_spec.js
index fc4da46d722..9d0311fd682 100644
--- a/spec/frontend/snippets/components/snippet_blob_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_edit_spec.js
@@ -5,7 +5,7 @@ import waitForPromises from 'helpers/wait_for_promises';
 import { TEST_HOST } from 'helpers/test_constants';
 import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue';
 import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue';
-import BlobContentEdit from '~/blob/components/blob_edit_content.vue';
+import EditorLite from '~/vue_shared/components/editor_lite.vue';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths } from '~/lib/utils/url_utility';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
@@ -48,7 +48,7 @@ describe('Snippet Blob Edit component', () => {
 
   const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
   const findHeader = () => wrapper.find(BlobHeaderEdit);
-  const findContent = () => wrapper.find(BlobContentEdit);
+  const findContent = () => wrapper.find(EditorLite);
   const getLastUpdatedArgs = () => {
     const event = wrapper.emitted()['blob-updated'];
 
@@ -156,7 +156,7 @@ describe('Snippet Blob Edit component', () => {
     });
 
     it('shows blob header', () => {
-      const { canDelete = true, showDelete = false } = props;
+      const { canDelete = true, showDelete = true } = props;
 
       expect(findHeader().props()).toMatchObject({
         canDelete,
@@ -172,11 +172,13 @@ describe('Snippet Blob Edit component', () => {
       expect(findContent().exists()).toBe(showContent);
 
       if (showContent) {
-        expect(findContent().props()).toEqual({
-          value: TEST_BLOB_LOADED.content,
-          fileGlobalId: TEST_BLOB_LOADED.id,
-          fileName: TEST_BLOB_LOADED.path,
-        });
+        expect(findContent().props()).toEqual(
+          expect.objectContaining({
+            value: TEST_BLOB_LOADED.content,
+            fileGlobalId: TEST_BLOB_LOADED.id,
+            fileName: TEST_BLOB_LOADED.path,
+          }),
+        );
       }
     });
   });
diff --git a/spec/frontend/snippets/components/snippet_blob_view_spec.js b/spec/frontend/snippets/components/snippet_blob_view_spec.js
index 9c4b2734a3f..1ccecd7b5ba 100644
--- a/spec/frontend/snippets/components/snippet_blob_view_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_view_spec.js
@@ -140,10 +140,10 @@ describe('Blob Embeddable', () => {
         async ({ snippetBlobs, currentBlob, expectedContent }) => {
           const apolloData = {
             snippets: {
-              edges: [
+              nodes: [
                 {
-                  node: {
-                    blobs: snippetBlobs,
+                  blobs: {
+                    nodes: snippetBlobs,
                   },
                 },
               ],