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
f31957d0
Commit
f31957d0
authored
Aug 20, 2020
by
Alexis Ginsberg
Committed by
Jarek Ostrowski
Aug 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate deprecated create epic button in epic tree
parent
a4b758de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
ee/app/assets/javascripts/related_items_tree/components/create_epic_form.vue
...cripts/related_items_tree/components/create_epic_form.vue
+7
-9
ee/spec/frontend/related_items_tree/components/create_epic_form_spec.js
...nd/related_items_tree/components/create_epic_form_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/related_items_tree/components/create_epic_form.vue
View file @
f31957d0
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
{
Gl
DeprecatedButton
,
GlLoadingIc
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
{
components
:
{
GlDeprecatedButton
,
GlLoadingIcon
,
GlButton
,
},
props
:
{
isSubmitting
:
{
...
...
@@ -62,18 +61,17 @@ export default {
@
keyup.escape.exact=
"onFormCancel"
/>
<div
class=
"add-issuable-form-actions clearfix"
>
<gl-
deprecated-
button
<gl-button
:disabled=
"isSubmitButtonDisabled"
:loading=
"isSubmitting"
variant=
"success"
category=
"primary"
type=
"submit"
class=
"float-left"
>
{{
buttonLabel
}}
<gl-loading-icon
v-if=
"isSubmitting"
:inline=
"true"
/>
</gl-deprecated-button>
<gl-deprecated-button
class=
"float-right"
@
click=
"onFormCancel"
>
{{
__
(
'
Cancel
'
)
}}
</gl-deprecated-button>
</gl-button>
<gl-button
class=
"float-right"
@
click=
"onFormCancel"
>
{{
__
(
'
Cancel
'
)
}}
</gl-button>
</div>
</form>
</
template
>
ee/spec/frontend/related_items_tree/components/create_epic_form_spec.js
View file @
f31957d0
import
{
createLocalVue
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
CreateEpicForm
from
'
ee/related_items_tree/components/create_epic_form.vue
'
;
import
createDefaultStore
from
'
ee/related_items_tree/store
'
;
...
...
@@ -106,7 +106,7 @@ describe('RelatedItemsTree', () => {
});
it
(
'
renders form action buttons
'
,
()
=>
{
const
actionButtons
=
wrapper
.
findAll
(
Gl
Deprecated
Button
);
const
actionButtons
=
wrapper
.
findAll
(
GlButton
);
expect
(
actionButtons
.
at
(
0
).
text
()).
toBe
(
'
Create epic
'
);
expect
(
actionButtons
.
at
(
1
).
text
()).
toBe
(
'
Cancel
'
);
...
...
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