diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 15:04:44 +0000 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 15:04:44 +0000 |
commit | 0d79fe7ed94a41132d63b6ae42e96417368b6ce0 (patch) | |
tree | 29037307f72a732fd2229faf2bffeb2aaf5ca628 /spec/javascripts | |
parent | 3028cd687a256b593272248e50a3174811594e64 (diff) | |
parent | 4882303760c9f22112985f78746f2416b701a47b (diff) | |
download | gitlab-ce-0d79fe7ed94a41132d63b6ae42e96417368b6ce0.tar.gz |
Merge branch '64677-delete-directory-webide' into 'master'
Fixed deletion of directories in Web IDE
Closes #64677
See merge request gitlab-org/gitlab-ce!31727
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/ide/stores/utils_spec.js | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/spec/javascripts/ide/stores/utils_spec.js b/spec/javascripts/ide/stores/utils_spec.js index bceb3a8db91..0fc9519a6bf 100644 --- a/spec/javascripts/ide/stores/utils_spec.js +++ b/spec/javascripts/ide/stores/utils_spec.js @@ -261,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', () => { |