diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-18 16:19:19 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-18 16:19:19 +0000 |
| commit | fe10964a6884162b9272ec3a32a5736c2a997ab2 (patch) | |
| tree | a425e6192d3c25975596f6535d062741223c3058 /spec/javascripts/diffs/components | |
| parent | 22264555b141d8baf1260a919fb76c3ed88b1055 (diff) | |
| parent | 512f9624fa8b47480da4cd0a69a493d7ccecc65a (diff) | |
| download | gitlab-ce-fe10964a6884162b9272ec3a32a5736c2a997ab2.tar.gz | |
Merge branch 'fix-diffs-not-rendering' into 'master'
Fix diff files not rendering
See merge request gitlab-org/gitlab-ce!25358
Diffstat (limited to 'spec/javascripts/diffs/components')
| -rw-r--r-- | spec/javascripts/diffs/components/diff_file_spec.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/javascripts/diffs/components/diff_file_spec.js b/spec/javascripts/diffs/components/diff_file_spec.js index d16bc21022f..65a1c9b8f15 100644 --- a/spec/javascripts/diffs/components/diff_file_spec.js +++ b/spec/javascripts/diffs/components/diff_file_spec.js @@ -28,8 +28,7 @@ describe('DiffFile', () => { expect(el.querySelector('.file-title-name').innerText.indexOf(file_path)).toBeGreaterThan(-1); expect(el.querySelector('.js-syntax-highlight')).toBeDefined(); - expect(vm.renderIt).toEqual(false); - vm.renderIt = true; + vm.file.renderIt = true; vm.$nextTick(() => { expect(el.querySelectorAll('.line_content').length).toBeGreaterThan(5); @@ -41,7 +40,7 @@ describe('DiffFile', () => { expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(1); expect(vm.isCollapsed).toEqual(false); vm.isCollapsed = true; - vm.renderIt = true; + vm.file.renderIt = true; vm.$nextTick(() => { expect(vm.$el.querySelectorAll('.diff-content').length).toEqual(0); |
