Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js
index 00733615f81..2f58cd8f22a 100644
--- a/spec/frontend/ide/utils_spec.js
+++ b/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', () => {