diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-23 10:38:39 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-23 10:38:39 +0300 |
commit | 712a63a7455af7e4663aea3862aa491b439d0f96 (patch) | |
tree | b686a9821a4123d681962bd0676e2fba9add19c0 /spec/javascripts/vue_shared | |
parent | cdada210286176b7b59ed8c1296ecac01b81b89b (diff) | |
parent | 8e51207a2aa0ff97c35e8dd1de1eac575551403a (diff) |
Merge branch '59514-uploading-images-base64' into 'master'
Resolve "Web IDE uploading images shows base64 string"
Closes #59514
See merge request gitlab-org/gitlab-ce!27471
Diffstat (limited to 'spec/javascripts/vue_shared')
-rw-r--r-- | spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js b/spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js index 4da8c6196b1..bdf802052b9 100644 --- a/spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js +++ b/spec/javascripts/vue_shared/components/content_viewer/content_viewer_spec.js @@ -4,6 +4,7 @@ import axios from '~/lib/utils/axios_utils'; import contentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { GREEN_BOX_IMAGE_URL } from 'spec/test_constants'; +import '~/behaviors/markdown/render_gfm'; describe('ContentViewer', () => { let vm; @@ -29,6 +30,7 @@ describe('ContentViewer', () => { path: 'test.md', content: '* Test', projectPath: 'testproject', + type: 'markdown', }); const previewContainer = vm.$el.querySelector('.md-previewer'); @@ -44,6 +46,7 @@ describe('ContentViewer', () => { createComponent({ path: GREEN_BOX_IMAGE_URL, fileSize: 1024, + type: 'image', }); setTimeout(() => { |