Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab
Commits
1e085572
Verified
Commit
1e085572
authored
6 months ago
by
Phil Hughes
Browse files
Options
Downloads
Patches
Plain Diff
Fixes markdown preview not working on comment templates
#410197
parent
19b8cf61
No related branches found
No related tags found
2 merge requests
!164749
Enable parallel in test-on-omnibus
,
!162277
Fixes markdown preview not working on comment templates
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/javascripts/vue_shared/components/markdown/field.vue
+1
-1
1 addition, 1 deletion
...sets/javascripts/vue_shared/components/markdown/field.vue
spec/frontend/vue_shared/components/markdown/field_spec.js
+59
-51
59 additions, 51 deletions
spec/frontend/vue_shared/components/markdown/field_spec.js
with
60 additions
and
52 deletions
app/assets/javascripts/vue_shared/components/markdown/field.vue
+
1
−
1
View file @
1e085572
...
...
@@ -344,7 +344,7 @@ export default {
}
this
.
markdownPreviewLoading
=
false
;
this
.
markdownPreview
=
data
.
body
||
__
(
'
Nothing to preview.
'
);
this
.
markdownPreview
=
data
.
body
||
data
.
html
||
__
(
'
Nothing to preview.
'
);
this
.
$nextTick
()
.
then
(()
=>
{
...
...
This diff is collapsed.
Click to expand it.
spec/frontend/vue_shared/components/markdown/field_spec.js
+
59
−
51
View file @
1e085572
...
...
@@ -165,75 +165,83 @@ describe('Markdown field component', () => {
});
describe
(
'
markdown preview
'
,
()
=>
{
beforeEach
(()
=>
{
axiosMock
.
onPost
(
markdownPreviewPath
).
reply
(
HTTP_STATUS_OK
,
{
body
:
previewHTML
});
});
it
(
'
sets preview toggle as active
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
describe
.
each
`
data
${{
body
:
previewHTML
}
}
${{
html
:
previewHTML
}
}
`
(
'
when api returns $data
'
,
({
data
})
=>
{
beforeEach
(()
=>
{
axiosMock
.
onPost
(
markdownPreviewPath
).
reply
(
HTTP_STATUS_OK
,
data
);
});
expect
(
previewToggle
.
text
()).
toBe
(
'
Preview
'
);
it
(
'
sets preview toggle as active
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
expect
(
previewToggle
.
text
()).
toBe
(
'
Preview
'
);
await
nextTick
();
expect
(
previewToggle
.
text
()).
toBe
(
'
Continue editing
'
);
});
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
it
(
'
shows preview loading text
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
(
);
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
await
nextTick
();
expect
(
previewToggle
.
text
()).
toBe
(
'
Continue editing
'
);
}
);
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
textContent
.
trim
()).
toContain
(
'
Loading…
'
);
}
);
it
(
'
shows preview loading text
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
(
);
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
it
(
'
renders markdown preview and GFM
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
textContent
.
trim
()).
toContain
(
'
Loading…
'
,
);
});
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
it
(
'
renders markdown preview and GFM
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
await
axios
.
waitFor
(
markdownPreviewPath
);
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
innerHTML
).
toContain
(
previewHTML
);
expect
(
renderGFM
).
toHaveBeenCalled
();
});
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
it
(
'
calls video.pause() on comment input when isSubmitting is changed to true
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
await
axios
.
waitFor
(
markdownPreviewPath
);
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
innerHTML
).
toContain
(
previewHTML
);
expect
(
renderGFM
).
toHaveBeenCalled
();
});
await
axios
.
waitFor
(
markdownPreviewPath
);
const
video
=
getVideo
();
const
callPause
=
jest
.
spyOn
(
video
.
element
,
'
pause
'
).
mockImplementation
(()
=>
true
);
it
(
'
calls video.pause() on comment input when isSubmitting is changed to true
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
subject
.
setProps
({
isSubmitting
:
true
});
await
axios
.
waitFor
(
markdownPreviewPath
);
const
video
=
getVideo
();
const
callPause
=
jest
.
spyOn
(
video
.
element
,
'
pause
'
).
mockImplementation
(()
=>
true
);
await
nextTick
();
expect
(
callPause
).
toHaveBeenCalled
();
});
subject
.
setProps
({
isSubmitting
:
true
});
it
(
'
switches between preview/write on toggle
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
await
nextTick
();
expect
(
callPause
).
toHaveBeenCalled
();
});
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
style
.
display
).
toBe
(
''
);
// visible
it
(
'
switches between preview/write on toggle
'
,
async
()
=>
{
previewToggle
=
getPreviewToggle
();
previewToggle
.
vm
.
$emit
(
'
click
'
,
false
);
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
style
.
display
).
toBe
(
'
none
'
);
});
previewToggle
.
vm
.
$emit
(
'
click
'
,
true
);
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
style
.
display
).
toBe
(
''
);
// visible
it
(
'
passes correct props to MarkdownHeader and MarkdownToolbar
'
,
()
=>
{
expect
(
findMarkdownToolbar
().
props
()).
toEqual
({
canAttachFile
:
true
,
markdownDocsPath
,
showCommentToolBar
:
true
,
showContentEditorSwitcher
:
false
,
previewToggle
.
vm
.
$emit
(
'
click
'
,
false
);
await
nextTick
();
expect
(
subject
.
find
(
'
.md-preview-holder
'
).
element
.
style
.
display
).
toBe
(
'
none
'
);
});
expect
(
findMarkdownHeader
().
props
()).
toMatchObject
({
supportsQuickActions
:
true
,
it
(
'
passes correct props to MarkdownHeader and MarkdownToolbar
'
,
()
=>
{
expect
(
findMarkdownToolbar
().
props
()).
toEqual
({
canAttachFile
:
true
,
markdownDocsPath
,
showCommentToolBar
:
true
,
showContentEditorSwitcher
:
false
,
});
expect
(
findMarkdownHeader
().
props
()).
toMatchObject
({
supportsQuickActions
:
true
,
});
});
});
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment