Skip to content
Snippets Groups Projects
Commit 3628fb42 authored by HJ's avatar HJ :fire:
Browse files

fix tests

parent 97e4a3d8
No related branches found
No related tags found
3 merge requests!1711Update stable - 2.5.0 release,!1585Fixing merge conflicts and lint for report notifications MR,!1540Disjointed popovers
Pipeline #40207 passed
......@@ -4,7 +4,15 @@ import RichContent from 'src/components/rich_content/rich_content.jsx'
const attentions = []
const global = {
mocks: {
'$store': null
'$store': {
state: {},
getters: {
mergedConfig: () => ({
mentionLinkShowTooltip: true
}),
findUserByUrl: () => null
}
}
},
stubs: {
FAIcon: true
......@@ -131,8 +139,7 @@ describe('RichContent', () => {
].join(''),
[
makeMention('John'),
makeMention('Josh'),
makeMention('Jeremy')
makeMention('Josh'), makeMention('Jeremy')
].join('')
].join('\n')
......@@ -359,9 +366,9 @@ describe('RichContent', () => {
'</span>',
'</a>',
'<!-- eslint-enable vue/no-v-html -->',
'<!--v-if-->', // v-if placeholder, mentionlink's "new" (i.e. rich) display
'<!---->', // vue placeholder
'</span>',
'<!--v-if-->', // v-if placeholder, mentionsline's extra mentions and stuff
'<!--v-if-->', // vue placeholder, mentionsline's extra mentions and stuff
'</span>'
),
p(
......@@ -422,7 +429,7 @@ describe('RichContent', () => {
'</span>',
'</a>',
'<!-- eslint-enable vue/no-v-html -->',
'<!--v-if-->', // v-if placeholder, mentionlink's "new" (i.e. rich) display
'<!---->', // vue placeholder, mentionlink's "new" (i.e. rich) display
'</span>',
'<span class="MentionLink mention-link">',
'<!-- eslint-disable vue/no-v-html -->',
......@@ -435,9 +442,9 @@ describe('RichContent', () => {
'</span>',
'</a>',
'<!-- eslint-enable vue/no-v-html -->',
'<!--v-if-->', // v-if placeholder, mentionlink's "new" (i.e. rich) display
'<!---->', // vue placeholder, mentionlink's "new" (i.e. rich) display
'</span>',
'<!--v-if-->', // v-if placeholder, mentionsline's extra mentions and stuff
'<!--v-if-->', // vue placeholder, mentionsline's extra mentions and stuff
'</span>',
' ',
'</span>',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment