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
6c824a4b
Commit
6c824a4b
authored
Aug 06, 2020
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert gl-deprecated-button to gl-button in dropdown_header.vue
parent
881661c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
17 deletions
+9
-17
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_header.vue
...hared/components/sidebar/epics_select/dropdown_header.vue
+6
-8
ee/spec/frontend/vue_shared/components/sidebar/epics_select/dropdown_header_spec.js
...d/components/sidebar/epics_select/dropdown_header_spec.js
+3
-9
No files found.
ee/app/assets/javascripts/vue_shared/components/sidebar/epics_select/dropdown_header.vue
View file @
6c824a4b
<
script
>
import
{
Gl
DeprecatedButton
,
GlIc
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
GlDeprecatedButton
,
GlIcon
,
GlButton
,
},
};
</
script
>
...
...
@@ -12,12 +11,11 @@ export default {
<
template
>
<div
class=
"dropdown-title"
>
<span>
{{
__
(
'
Assign epic
'
)
}}
</span>
<gl-
deprecated-
button
<gl-button
:aria-label=
"__('Close')"
variant=
"link
"
category=
"tertiary
"
class=
"dropdown-title-button dropdown-menu-close"
>
<gl-icon
name=
"close"
/>
</gl-deprecated-button>
icon=
"close"
/>
</div>
</
template
>
ee/spec/frontend/vue_shared/components/sidebar/epics_select/dropdown_header_spec.js
View file @
6c824a4b
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
DeprecatedButton
,
GlIc
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
DropdownHeader
from
'
ee/vue_shared/components/sidebar/epics_select/dropdown_header.vue
'
;
describe
(
'
EpicsSelect
'
,
()
=>
{
...
...
@@ -25,20 +25,14 @@ describe('EpicsSelect', () => {
});
it
(
'
should render close button
'
,
()
=>
{
const
buttonEl
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
buttonEl
=
wrapper
.
find
(
GlButton
);
expect
(
buttonEl
.
exists
()).
toBe
(
true
);
expect
(
buttonEl
.
attributes
(
'
aria-label
'
)).
toBe
(
'
Close
'
);
expect
(
buttonEl
.
classes
()).
toEqual
(
expect
.
arrayContaining
([
'
dropdown-title-button
'
,
'
dropdown-menu-close
'
]),
);
});
it
(
'
should render close button icon
'
,
()
=>
{
const
iconEl
=
wrapper
.
find
(
GlDeprecatedButton
).
find
(
GlIcon
);
expect
(
iconEl
.
exists
()).
toBe
(
true
);
expect
(
iconEl
.
attributes
(
'
name
'
)).
toBe
(
'
close
'
);
expect
(
buttonEl
.
props
(
'
icon
'
)).
toBe
(
'
close
'
);
});
});
});
...
...
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