Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2109cef2
Commit
2109cef2
authored
Sep 15, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Abstract out id creation
- update tests
parent
03d3f3b7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
ee/app/assets/javascripts/approvals/components/approval_check_popover.vue
...vascripts/approvals/components/approval_check_popover.vue
+7
-2
ee/spec/frontend/approvals/components/approval_check_popover_spec.js
...ntend/approvals/components/approval_check_popover_spec.js
+5
-5
No files found.
ee/app/assets/javascripts/approvals/components/approval_check_popover.vue
View file @
2109cef2
...
@@ -29,20 +29,25 @@ export default {
...
@@ -29,20 +29,25 @@ export default {
default
:
''
,
default
:
''
,
},
},
},
},
computed
:
{
iconId
()
{
return
`reportInfo-
${
this
.
title
}
`
;
},
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<span
class=
"vertical-align-middle text-muted js-help ml-2"
>
<span
class=
"vertical-align-middle text-muted js-help ml-2"
>
<gl-icon
<gl-icon
:id=
"
'reportInfo' + title
"
:id=
"
iconId
"
name=
"question"
name=
"question"
class=
"author-link suggestion-help-hover"
class=
"author-link suggestion-help-hover"
:aria-label=
"__('help')"
:aria-label=
"__('help')"
:size=
"14"
:size=
"14"
data-testid=
"icon2"
data-testid=
"icon2"
/>
/>
<gl-popover
:target=
"
'reportInfo' + title
"
placement=
"top"
:title=
"title"
>
<gl-popover
:target=
"
iconId
"
placement=
"top"
:title=
"title"
>
<div
class=
"mb-2"
>
{{
text
}}
</div>
<div
class=
"mb-2"
>
{{
text
}}
</div>
<gl-link
v-if=
"documentationLink"
target=
"_blank"
:href=
"documentationLink"
>
<gl-link
v-if=
"documentationLink"
target=
"_blank"
:href=
"documentationLink"
>
<span
class=
"vertical-align-middle"
>
{{
documentationText
}}
</span>
<span
class=
"vertical-align-middle"
>
{{
documentationText
}}
</span>
...
...
ee/spec/frontend/approvals/components/approval_check_popover_spec.js
View file @
2109cef2
...
@@ -7,11 +7,11 @@ import { TEST_HOST } from 'helpers/test_constants';
...
@@ -7,11 +7,11 @@ import { TEST_HOST } from 'helpers/test_constants';
describe
(
'
Approval Check Popover
'
,
()
=>
{
describe
(
'
Approval Check Popover
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
const
title
=
'
Title
'
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
wrapper
=
shallowMount
(
component
,
{
wrapper
=
shallowMount
(
component
,
{
propsData
:
{
propsData
:
{
title
},
title
:
'
Title
'
,
},
});
});
});
});
...
@@ -43,8 +43,8 @@ describe('Approval Check Popover', () => {
...
@@ -43,8 +43,8 @@ describe('Approval Check Popover', () => {
it
(
'
should render gl-popover with correct props
'
,
()
=>
{
it
(
'
should render gl-popover with correct props
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlPopover
).
props
()).
toMatchObject
({
expect
(
wrapper
.
find
(
GlPopover
).
props
()).
toMatchObject
({
title
:
'
Title
'
,
title
,
target
:
'
reportInfo
'
,
target
:
`reportInfo-
${
title
}
`
,
placement
:
'
top
'
,
placement
:
'
top
'
,
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment