Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-10-06 01:36:20 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-10-06 01:36:20 +0300
commit970cdfdd6124f03f4a65d0f4378e83b5bcdb471d (patch)
treeba7e070f9266532fa9eefacc4712cf8690e30369 /spec/javascripts/diffs/components/diff_file_spec.js
parent1bd08177761a6599d2ebfdfb02bcadee574e9c44 (diff)
parentcaf10464c0e78817c91ff01e3be5f2f9472aba19 (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_file_spec.js')
-rw-r--r--spec/javascripts/diffs/components/diff_file_spec.js5
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 2a52cd2b179..13859f43e98 100644
--- a/spec/javascripts/diffs/components/diff_file_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_spec.js
@@ -6,11 +6,10 @@ import diffFileMockData from '../mock_data/diff_file';
describe('DiffFile', () => {
let vm;
- const getDiffFileMock = () => Object.assign({}, diffFileMockData);
beforeEach(() => {
vm = createComponentWithStore(Vue.extend(DiffFileComponent), store, {
- file: getDiffFileMock(),
+ file: JSON.parse(JSON.stringify(diffFileMockData)),
canCurrentUserFork: false,
}).$mount();
});
@@ -18,7 +17,7 @@ describe('DiffFile', () => {
describe('template', () => {
it('should render component with file header, file content components', () => {
const el = vm.$el;
- const { fileHash, filePath } = diffFileMockData;
+ const { fileHash, filePath } = vm.file;
expect(el.id).toEqual(fileHash);
expect(el.classList.contains('diff-file')).toEqual(true);