diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-13 13:42:04 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-13 13:42:04 +0000 |
| commit | 8e265bc3593ee70cf56579a3e3d8e733e413a8ba (patch) | |
| tree | 53fe47b35ab4d79e518b9d21b47850ff762dbbd8 /spec/javascripts/diffs | |
| parent | 4bda46a1107a5a5007ea211e61ac0ff6f84874d0 (diff) | |
| download | gitlab-ce-8e265bc3593ee70cf56579a3e3d8e733e413a8ba.tar.gz | |
Fix collapsed files not fully fully expanding
This fixes files that are collapsed by default not expanding
when the expand all button is clicked.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
Diffstat (limited to 'spec/javascripts/diffs')
| -rw-r--r-- | spec/javascripts/diffs/components/diff_file_spec.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js index 882ad3685a2..431944eee96 100644 --- a/spec/javascripts/diffs/components/diff_file_spec.js +++ b/spec/javascripts/diffs/components/diff_file_spec.js @@ -107,4 +107,26 @@ describe('DiffFile', () => { }); }); }); + + describe('watch collapsed', () => { + it('calls handleLoadCollapsedDiff if collapsed changed & file has no lines', done => { + spyOn(vm, 'handleLoadCollapsedDiff'); + + vm.file.highlightedDiffLines = undefined; + vm.file.parallelDiffLines = []; + vm.file.collapsed = true; + + vm.$nextTick() + .then(() => { + vm.file.collapsed = false; + + return vm.$nextTick(); + }) + .then(() => { + expect(vm.handleLoadCollapsedDiff).toHaveBeenCalled(); + }) + .then(done) + .catch(done.fail); + }); + }); }); |
