diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-06 01:36:20 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-06 01:36:20 +0300 |
| commit | 970cdfdd6124f03f4a65d0f4378e83b5bcdb471d (patch) | |
| tree | ba7e070f9266532fa9eefacc4712cf8690e30369 /spec/javascripts/diffs/components/diff_content_spec.js | |
| parent | 1bd08177761a6599d2ebfdfb02bcadee574e9c44 (diff) | |
| parent | caf10464c0e78817c91ff01e3be5f2f9472aba19 (diff) | |
Merge branch 'osw-fix-lfs-images-not-rendering' into 'master'
Fix LFS uploaded images not being rendered
Closes #50617
See merge request gitlab-org/gitlab-ce!22092
Diffstat (limited to 'spec/javascripts/diffs/components/diff_content_spec.js')
| -rw-r--r-- | spec/javascripts/diffs/components/diff_content_spec.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/javascripts/diffs/components/diff_content_spec.js b/spec/javascripts/diffs/components/diff_content_spec.js index dea600a783a..67f7b569f47 100644 --- a/spec/javascripts/diffs/components/diff_content_spec.js +++ b/spec/javascripts/diffs/components/diff_content_spec.js @@ -8,13 +8,12 @@ import diffFileMockData from '../mock_data/diff_file'; describe('DiffContent', () => { const Component = Vue.extend(DiffContentComponent); let vm; - const getDiffFileMock = () => Object.assign({}, diffFileMockData); beforeEach(() => { vm = mountComponentWithStore(Component, { store, props: { - diffFile: getDiffFileMock(), + diffFile: JSON.parse(JSON.stringify(diffFileMockData)), }, }); }); @@ -43,7 +42,7 @@ describe('DiffContent', () => { describe('Non-Text diffs', () => { beforeEach(() => { - vm.diffFile.text = false; + vm.diffFile.viewer.name = 'image'; }); describe('image diff', () => { |