Merge branch '288006-binary' into 'master'

Use `binary` property on the file object

See merge request gitlab-org/gitlab!68643

app/assets/javascripts/ide/utils.js

@@ -43,7 +43,10 @@ const KNOWN_TYPES = [
   },
 ];
 
-export function isTextFile({ name, raw, content, mimeType = '' }) {
+export function isTextFile({ name, raw, binary, content, mimeType = '' }) {
+  // some file objects already have a `binary` property set on them. If true, return false
+  if (binary) return false;
+
   const knownType = KNOWN_TYPES.find((type) => type.isMatch(mimeType, name));
   if (knownType) return knownType.isText;
 

spec/frontend/ide/utils_spec.js

@@ -86,6 +86,11 @@ describe('WebIDE utils', () => {
       expect(isTextFile({ name: 'abc.dat', content: '' })).toBe(true);
       expect(isTextFile({ name: 'abc.dat', content: '  ' })).toBe(true);
     });
+
+    it('returns true if there is a `binary` property already set on the file object', () => {
+      expect(isTextFile({ name: 'abc.txt', content: '' })).toBe(true);
+      expect(isTextFile({ name: 'abc.txt', content: '', binary: true })).toBe(false);
+    });
   });
 
   describe('trimPathComponents', () => {