kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix broken markdown field test

This commit is contained in:
Filipa Lacerda 2017-08-11 21:43:33 +01:00
parent c7dbba8bf1
commit a3cf3e5074
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/vue_shared/components/markdown/field.vue
View File

@ -64,12 +64,11 @@
.then(resp => resp.json()) .then(resp => resp.json())
.then((data) => { .then((data) => {
this.markdownPreviewLoading = false; this.markdownPreviewLoading = false;
this.markdownPreview = data.body; this.markdownPreview = data.body || 'Nothing to preview.';
if (data.references) {
this.referencedCommands = data.references.commands; this.referencedCommands = data.references.commands;
this.referencedUsers = data.references.users; this.referencedUsers = data.references.users;
if (!this.markdownPreview) {
this.markdownPreview = 'Nothing to preview.';
} }
this.$nextTick(() => { this.$nextTick(() => {

3
spec/javascripts/vue_shared/components/markdown/field_spec.js
View File

@ -92,6 +92,7 @@ describe('Markdown field component', () => {
it('renders GFM with jQuery', (done) => { it('renders GFM with jQuery', (done) => {
spyOn($.fn, 'renderGFM'); spyOn($.fn, 'renderGFM');
previewLink.click(); previewLink.click();
setTimeout(() => { setTimeout(() => {
@ -100,7 +101,7 @@ describe('Markdown field component', () => {
).toHaveBeenCalled(); ).toHaveBeenCalled();
done(); done();
}); }, 0);
}); });
}); });