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
b30a8217
Commit
b30a8217
authored
Jun 16, 2021
by
Jannik Lehmann
Committed by
Jose Ivan Vargas
Jun 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust Popover trigger on licence-check approvers panel
parent
449a63ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
13 deletions
+23
-13
ee/app/assets/javascripts/approvals/components/approval_check_popover.vue
...vascripts/approvals/components/approval_check_popover.vue
+5
-9
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
...ge_request_widget/components/approvals/approvals_list.vue
+3
-3
ee/spec/frontend/approvals/components/approval_check_popover_spec.js
...ntend/approvals/components/approval_check_popover_spec.js
+15
-1
No files found.
ee/app/assets/javascripts/approvals/components/approval_check_popover.vue
View file @
b30a8217
...
...
@@ -33,20 +33,16 @@ export default {
</
script
>
<
template
>
<span
class=
"vertical-align-middle text-muted js-help"
>
<span
class=
"vertical-align-middle text-muted js-help
ml-2
"
>
<gl-icon
ref
=
"reportInfo"
id
=
"reportInfo"
name=
"question"
class=
"
text-info
"
class=
"
author-link suggestion-help-hover
"
:aria-label=
"__('help')"
:size=
"14"
data-testid=
"icon2"
/>
<gl-popover
:target=
"() => $refs.reportInfo.$el"
placement=
"top"
triggers=
"click blur"
:title=
"title"
>
<gl-popover
target=
"reportInfo"
placement=
"top"
:title=
"title"
>
<div
class=
"mb-2"
>
{{
text
}}
</div>
<gl-link
v-if=
"documentationLink"
target=
"_blank"
:href=
"documentationLink"
>
<span
class=
"vertical-align-middle"
>
{{
documentationText
}}
</span>
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
View file @
b30a8217
...
...
@@ -117,14 +117,14 @@ export default {
<td
class=
"w-0 gl-pr-4!"
><approved-icon
class=
"gl-pl-2"
:is-approved=
"rule.approved"
/></td>
<td
:colspan=
"rule.rule_type === $options.ruleTypeAnyApprover ? 2 : 1"
class=
"gl-pl-0!"
>
<div
:class=
"glFeatures.approvalsCommentedBy ? 'd-md-
block' : 'd-sm-block
'"
class=
"d-none js-name"
:class=
"glFeatures.approvalsCommentedBy ? 'd-md-
flex' : 'd-sm-flex
'"
class=
"d-none js-name
align-items-center
"
>
<empty-rule-name
v-if=
"rule.rule_type === $options.ruleTypeAnyApprover"
:eligible-approvers-docs-path=
"eligibleApproversDocsPath"
/>
<span
v-else
>
<span
v-else
class=
"mt-n1"
>
<span
v-if=
"rule.section && rule.section !== 'codeowners'"
:aria-label=
"sectionNameLabel(rule)"
...
...
ee/spec/frontend/approvals/components/approval_check_popover_spec.js
View file @
b30a8217
import
{
GlPopover
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlPopover
,
GlLink
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vue
from
'
vue
'
;
import
component
from
'
ee/approvals/components/approval_check_popover.vue
'
;
...
...
@@ -34,4 +34,18 @@ describe('Approval Check Popover', () => {
expect
(
wrapper
.
find
(
GlPopover
).
find
(
GlLink
).
exists
()).
toBeFalsy
();
});
});
it
(
'
renders an Icon with an id that matches the Popover target
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlPopover
).
props
().
target
).
toBe
(
wrapper
.
find
(
GlIcon
).
element
.
getAttribute
(
'
id
'
),
);
});
it
(
'
should render gl-popover with correct props
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlPopover
).
props
()).
toMatchObject
({
title
:
'
Title
'
,
target
:
'
reportInfo
'
,
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