Merge branch 'master' into docs-patch-71docs-patch-71

3 files changed, 78 insertions, 1 deletions

diff --git a/spec/frontend/ide/lib/files_spec.js b/spec/frontend/ide/lib/files_spec.js
index aa1fa0373db..08a31318544 100644
--- a/spec/frontend/ide/lib/files_spec.js
+++ b/spec/frontend/ide/lib/files_spec.js
@@ -12,6 +12,7 @@ const createEntries = paths => {
 
     const { name, parent } = splitParent(path);
     const parentEntry = acc[parent];
+    const previewMode = viewerInformationForPath(name);
 
     acc[path] = {
       ...decorateData({
@@ -22,7 +23,8 @@ const createEntries = paths => {
         path,
         url: createUrl(`/${TEST_PROJECT_ID}/${type}/${TEST_BRANCH_ID}/-/${escapeFileUrl(path)}`),
         type,
-        previewMode: viewerInformationForPath(path),
+        previewMode,
+        binary: (previewMode && previewMode.binary) || false,
         parentPath: parent,
         parentTreeUrl: parentEntry
           ? parentEntry.url
diff --git a/spec/frontend/ide/services/index_spec.js b/spec/frontend/ide/services/index_spec.js
new file mode 100644
index 00000000000..3d5ed4b5c0c
--- /dev/null
+++ b/spec/frontend/ide/services/index_spec.js
@@ -0,0 +1,31 @@
+import services from '~/ide/services';
+import Api from '~/api';
+
+jest.mock('~/api');
+
+const TEST_PROJECT_ID = 'alice/wonderland';
+const TEST_BRANCH = 'master-patch-123';
+const TEST_COMMIT_SHA = '123456789';
+
+describe('IDE services', () => {
+  describe('commit', () => {
+    let payload;
+
+    beforeEach(() => {
+      payload = {
+        branch: TEST_BRANCH,
+        commit_message: 'Hello world',
+        actions: [],
+        start_sha: TEST_COMMIT_SHA,
+      };
+
+      Api.commitMultiple.mockReturnValue(Promise.resolve());
+    });
+
+    it('should commit', () => {
+      services.commit(TEST_PROJECT_ID, payload);
+
+      expect(Api.commitMultiple).toHaveBeenCalledWith(TEST_PROJECT_ID, payload);
+    });
+  });
+});
diff --git a/spec/frontend/ide/utils_spec.js b/spec/frontend/ide/utils_spec.js
new file mode 100644
index 00000000000..2b7dffdcd88
--- /dev/null
+++ b/spec/frontend/ide/utils_spec.js
@@ -0,0 +1,44 @@
+import { commitItemIconMap } from '~/ide/constants';
+import { getCommitIconMap } from '~/ide/utils';
+import { decorateData } from '~/ide/stores/utils';
+
+describe('WebIDE utils', () => {
+  const createFile = (name = 'name', id = name, type = '', parent = null) =>
+    decorateData({
+      id,
+      type,
+      icon: 'icon',
+      url: 'url',
+      name,
+      path: parent ? `${parent.path}/${name}` : name,
+      parentPath: parent ? parent.path : '',
+      lastCommit: {},
+    });
+
+  describe('getCommitIconMap', () => {
+    let entry;
+
+    beforeEach(() => {
+      entry = createFile('Entry item');
+    });
+
+    it('renders "deleted" icon for deleted entries', () => {
+      entry.deleted = true;
+      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.deleted);
+    });
+    it('renders "addition" icon for temp entries', () => {
+      entry.tempFile = true;
+      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.addition);
+    });
+    it('renders "modified" icon for newly-renamed entries', () => {
+      entry.prevPath = 'foo/bar';
+      entry.tempFile = false;
+      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
+    });
+    it('renders "modified" icon even for temp entries if they are newly-renamed', () => {
+      entry.prevPath = 'foo/bar';
+      entry.tempFile = true;
+      expect(getCommitIconMap(entry)).toEqual(commitItemIconMap.modified);
+    });
+  });
+});