diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-25 09:36:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-25 09:36:50 +0000 |
| commit | e055f7d3caa2b4ba9e9d752b9f846c1c9b674c44 (patch) | |
| tree | 18749697207c3d36aa7a80f2ce3f4d58e8fc250e /spec/javascripts/diffs | |
| parent | d42762ce2cea606d8a24b8246a7270ec253215f2 (diff) | |
| parent | f10d75ecf6eaa568fc46a36a965c1d654a8317ef (diff) | |
| download | gitlab-ce-e055f7d3caa2b4ba9e9d752b9f846c1c9b674c44.tar.gz | |
Merge branch 'diff-fix-folder-path-commas' into 'master'
Fixed diff tree folders being rendered incorrectly
See merge request gitlab-org/gitlab-ce!24635
Diffstat (limited to 'spec/javascripts/diffs')
| -rw-r--r-- | spec/javascripts/diffs/store/utils_spec.js | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/spec/javascripts/diffs/store/utils_spec.js b/spec/javascripts/diffs/store/utils_spec.js index 3641946518b..c5e413a29d8 100644 --- a/spec/javascripts/diffs/store/utils_spec.js +++ b/spec/javascripts/diffs/store/utils_spec.js @@ -667,6 +667,47 @@ describe('DiffsStoreUtils', () => { }, { type: 'tree', + name: 'ee', + tree: [ + { + type: 'tree', + name: 'lib', + tree: [ + { + type: 'tree', + name: 'ee', + tree: [ + { + type: 'tree', + name: 'gitlab', + tree: [ + { + type: 'tree', + name: 'checks', + tree: [ + { + type: 'tree', + name: 'longtreenametomakepath', + tree: [ + { + type: 'blob', + name: 'diff_check.rb', + tree: [], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + ], + }, + { + type: 'tree', name: 'spec', tree: [ { @@ -698,6 +739,17 @@ describe('DiffsStoreUtils', () => { }, { type: 'tree', + name: 'ee/lib/…/…/…/longtreenametomakepath', + tree: [ + { + name: 'diff_check.rb', + tree: [], + type: 'blob', + }, + ], + }, + { + type: 'tree', name: 'spec', tree: [ { |