Skip to content

G
gitlab-ce
Commit e9328636 authored by Illya Klymov's avatar Illya Klymov
Browse files
Options

Merge branch 'himkp-content-viewer-test-coverage' into 'master' 

Improve test coverage of content_viewer module

See merge request gitlab-org/gitlab!31628
parents 9c8a11ad ed7ea3bf
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 153 deletions
app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js
View file @ e9328636
......@@ -26,8 +26,8 @@ const fileExtensionViewers = {
export function viewerInformationForPath(path) {
if (!path) return null;
const name = path.split('/').pop();
const viewerName =
fileNameViewers[name] || fileExtensionViewers[name ? name.split('.').pop() : ''] || '';
const extension = name.includes('.') && name.split('.').pop();
const viewerName = fileNameViewers[name] || fileExtensionViewers[extension];
return viewers[viewerName];
}
......
app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue
View file @ e9328636
<script>
import $ from 'jquery';
import '~/behaviors/markdown/render_gfm';
import { GlSkeletonLoading } from '@gitlab/ui';
import axios from '~/lib/utils/axios_utils';
import { __ } from '~/locale';
......@@ -78,7 +80,7 @@ export default {
this.isLoading = false;
this.$nextTick(() => {
$(this.$refs['markdown-preview']).renderGFM();
$(this.$refs.markdownPreview).renderGFM();
});
})
.catch(() => {
......@@ -92,7 +94,7 @@ export default {
</script>
<template>
<div ref="markdown-preview" class="md-previewer">
<div ref="markdownPreview" class="md-previewer">
<gl-skeleton-loading v-if="isLoading" />
<div v-else class="md" v-html="previewContent"></div>
</div>
......
spec/frontend/vue_shared/components/content_viewer/content_viewer_spec.js
View file @ e9328636
import Vue from 'vue';
import MockAdapter from 'axios-mock-adapter';
import mountComponent from 'helpers/vue_mount_component_helper';
import waitForPromises from 'helpers/wait_for_promises';
import { mount } from '@vue/test-utils';
import { GREEN_BOX_IMAGE_URL } from 'spec/test_constants';
import axios from '~/lib/utils/axios_utils';
import contentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue';
import ContentViewer from '~/vue_shared/components/content_viewer/content_viewer.vue';
import '~/behaviors/markdown/render_gfm';
describe('ContentViewer', () => {
let vm;
let mock;
let wrapper;
function createComponent(props) {
const ContentViewer = Vue.extend(contentViewer);
vm = mountComponent(ContentViewer, props);
}
afterEach(() => {
vm.$destroy();
if (mock) mock.restore();
});
it('markdown preview renders + loads rendered markdown from server', done => {
mock = new MockAdapter(axios);
mock.onPost(`${gon.relative_url_root}/testproject/preview_markdown`).replyOnce(200, {
body: '<b>testing</b>',
});
createComponent({
path: 'test.md',
content: '* Test',
projectPath: 'testproject',
type: 'markdown',
});
waitForPromises()
.then(() => {
expect(vm.$el.querySelector('.md-previewer').textContent).toContain('testing');
})
.then(done)
.catch(done.fail);
});
it('renders image preview', done => {
createComponent({
path: GREEN_BOX_IMAGE_URL,
fileSize: 1024,
type: 'image',
});
vm.$nextTick()
.then(() => {
expect(vm.$el.querySelector('img').getAttribute('src')).toBe(GREEN_BOX_IMAGE_URL);
})
.then(done)
.catch(done.fail);
});
it('renders fallback download control', done => {
createComponent({
path: 'somepath/test.abc',
fileSize: 1024,
});
vm.$nextTick()
.then(() => {
expect(
vm.$el
.querySelector('.file-info')
.textContent.trim()
.replace(/\s+/, ' '),
).toEqual('test.abc (1.00 KiB)');
expect(vm.$el.querySelector('.btn.btn-default').textContent.trim()).toEqual('Download');
})
.then(done)
.catch(done.fail);
});
it('renders fallback download control for file with a data URL path properly', done => {
createComponent({
path: 'data:application/octet-stream;base64,U0VMRUNUICfEhHNnc2cnIGZyb20gVGFibGVuYW1lOwoK',
filePath: 'somepath/test.abc',
});
vm.$nextTick()
.then(() => {
expect(vm.$el.querySelector('.file-info').textContent.trim()).toEqual('test.abc');
expect(vm.$el.querySelector('.btn.btn-default')).toHaveAttr('download', 'test.abc');
expect(vm.$el.querySelector('.btn.btn-default').textContent.trim()).toEqual('Download');
})
.then(done)
.catch(done.fail);
});
it('markdown preview receives the file path as a parameter', done => {
mock = new MockAdapter(axios);
jest.spyOn(axios, 'post');
mock.onPost(`${gon.relative_url_root}/testproject/preview_markdown`).reply(200, {
body: '<b>testing</b>',
});
createComponent({
path: 'test.md',
content: '* Test',
projectPath: 'testproject',
type: 'markdown',
filePath: 'foo/test.md',
it.each`
path | type | selector | viewer
${GREEN_BOX_IMAGE_URL} | ${'image'} | ${'img'} | ${'<image-viewer>'}
${'myfile.md'} | ${'markdown'} | ${'.md-previewer'} | ${'<markdown-viewer>'}
${'myfile.abc'} | ${undefined} | ${'[download]'} | ${'<download-viewer>'}
`('renders $viewer when file type="$type"', ({ path, type, selector }) => {
wrapper = mount(ContentViewer, {
propsData: { path, fileSize: 1024, type },
});
vm.$nextTick()
.then(() => {
expect(axios.post).toHaveBeenCalledWith(
`${gon.relative_url_root}/testproject/preview_markdown`,
{ path: 'foo/test.md', text: '* Test' },
expect.any(Object),
);
})
.then(done)
.catch(done.fail);
expect(wrapper.find(selector).element).toExist();
});
});
spec/frontend/vue_shared/components/content_viewer/lib/viewer_utils_spec.js 0 → 100644
View file @ e9328636
import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils';
describe('viewerInformationForPath', () => {
it.each`
path | type
${'p/somefile.jpg'} | ${'image'}
${'p/somefile.jpeg'} | ${'image'}
${'p/somefile.bmp'} | ${'image'}
${'p/somefile.ico'} | ${'image'}
${'p/somefile.png'} | ${'image'}
${'p/somefile.gif'} | ${'image'}
${'p/somefile.md'} | ${'markdown'}
${'p/md'} | ${undefined}
${'p/png'} | ${undefined}
${'p/md.png/a'} | ${undefined}
${'p/some-file.php'} | ${undefined}
`('when path=$path, type=$type', ({ path, type }) => {
expect(viewerInformationForPath(path)?.id).toBe(type);
});
});
spec/frontend/vue_shared/components/content_viewer/viewers/download_viewer_spec.js 0 → 100644
View file @ e9328636
import { mount } from '@vue/test-utils';
import DownloadViewer from '~/vue_shared/components/content_viewer/viewers/download_viewer.vue';
describe('DownloadViewer', () => {
let wrapper;
it.each`
path | filePath | fileSize | renderedName | renderedSize
${'somepath/test.abc'} | ${undefined} | ${1024} | ${'test.abc'} | ${'1.00 KiB'}
${'somepath/test.abc'} | ${undefined} | ${null} | ${'test.abc'} | ${''}
${'data:application/unknown;base64,U0VMRUNU'} | ${'somepath/test.abc'} | ${2048} | ${'test.abc'} | ${'2.00 KiB'}
`(
'renders the file name as "$renderedName" and shows size as "$renderedSize"',
({ path, filePath, fileSize, renderedName, renderedSize }) => {
wrapper = mount(DownloadViewer, {
propsData: { path, filePath, fileSize },
});
const renderedFileInfo = wrapper.find('.file-info').text();
expect(renderedFileInfo).toContain(renderedName);
expect(renderedFileInfo).toContain(renderedSize);
expect(wrapper.find('.btn.btn-default').text()).toContain('Download');
expect(wrapper.find('.btn.btn-default').element).toHaveAttr('download', 'test.abc');
},
);
});
spec/frontend/vue_shared/components/content_viewer/viewers/image_viewer_spec.js
View file @ e9328636
import { shallowMount } from '@vue/test-utils';
import { mount } from '@vue/test-utils';
import { GREEN_BOX_IMAGE_URL } from 'spec/test_constants';
import ImageViewer from '~/vue_shared/components/content_viewer/viewers/image_viewer.vue';
describe('Image Viewer', () => {
const requiredProps = {
path: GREEN_BOX_IMAGE_URL,
renderInfo: true,
};
let wrapper;
let imageInfo;
function createElement({ props, includeRequired = true } = {}) {
const data = includeRequired ? { ...requiredProps, ...props } : { ...props };
wrapper = shallowMount(ImageViewer, {
propsData: data,
it('renders image preview', () => {
wrapper = mount(ImageViewer, {
propsData: { path: GREEN_BOX_IMAGE_URL, fileSize: 1024 },
});
imageInfo = wrapper.find('.image-info');
}
describe('file sizes', () => {
it('should show the humanized file size when `renderInfo` is true and there is size info', () => {
createElement({ props: { fileSize: 1024 } });
expect(imageInfo.text()).toContain('1.00 KiB');
expect(wrapper.find('img').element).toHaveAttr('src', GREEN_BOX_IMAGE_URL);
});
it('should not show the humanized file size when `renderInfo` is true and there is no size', () => {
const FILESIZE_RE = /\d+(\.\d+)?\s*([KMGTP]i)*B/;
createElement({ props: { fileSize: 0 } });
// It shouldn't show any filesize info
expect(imageInfo.text()).not.toMatch(FILESIZE_RE);
describe('file sizes', () => {
it.each`
fileSize | renderInfo | elementExists | humanizedFileSize
${1024} | ${true} | ${true} | ${'1.00 KiB'}
${0} | ${true} | ${true} | ${''}
${1024} | ${false} | ${false} | ${undefined}
`(
'shows file size as "$humanizedFileSize", if fileSize=$fileSize and renderInfo=$renderInfo',
({ fileSize, renderInfo, elementExists, humanizedFileSize }) => {
wrapper = mount(ImageViewer, {
propsData: { path: GREEN_BOX_IMAGE_URL, fileSize, renderInfo },
});
it('should not show any image information when `renderInfo` is false', () => {
createElement({ props: { renderInfo: false } });
const imageInfo = wrapper.find('.image-info');
expect(imageInfo.exists()).toBe(false);
});
expect(imageInfo.exists()).toBe(elementExists);
expect(imageInfo.element?.textContent.trim()).toBe(humanizedFileSize);
},
);
});
});
spec/frontend/vue_shared/components/content_viewer/viewers/markdown_viewer_spec.js 0 → 100644
View file @ e9328636
import $ from 'jquery';
import axios from '~/lib/utils/axios_utils';
import MockAdapter from 'axios-mock-adapter';
import { mount } from '@vue/test-utils';
import waitForPromises from 'helpers/wait_for_promises';
import MarkdownViewer from '~/vue_shared/components/content_viewer/viewers/markdown_viewer.vue';
describe('MarkdownViewer', () => {
let wrapper;
let mock;
const createComponent = props => {
wrapper = mount(MarkdownViewer, {
propsData: {
...props,
path: 'test.md',
content: '* Test',
projectPath: 'testproject',
type: 'markdown',
},
});
};
beforeEach(() => {
mock = new MockAdapter(axios);
jest.spyOn(axios, 'post');
jest.spyOn($.fn, 'renderGFM');
});
afterEach(() => {
mock.restore();
});
describe('success', () => {
beforeEach(() => {
mock.onPost(`${gon.relative_url_root}/testproject/preview_markdown`).replyOnce(200, {
body: '<b>testing</b>',
});
});
it('renders an animation container while the markdown is loading', () => {
createComponent();
expect(wrapper.find('.animation-container')).toExist();
});
it('renders markdown preview preview renders and loads rendered markdown from server', () => {
createComponent();
return waitForPromises().then(() => {
expect(wrapper.find('.md-previewer').text()).toContain('testing');
});
});
it('receives the filePath as a parameter and passes it on to the server', () => {
createComponent({ filePath: 'foo/test.md' });
expect(axios.post).toHaveBeenCalledWith(
`${gon.relative_url_root}/testproject/preview_markdown`,
{ path: 'foo/test.md', text: '* Test' },
expect.any(Object),
);
});
});
describe('error', () => {
beforeEach(() => {
mock.onPost(`${gon.relative_url_root}/testproject/preview_markdown`).replyOnce(500, {
body: 'Internal Server Error',
});
});
it('renders an error message if loading the markdown preview fails', () => {
createComponent();
return waitForPromises().then(() => {
expect(wrapper.find('.md-previewer').text()).toContain('error');
});
});
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7