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

8 files changed, 434 insertions, 39 deletions

diff --git a/spec/javascripts/ide/components/ide_tree_list_spec.js b/spec/javascripts/ide/components/ide_tree_list_spec.js
index f63007c7dd2..554bd1ae3b5 100644
--- a/spec/javascripts/ide/components/ide_tree_list_spec.js
+++ b/spec/javascripts/ide/components/ide_tree_list_spec.js
@@ -58,6 +58,20 @@ describe('IDE tree list', () => {
     it('renders list of files', () => {
       expect(vm.$el.textContent).toContain('fileName');
     });
+
+    it('does not render moved entries', done => {
+      const tree = [file('moved entry'), file('normal entry')];
+      tree[0].moved = true;
+      store.state.trees['abcproject/master'].tree = tree;
+      const container = vm.$el.querySelector('.ide-tree-body');
+
+      vm.$nextTick(() => {
+        expect(container.children.length).toBe(1);
+        expect(vm.$el.textContent).not.toContain('moved entry');
+        expect(vm.$el.textContent).toContain('normal entry');
+        done();
+      });
+    });
   });
 
   describe('empty-branch state', () => {
diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js
index 002b5a005b8..0701b773e17 100644
--- a/spec/javascripts/ide/components/repo_editor_spec.js
+++ b/spec/javascripts/ide/components/repo_editor_spec.js
@@ -5,7 +5,7 @@ import axios from '~/lib/utils/axios_utils';
 import store from '~/ide/stores';
 import repoEditor from '~/ide/components/repo_editor.vue';
 import Editor from '~/ide/lib/editor';
-import { activityBarViews } from '~/ide/constants';
+import { activityBarViews, FILE_VIEW_MODE_EDITOR, FILE_VIEW_MODE_PREVIEW } from '~/ide/constants';
 import { createComponentWithStore } from '../../helpers/vue_mount_component_helper';
 import setTimeoutPromise from '../../helpers/set_timeout_promise_helper';
 import { file, resetStore } from '../helpers';
@@ -14,7 +14,10 @@ describe('RepoEditor', () => {
   let vm;
 
   beforeEach(done => {
-    const f = file();
+    const f = {
+      ...file(),
+      viewMode: FILE_VIEW_MODE_EDITOR,
+    };
     const RepoEditor = Vue.extend(repoEditor);
 
     vm = createComponentWithStore(RepoEditor, store, {
@@ -27,6 +30,7 @@ describe('RepoEditor', () => {
     Vue.set(vm.$store.state.entries, f.path, f);
 
     spyOn(vm, 'getFileData').and.returnValue(Promise.resolve());
+    spyOn(vm, 'getRawFileData').and.returnValue(Promise.resolve());
 
     vm.$mount();
 
@@ -41,12 +45,17 @@ describe('RepoEditor', () => {
     Editor.editorInstance.dispose();
   });
 
-  it('renders an ide container', done => {
-    Vue.nextTick(() => {
-      expect(vm.shouldHideEditor).toBeFalsy();
+  const findEditor = () => vm.$el.querySelector('.multi-file-editor-holder');
+  const changeRightPanelCollapsed = () => {
+    const { state } = vm.$store;
 
-      done();
-    });
+    state.rightPanelCollapsed = !state.rightPanelCollapsed;
+  };
+
+  it('renders an ide container', () => {
+    expect(vm.shouldHideEditor).toBeFalsy();
+    expect(vm.showEditor).toBe(true);
+    expect(findEditor()).not.toHaveCss({ display: 'none' });
   });
 
   it('renders only an edit tab', done => {
@@ -283,7 +292,7 @@ describe('RepoEditor', () => {
     });
 
     it('calls updateDimensions when rightPanelCollapsed is changed', done => {
-      vm.$store.state.rightPanelCollapsed = true;
+      changeRightPanelCollapsed();
 
       vm.$nextTick(() => {
         expect(vm.editor.updateDimensions).toHaveBeenCalled();
@@ -358,6 +367,85 @@ describe('RepoEditor', () => {
     });
   });
 
+  describe('when files view mode is preview', () => {
+    beforeEach(done => {
+      spyOn(vm.editor, 'updateDimensions');
+      vm.file.viewMode = FILE_VIEW_MODE_PREVIEW;
+      vm.$nextTick(done);
+    });
+
+    it('should hide editor', () => {
+      expect(vm.showEditor).toBe(false);
+      expect(findEditor()).toHaveCss({ display: 'none' });
+    });
+
+    it('should not update dimensions', done => {
+      changeRightPanelCollapsed();
+
+      vm.$nextTick()
+        .then(() => {
+          expect(vm.editor.updateDimensions).not.toHaveBeenCalled();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    describe('when file view mode changes to editor', () => {
+      beforeEach(done => {
+        vm.file.viewMode = FILE_VIEW_MODE_EDITOR;
+
+        // one tick to trigger watch
+        vm.$nextTick()
+          // another tick needed until we can update dimensions
+          .then(() => vm.$nextTick())
+          .then(done)
+          .catch(done.fail);
+      });
+
+      it('should update dimensions', () => {
+        expect(vm.editor.updateDimensions).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('initEditor', () => {
+    beforeEach(() => {
+      spyOn(vm.editor, 'createInstance');
+      spyOnProperty(vm, 'shouldHideEditor').and.returnValue(true);
+    });
+
+    it('is being initialised for files without content even if shouldHideEditor is `true`', done => {
+      vm.file.content = '';
+      vm.file.raw = '';
+
+      vm.initEditor();
+      vm.$nextTick()
+        .then(() => {
+          expect(vm.getFileData).toHaveBeenCalled();
+          expect(vm.getRawFileData).toHaveBeenCalled();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('does not initialize editor for files already with content', done => {
+      expect(vm.getFileData.calls.count()).toEqual(1);
+      expect(vm.getRawFileData.calls.count()).toEqual(1);
+
+      vm.file.content = 'foo';
+
+      vm.initEditor();
+      vm.$nextTick()
+        .then(() => {
+          expect(vm.getFileData.calls.count()).toEqual(1);
+          expect(vm.getRawFileData.calls.count()).toEqual(1);
+          expect(vm.editor.createInstance).not.toHaveBeenCalled();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+
   it('calls removePendingTab when old file is pending', done => {
     spyOnProperty(vm, 'shouldHideEditor').and.returnValue(true);
     spyOn(vm, 'removePendingTab');
@@ -367,6 +455,7 @@ describe('RepoEditor', () => {
     vm.$nextTick()
       .then(() => {
         vm.file = file('testing');
+        vm.file.content = 'foo'; // need to prevent full cycle of initEditor
 
         return vm.$nextTick();
       })
diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js
index dd2313dc800..021c3076094 100644
--- a/spec/javascripts/ide/stores/actions/file_spec.js
+++ b/spec/javascripts/ide/stores/actions/file_spec.js
@@ -275,6 +275,43 @@ describe('IDE store file actions', () => {
       });
     });
 
+    describe('Re-named success', () => {
+      beforeEach(() => {
+        localFile = file(`newCreate-${Math.random()}`);
+        localFile.url = `project/getFileDataURL`;
+        localFile.prevPath = 'old-dull-file';
+        localFile.path = 'new-shiny-file';
+        store.state.entries[localFile.path] = localFile;
+
+        mock.onGet(`${RELATIVE_URL_ROOT}/project/getFileDataURL`).replyOnce(
+          200,
+          {
+            blame_path: 'blame_path',
+            commits_path: 'commits_path',
+            permalink: 'permalink',
+            raw_path: 'raw_path',
+            binary: false,
+            html: '123',
+            render_error: '',
+          },
+          {
+            'page-title': 'testing old-dull-file',
+          },
+        );
+      });
+
+      it('sets document title considering `prevPath` on a file', done => {
+        store
+          .dispatch('getFileData', { path: localFile.path })
+          .then(() => {
+            expect(document.title).toBe('testing new-shiny-file');
+
+            done();
+          })
+          .catch(done.fail);
+      });
+    });
+
     describe('error', () => {
       beforeEach(() => {
         mock.onGet(`project/getFileDataURL`).networkError();
diff --git a/spec/javascripts/ide/stores/actions_spec.js b/spec/javascripts/ide/stores/actions_spec.js
index 37354283cab..8504fb3f42b 100644
--- a/spec/javascripts/ide/stores/actions_spec.js
+++ b/spec/javascripts/ide/stores/actions_spec.js
@@ -10,6 +10,7 @@ import actions, {
   deleteEntry,
   renameEntry,
   getBranchData,
+  createTempEntry,
 } from '~/ide/stores/actions';
 import axios from '~/lib/utils/axios_utils';
 import store from '~/ide/stores';
@@ -247,18 +248,30 @@ describe('Multi-file store actions', () => {
       });
 
       it('sets tmp file as active', done => {
-        store
-          .dispatch('createTempEntry', {
+        testAction(
+          createTempEntry,
+          {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-          })
-          .then(f => {
-            expect(f.active).toBeTruthy();
-
-            done();
-          })
-          .catch(done.fail);
+          },
+          store.state,
+          [
+            { type: types.CREATE_TMP_ENTRY, payload: jasmine.any(Object) },
+            { type: types.TOGGLE_FILE_OPEN, payload: 'test' },
+            { type: types.ADD_FILE_TO_CHANGED, payload: 'test' },
+          ],
+          [
+            {
+              type: 'setFileActive',
+              payload: 'test',
+            },
+            {
+              type: 'triggerFilesChange',
+            },
+          ],
+          done,
+        );
       });
 
       it('creates flash message if file already exists', done => {
@@ -488,7 +501,42 @@ describe('Multi-file store actions', () => {
         'path',
         store.state,
         [{ type: types.DELETE_ENTRY, payload: 'path' }],
-        [{ type: 'burstUnusedSeal' }, { type: 'triggerFilesChange' }],
+        [
+          { type: 'burstUnusedSeal' },
+          { type: 'stageChange', payload: 'path' },
+          { type: 'triggerFilesChange' },
+        ],
+        done,
+      );
+    });
+
+    it('does not delete a folder after it is emptied', done => {
+      const testFolder = {
+        type: 'tree',
+        tree: [],
+      };
+      const testEntry = {
+        path: 'testFolder/entry-to-delete',
+        parentPath: 'testFolder',
+        opened: false,
+        tree: [],
+      };
+      testFolder.tree.push(testEntry);
+      store.state.entries = {
+        testFolder,
+        'testFolder/entry-to-delete': testEntry,
+      };
+
+      testAction(
+        deleteEntry,
+        'testFolder/entry-to-delete',
+        store.state,
+        [{ type: types.DELETE_ENTRY, payload: 'testFolder/entry-to-delete' }],
+        [
+          { type: 'burstUnusedSeal' },
+          { type: 'stageChange', payload: 'testFolder/entry-to-delete' },
+          { type: 'triggerFilesChange' },
+        ],
         done,
       );
     });
@@ -509,8 +557,15 @@ describe('Multi-file store actions', () => {
             type: types.RENAME_ENTRY,
             payload: { path: 'test', name: 'new-name', entryPath: null, parentPath: 'parent-path' },
           },
+          {
+            type: types.TOGGLE_FILE_CHANGED,
+            payload: {
+              file: store.state.entries['parent-path/new-name'],
+              changed: true,
+            },
+          },
         ],
-        [{ type: 'deleteEntry', payload: 'test' }, { type: 'triggerFilesChange' }],
+        [{ type: 'triggerFilesChange' }],
         done,
       );
     });
@@ -557,7 +612,6 @@ describe('Multi-file store actions', () => {
               parentPath: 'parent-path/new-name',
             },
           },
-          { type: 'deleteEntry', payload: 'test' },
           { type: 'triggerFilesChange' },
         ],
         done,
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
index 5f7272311c8..14d861f21d2 100644
--- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js
+++ b/spec/javascripts/ide/stores/modules/commit/actions_spec.js
@@ -6,9 +6,11 @@ import eventHub from '~/ide/eventhub';
 import consts from '~/ide/stores/modules/commit/constants';
 import * as mutationTypes from '~/ide/stores/modules/commit/mutation_types';
 import * as actions from '~/ide/stores/modules/commit/actions';
-import testAction from '../../../../helpers/vuex_action_helper';
 import { commitActionTypes } from '~/ide/constants';
 import { resetStore, file } from 'spec/ide/helpers';
+import testAction from '../../../../helpers/vuex_action_helper';
+
+const TEST_COMMIT_SHA = '123456789';
 
 describe('IDE commit module actions', () => {
   beforeEach(() => {
@@ -139,6 +141,9 @@ describe('IDE commit module actions', () => {
         branches: {
           master: {
             workingReference: '',
+            commit: {
+              short_id: TEST_COMMIT_SHA,
+            },
           },
         },
       };
@@ -239,6 +244,9 @@ describe('IDE commit module actions', () => {
         branches: {
           master: {
             workingReference: '1',
+            commit: {
+              id: TEST_COMMIT_SHA,
+            },
           },
         },
       };
@@ -247,7 +255,7 @@ describe('IDE commit module actions', () => {
         ...file('changed'),
         type: 'blob',
         active: true,
-        lastCommitSha: '123456789',
+        lastCommitSha: TEST_COMMIT_SHA,
       };
       store.state.stagedFiles.push(f);
       store.state.changedFiles = [
@@ -307,7 +315,7 @@ describe('IDE commit module actions', () => {
                   previous_path: undefined,
                 },
               ],
-              start_branch: 'master',
+              start_sha: TEST_COMMIT_SHA,
             });
 
             done();
@@ -330,11 +338,11 @@ describe('IDE commit module actions', () => {
                   file_path: jasmine.anything(),
                   content: undefined,
                   encoding: jasmine.anything(),
-                  last_commit_id: '123456789',
+                  last_commit_id: TEST_COMMIT_SHA,
                   previous_path: undefined,
                 },
               ],
-              start_branch: undefined,
+              start_sha: undefined,
             });
 
             done();
@@ -403,7 +411,7 @@ describe('IDE commit module actions', () => {
               expect(visitUrl).toHaveBeenCalledWith(
                 `webUrl/merge_requests/new?merge_request[source_branch]=${
                   store.getters['commit/placeholderBranchName']
-                }&merge_request[target_branch]=master`,
+                }&merge_request[target_branch]=master&nav_source=webide`,
               );
 
               done();
diff --git a/spec/javascripts/ide/stores/mutations/file_spec.js b/spec/javascripts/ide/stores/mutations/file_spec.js
index efd0d86552b..064e66cef64 100644
--- a/spec/javascripts/ide/stores/mutations/file_spec.js
+++ b/spec/javascripts/ide/stores/mutations/file_spec.js
@@ -1,5 +1,6 @@
 import mutations from '~/ide/stores/mutations/file';
 import state from '~/ide/stores/state';
+import { FILE_VIEW_MODE_PREVIEW } from '~/ide/constants';
 import { file } from '../../helpers';
 
 describe('IDE store file mutations', () => {
@@ -83,6 +84,63 @@ describe('IDE store file mutations', () => {
       expect(localFile.raw).toBeNull();
       expect(localFile.baseRaw).toBeNull();
     });
+
+    it('sets extra file data to all arrays concerned', () => {
+      localState.stagedFiles = [localFile];
+      localState.changedFiles = [localFile];
+      localState.openFiles = [localFile];
+
+      const rawPath = 'foo/bar/blah.md';
+
+      mutations.SET_FILE_DATA(localState, {
+        data: {
+          raw_path: rawPath,
+        },
+        file: localFile,
+      });
+
+      expect(localState.stagedFiles[0].rawPath).toEqual(rawPath);
+      expect(localState.changedFiles[0].rawPath).toEqual(rawPath);
+      expect(localState.openFiles[0].rawPath).toEqual(rawPath);
+      expect(localFile.rawPath).toEqual(rawPath);
+    });
+
+    it('does not mutate certain props on the file', () => {
+      const path = 'New Path';
+      const name = 'New Name';
+      localFile.path = path;
+      localFile.name = name;
+
+      localState.stagedFiles = [localFile];
+      localState.changedFiles = [localFile];
+      localState.openFiles = [localFile];
+
+      mutations.SET_FILE_DATA(localState, {
+        data: {
+          path: 'Old Path',
+          name: 'Old Name',
+          raw: 'Old Raw',
+          base_raw: 'Old Base Raw',
+        },
+        file: localFile,
+      });
+
+      [
+        localState.stagedFiles[0],
+        localState.changedFiles[0],
+        localState.openFiles[0],
+        localFile,
+      ].forEach(f => {
+        expect(f).toEqual(
+          jasmine.objectContaining({
+            path,
+            name,
+            raw: null,
+            baseRaw: null,
+          }),
+        );
+      });
+    });
   });
 
   describe('SET_FILE_RAW_DATA', () => {
@@ -315,6 +373,19 @@ describe('IDE store file mutations', () => {
       expect(localState.stagedFiles.length).toBe(1);
       expect(localState.stagedFiles[0].raw).toEqual('testing 123');
     });
+
+    it('adds already-staged file to `replacedFiles`', () => {
+      localFile.raw = 'already-staged';
+
+      mutations.STAGE_CHANGE(localState, localFile.path);
+
+      localFile.raw = 'testing 123';
+
+      mutations.STAGE_CHANGE(localState, localFile.path);
+
+      expect(localState.replacedFiles.length).toBe(1);
+      expect(localState.replacedFiles[0].raw).toEqual('already-staged');
+    });
   });
 
   describe('UNSTAGE_CHANGE', () => {
@@ -355,10 +426,10 @@ describe('IDE store file mutations', () => {
     it('updates file view mode', () => {
       mutations.SET_FILE_VIEWMODE(localState, {
         file: localFile,
-        viewMode: 'preview',
+        viewMode: FILE_VIEW_MODE_PREVIEW,
       });
 
-      expect(localFile.viewMode).toBe('preview');
+      expect(localFile.viewMode).toBe(FILE_VIEW_MODE_PREVIEW);
     });
   });
 
diff --git a/spec/javascripts/ide/stores/mutations_spec.js b/spec/javascripts/ide/stores/mutations_spec.js
index 5ee098bf17f..2470c99e300 100644
--- a/spec/javascripts/ide/stores/mutations_spec.js
+++ b/spec/javascripts/ide/stores/mutations_spec.js
@@ -79,6 +79,16 @@ describe('Multi-file store mutations', () => {
     });
   });
 
+  describe('CLEAR_REPLACED_FILES', () => {
+    it('clears replacedFiles array', () => {
+      localState.replacedFiles.push('a');
+
+      mutations.CLEAR_REPLACED_FILES(localState);
+
+      expect(localState.replacedFiles.length).toBe(0);
+    });
+  });
+
   describe('UPDATE_VIEWER', () => {
     it('sets viewer state', () => {
       mutations.UPDATE_VIEWER(localState, 'diff');
@@ -109,6 +119,62 @@ describe('Multi-file store mutations', () => {
     });
   });
 
+  describe('CREATE_TMP_ENTRY', () => {
+    beforeEach(() => {
+      localState.currentProjectId = 'gitlab-ce';
+      localState.currentBranchId = 'master';
+      localState.trees['gitlab-ce/master'] = {
+        tree: [],
+      };
+    });
+
+    it('creates temp entry in the tree', () => {
+      const tmpFile = file('test');
+      mutations.CREATE_TMP_ENTRY(localState, {
+        data: {
+          entries: {
+            test: {
+              ...tmpFile,
+              tempFile: true,
+              changed: true,
+            },
+          },
+          treeList: [tmpFile],
+        },
+        projectId: 'gitlab-ce',
+        branchId: 'master',
+      });
+
+      expect(localState.trees['gitlab-ce/master'].tree.length).toEqual(1);
+      expect(localState.entries.test.tempFile).toEqual(true);
+    });
+
+    it('marks entry as replacing previous entry if the old one has been deleted', () => {
+      const tmpFile = file('test');
+      localState.entries.test = {
+        ...tmpFile,
+        deleted: true,
+      };
+      mutations.CREATE_TMP_ENTRY(localState, {
+        data: {
+          entries: {
+            test: {
+              ...tmpFile,
+              tempFile: true,
+              changed: true,
+            },
+          },
+          treeList: [tmpFile],
+        },
+        projectId: 'gitlab-ce',
+        branchId: 'master',
+      });
+
+      expect(localState.trees['gitlab-ce/master'].tree.length).toEqual(1);
+      expect(localState.entries.test.replaces).toEqual(true);
+    });
+  });
+
   describe('UPDATE_TEMP_FLAG', () => {
     beforeEach(() => {
       localState.entries.test = {
@@ -252,6 +318,7 @@ describe('Multi-file store mutations', () => {
         permalink: `${gl.TEST_HOST}/testing-123`,
         commitsPath: `${gl.TEST_HOST}/testing-123`,
         blamePath: `${gl.TEST_HOST}/testing-123`,
+        replaces: true,
       };
       localState.entries.test = f;
       localState.changedFiles.push(f);
@@ -262,6 +329,7 @@ describe('Multi-file store mutations', () => {
       expect(f.permalink).toBe(`${gl.TEST_HOST}/test`);
       expect(f.commitsPath).toBe(`${gl.TEST_HOST}/test`);
       expect(f.blamePath).toBe(`${gl.TEST_HOST}/test`);
+      expect(f.replaces).toBe(false);
     });
   });
 
@@ -309,7 +377,7 @@ describe('Multi-file store mutations', () => {
         ...localState.entries.oldPath,
         id: 'newPath',
         name: 'newPath',
-        key: 'newPath-blob-name',
+        key: 'newPath-blob-oldPath',
         path: 'newPath',
         tempFile: true,
         prevPath: 'oldPath',
@@ -318,6 +386,7 @@ describe('Multi-file store mutations', () => {
         url: `${gl.TEST_HOST}/newPath`,
         moved: jasmine.anything(),
         movedPath: jasmine.anything(),
+        opened: false,
       });
     });
 
@@ -349,13 +418,5 @@ describe('Multi-file store mutations', () => {
 
       expect(localState.entries.parentPath.tree.length).toBe(1);
     });
-
-    it('adds to openFiles if previously opened', () => {
-      localState.entries.oldPath.opened = true;
-
-      mutations.RENAME_ENTRY(localState, { path: 'oldPath', name: 'newPath' });
-
-      expect(localState.openFiles).toEqual([localState.entries.newPath]);
-    });
   });
 });
diff --git a/spec/javascripts/ide/stores/utils_spec.js b/spec/javascripts/ide/stores/utils_spec.js
index debe1c4acee..0fc9519a6bf 100644
--- a/spec/javascripts/ide/stores/utils_spec.js
+++ b/spec/javascripts/ide/stores/utils_spec.js
@@ -92,6 +92,16 @@ describe('Multi-file store utils', () => {
             path: 'deletedFile',
             deleted: true,
           },
+          {
+            ...file('renamedFile'),
+            path: 'renamedFile',
+            prevPath: 'prevPath',
+          },
+          {
+            ...file('replacingFile'),
+            path: 'replacingFile',
+            replaces: true,
+          },
         ],
         currentBranchId: 'master',
       };
@@ -131,8 +141,24 @@ describe('Multi-file store utils', () => {
             last_commit_id: undefined,
             previous_path: undefined,
           },
+          {
+            action: commitActionTypes.move,
+            file_path: 'renamedFile',
+            content: null,
+            encoding: 'text',
+            last_commit_id: undefined,
+            previous_path: 'prevPath',
+          },
+          {
+            action: commitActionTypes.update,
+            file_path: 'replacingFile',
+            content: undefined,
+            encoding: 'text',
+            last_commit_id: undefined,
+            previous_path: undefined,
+          },
         ],
-        start_branch: undefined,
+        start_sha: undefined,
       });
     });
 
@@ -187,7 +213,7 @@ describe('Multi-file store utils', () => {
             previous_path: undefined,
           },
         ],
-        start_branch: undefined,
+        start_sha: undefined,
       });
     });
   });
@@ -235,6 +261,41 @@ describe('Multi-file store utils', () => {
         },
       ]);
     });
+
+    it('filters out folders from the list', () => {
+      const files = [
+        {
+          path: 'a',
+          type: 'blob',
+          deleted: true,
+        },
+        {
+          path: 'c',
+          type: 'tree',
+          deleted: true,
+        },
+        {
+          path: 'c/d',
+          type: 'blob',
+          deleted: true,
+        },
+      ];
+
+      const flattendFiles = utils.getCommitFiles(files);
+
+      expect(flattendFiles).toEqual([
+        {
+          path: 'a',
+          type: 'blob',
+          deleted: true,
+        },
+        {
+          path: 'c/d',
+          type: 'blob',
+          deleted: true,
+        },
+      ]);
+    });
   });
 
   describe('mergeTrees', () => {