diff options
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_content.vue | 4 | ||||
| -rw-r--r-- | spec/javascripts/diffs/components/diff_content_spec.js | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue index 452938a2200..98997b522d9 100644 --- a/app/assets/javascripts/diffs/components/diff_content.vue +++ b/app/assets/javascripts/diffs/components/diff_content.vue @@ -74,12 +74,12 @@ export default { <template v-if="isTextFile"> <empty-file-viewer v-if="diffFile.empty" /> <inline-diff-view - v-if="isInlineView" + v-else-if="isInlineView" :diff-file="diffFile" :diff-lines="diffFile.highlighted_diff_lines || []" /> <parallel-diff-view - v-if="isParallelView" + v-else-if="isParallelView" :diff-file="diffFile" :diff-lines="diffFile.parallel_diff_lines || []" /> diff --git a/spec/javascripts/diffs/components/diff_content_spec.js b/spec/javascripts/diffs/components/diff_content_spec.js index a63960b3567..983b32c282e 100644 --- a/spec/javascripts/diffs/components/diff_content_spec.js +++ b/spec/javascripts/diffs/components/diff_content_spec.js @@ -58,16 +58,16 @@ describe('DiffContent', () => { it('should render a message', done => { vm.$nextTick(() => { - expect(vm.$el.querySelector('.diff-viewer .nothing-here-block')).not.toBe(null); - expect( - vm.$el.querySelector('.diff-viewer .nothing-here-block').textContent.trim(), - ).toContain('Empty file'); + const block = vm.$el.querySelector('.diff-viewer .nothing-here-block'); + + expect(block).not.toBe(null); + expect(block.textContent.trim()).toContain('Empty file'); done(); }); }); - it('should not display multiple messages', done => { + it('should not render multiple messages', done => { vm.diffFile.mode_changed = true; vm.diffFile.b_mode = '100755'; vm.diffFile.viewer.name = 'mode_changed'; @@ -78,6 +78,14 @@ describe('DiffContent', () => { done(); }); }); + + it('should not render diff table', done => { + vm.$nextTick(() => { + expect(vm.$el.querySelector('table')).toBe(null); + + done(); + }); + }); }); describe('Non-Text diffs', () => { |