Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 3 deletions

diff --git a/spec/frontend/ide/components/new_dropdown/upload_spec.js b/spec/frontend/ide/components/new_dropdown/upload_spec.js
index 3f3784dbb3a..5937256112d 100644
--- a/spec/frontend/ide/components/new_dropdown/upload_spec.js
+++ b/spec/frontend/ide/components/new_dropdown/upload_spec.js
@@ -62,8 +62,8 @@ describe('new dropdown upload', () => {
       result: 'base64,8PDw8A==', // ðððð
     };
 
-    const textFile = new File(['plain text'], 'textFile');
-    const binaryFile = new File(['😺'], 'binaryFile');
+    const textFile = new File(['plain text'], 'textFile', { type: 'test/mime-text' });
+    const binaryFile = new File(['😺'], 'binaryFile', { type: 'test/mime-binary' });
 
     beforeEach(() => {
       jest.spyOn(FileReader.prototype, 'readAsText');
@@ -83,6 +83,7 @@ describe('new dropdown upload', () => {
             type: 'blob',
             content: 'plain text',
             rawPath: '',
+            mimeType: 'test/mime-text',
           });
         })
         .then(done)
@@ -99,6 +100,7 @@ describe('new dropdown upload', () => {
         type: 'blob',
         content: 'ðððð',
         rawPath: 'blob:https://gitlab.com/048c7ac1-98de-4a37-ab1b-0206d0ea7e1b',
+        mimeType: 'test/mime-binary',
       });
     });
   });
diff --git a/spec/frontend/ide/lib/files_spec.js b/spec/frontend/ide/lib/files_spec.js
index 8ca6f01d9a6..728b450fb10 100644
--- a/spec/frontend/ide/lib/files_spec.js
+++ b/spec/frontend/ide/lib/files_spec.js
@@ -1,6 +1,8 @@
 import { decorateFiles, splitParent } from '~/ide/lib/files';
 import { decorateData } from '~/ide/stores/utils';
 
+const TEST_BLOB_DATA = { mimeType: 'test/mime' };
+
 const createEntries = paths => {
   const createEntry = (acc, { path, type, children }) => {
     const { name, parent } = splitParent(path);
@@ -14,6 +16,7 @@ const createEntries = paths => {
         parentPath: parent,
       }),
       tree: children.map(childName => expect.objectContaining({ name: childName })),
+      ...(type === 'blob' ? TEST_BLOB_DATA : {}),
     };
 
     return acc;
@@ -43,7 +46,7 @@ describe('IDE lib decorate files', () => {
       { path: 'README.md', type: 'blob', children: [] },
     ]);
 
-    const { entries, treeList } = decorateFiles({ data });
+    const { entries, treeList } = decorateFiles({ data, blobData: TEST_BLOB_DATA });
 
     // Here we test the keys and then each key/value individually because `expect(entries).toEqual(expectedEntries)`
     // was taking a very long time for some reason. Probably due to large objects and nested `expect.objectContaining`.
diff --git a/spec/frontend/ide/stores/actions_spec.js b/spec/frontend/ide/stores/actions_spec.js
index 04128c27e70..aa7c51665ac 100644
--- a/spec/frontend/ide/stores/actions_spec.js
+++ b/spec/frontend/ide/stores/actions_spec.js
@@ -195,11 +195,13 @@ describe('Multi-file store actions', () => {
           .dispatch('createTempEntry', {
             name,
             type: 'blob',
+            mimeType: 'test/mime',
           })
           .then(() => {
             const f = store.state.entries[name];
 
             expect(f.tempFile).toBeTruthy();
+            expect(f.mimeType).toBe('test/mime');
             expect(store.state.trees['abcproject/mybranch'].tree.length).toBe(1);
 
             done();