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
d607e7e2
Commit
d607e7e2
authored
Oct 22, 2020
by
Maria Vrachni
Committed by
Simon Knox
Oct 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update unit test attributes
* Update attribute we check to reflect new component attributes
parent
5e7565eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/groups/components/item_actions.vue
app/assets/javascripts/groups/components/item_actions.vue
+4
-9
changelogs/unreleased/mvrachni-OKR-button-migration.yml
changelogs/unreleased/mvrachni-OKR-button-migration.yml
+5
-0
spec/frontend/groups/components/item_actions_spec.js
spec/frontend/groups/components/item_actions_spec.js
+2
-2
No files found.
app/assets/javascripts/groups/components/item_actions.vue
View file @
d607e7e2
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
GlIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
eventHub
from
'
../event_hub
'
;
import
{
COMMON_STR
}
from
'
../constants
'
;
...
...
@@ -9,7 +8,7 @@ export default {
GlIcon
,
},
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
parentGroup
:
{
...
...
@@ -47,12 +46,10 @@ export default {
<div
class=
"controls d-flex justify-content-end"
>
<a
v-if=
"group.canLeave"
v-
toolti
p
v-
gl-tooltip
.
to
p
:href=
"group.leavePath"
:title=
"leaveBtnTitle"
:aria-label=
"leaveBtnTitle"
data-container=
"body"
data-placement=
"bottom"
data-testid=
"leave-group-btn"
class=
"leave-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
@
click.prevent=
"onLeaveGroup"
...
...
@@ -61,12 +58,10 @@ export default {
</a>
<a
v-if=
"group.canEdit"
v-
toolti
p
v-
gl-tooltip
.
to
p
:href=
"group.editPath"
:title=
"editBtnTitle"
:aria-label=
"editBtnTitle"
data-container=
"body"
data-placement=
"bottom"
data-testid=
"edit-group-btn"
class=
"edit-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5"
>
...
...
changelogs/unreleased/mvrachni-OKR-button-migration.yml
0 → 100644
View file @
d607e7e2
---
title
:
Update Tooltip in Groups to use gl-tooltip
merge_request
:
45305
author
:
type
:
other
spec/frontend/groups/components/item_actions_spec.js
View file @
d607e7e2
...
...
@@ -50,7 +50,7 @@ describe('ItemActions', () => {
expect
(
findEditGroupBtn
().
classes
()).
toContain
(
'
no-expand
'
);
expect
(
findEditGroupBtn
().
attributes
(
'
href
'
)).
toBe
(
group
.
editPath
);
expect
(
findEditGroupBtn
().
attributes
(
'
aria-label
'
)).
toBe
(
'
Edit group
'
);
expect
(
findEditGroupBtn
().
attributes
(
'
data-original-
title
'
)).
toBe
(
'
Edit group
'
);
expect
(
findEditGroupBtn
().
attributes
(
'
title
'
)).
toBe
(
'
Edit group
'
);
expect
(
findEditGroupIcon
().
exists
()).
toBe
(
true
);
expect
(
findEditGroupIcon
().
props
(
'
name
'
)).
toBe
(
'
settings
'
);
});
...
...
@@ -70,7 +70,7 @@ describe('ItemActions', () => {
expect
(
findLeaveGroupBtn
().
classes
()).
toContain
(
'
no-expand
'
);
expect
(
findLeaveGroupBtn
().
attributes
(
'
href
'
)).
toBe
(
group
.
leavePath
);
expect
(
findLeaveGroupBtn
().
attributes
(
'
aria-label
'
)).
toBe
(
'
Leave this group
'
);
expect
(
findLeaveGroupBtn
().
attributes
(
'
data-original-
title
'
)).
toBe
(
'
Leave this group
'
);
expect
(
findLeaveGroupBtn
().
attributes
(
'
title
'
)).
toBe
(
'
Leave this group
'
);
expect
(
findLeaveGroupIcon
().
exists
()).
toBe
(
true
);
expect
(
findLeaveGroupIcon
().
props
(
'
name
'
)).
toBe
(
'
leave
'
);
});
...
...
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