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
b6cf6a5e
Commit
b6cf6a5e
authored
Aug 21, 2020
by
Alex Buijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert GlDeprecatedButton to GlButton
For subscriptions/new/components/checkout/confirm_order.vue
parent
396a7ccb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
ee/app/assets/javascripts/subscriptions/new/components/checkout/confirm_order.vue
...s/subscriptions/new/components/checkout/confirm_order.vue
+9
-4
ee/changelogs/unreleased/219781-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
...-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
+5
-0
ee/spec/frontend/subscriptions/new/components/checkout/confirm_order_spec.js
...bscriptions/new/components/checkout/confirm_order_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/subscriptions/new/components/checkout/confirm_order.vue
View file @
b6cf6a5e
<
script
>
import
{
mapState
,
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
export
default
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
GlLoadingIcon
,
},
computed
:
{
...
...
@@ -26,9 +26,14 @@ export default {
</
script
>
<
template
>
<div
v-if=
"isActive"
class=
"full-width gl-mb-7"
>
<gl-deprecated-button
:disabled=
"isConfirmingOrder"
variant=
"success"
@
click=
"confirmOrder"
>
<gl-button
:disabled=
"isConfirmingOrder"
variant=
"success"
category=
"primary"
@
click=
"confirmOrder"
>
<gl-loading-icon
v-if=
"isConfirmingOrder"
inline
size=
"sm"
/>
{{
isConfirmingOrder
?
$options
.
i18n
.
confirming
:
$options
.
i18n
.
confirm
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</
template
>
ee/changelogs/unreleased/219781-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-ja.yml
0 → 100644
View file @
b6cf6a5e
---
title
:
Replace <gl-deprecated-button> with <gl-button> in confirm_order component
merge_request
:
40119
author
:
type
:
changed
ee/spec/frontend/subscriptions/new/components/checkout/confirm_order_spec.js
View file @
b6cf6a5e
...
...
@@ -3,7 +3,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
import
Api
from
'
ee/api
'
;
import
createStore
from
'
ee/subscriptions/new/store
'
;
import
*
as
types
from
'
ee/subscriptions/new/store/mutation_types
'
;
import
{
Gl
Deprecated
Button
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
Component
from
'
ee/subscriptions/new/components/checkout/confirm_order.vue
'
;
describe
(
'
Confirm Order
'
,
()
=>
{
...
...
@@ -24,7 +24,7 @@ describe('Confirm Order', () => {
});
};
const
findConfirmButton
=
()
=>
wrapper
.
find
(
Gl
Deprecated
Button
);
const
findConfirmButton
=
()
=>
wrapper
.
find
(
GlButton
);
const
findLoadingIcon
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
beforeEach
(()
=>
{
...
...
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