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
e2d24850
Commit
e2d24850
authored
Aug 17, 2020
by
Suzanne Selhorn
Committed by
Simon Knox
Aug 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated gl-deprecated-button to gl-button
Related to:
https://gitlab.com/gitlab-org/gitlab/-/issues/219815
parent
965ce095
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
...ts/vue_shared/components/user_avatar/user_avatar_list.vue
+6
-6
spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js
...ue_shared/components/user_avatar/user_avatar_list_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
View file @
e2d24850
<
script
>
<
script
>
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
UserAvatarLink
from
'
./user_avatar_link.vue
'
;
import
UserAvatarLink
from
'
./user_avatar_link.vue
'
;
export
default
{
export
default
{
components
:
{
components
:
{
UserAvatarLink
,
UserAvatarLink
,
Gl
Deprecated
Button
,
GlButton
,
},
},
props
:
{
props
:
{
items
:
{
items
:
{
...
@@ -82,12 +82,12 @@ export default {
...
@@ -82,12 +82,12 @@ export default {
:img-size=
"imgSize"
:img-size=
"imgSize"
/>
/>
<template
v-if=
"hasBreakpoint"
>
<template
v-if=
"hasBreakpoint"
>
<gl-
deprecated-
button
v-if=
"hasHiddenItems"
variant=
"link"
@
click=
"expand"
>
<gl-button
v-if=
"hasHiddenItems"
variant=
"link"
@
click=
"expand"
>
{{
expandText
}}
{{
expandText
}}
</gl-
deprecated-
button>
</gl-button>
<gl-
deprecated-
button
v-else
variant=
"link"
@
click=
"collapse"
>
<gl-button
v-else
variant=
"link"
@
click=
"collapse"
>
{{
__
(
'
show less
'
)
}}
{{
__
(
'
show less
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</
template
>
</
template
>
</div>
</div>
</template>
</template>
spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js
View file @
e2d24850
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
import
UserAvatarList
from
'
~/vue_shared/components/user_avatar/user_avatar_list.vue
'
;
import
UserAvatarList
from
'
~/vue_shared/components/user_avatar/user_avatar_list.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
...
@@ -37,7 +37,7 @@ describe('UserAvatarList', () => {
...
@@ -37,7 +37,7 @@ describe('UserAvatarList', () => {
};
};
const
clickButton
=
()
=>
{
const
clickButton
=
()
=>
{
const
button
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
button
=
wrapper
.
find
(
GlButton
);
button
.
vm
.
$emit
(
'
click
'
);
button
.
vm
.
$emit
(
'
click
'
);
};
};
...
@@ -112,7 +112,7 @@ describe('UserAvatarList', () => {
...
@@ -112,7 +112,7 @@ describe('UserAvatarList', () => {
it
(
'
does not show button
'
,
()
=>
{
it
(
'
does not show button
'
,
()
=>
{
factory
();
factory
();
expect
(
wrapper
.
find
(
Gl
Deprecated
Button
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
GlButton
).
exists
()).
toBe
(
false
);
});
});
});
});
...
...
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