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
59916fba
Commit
59916fba
authored
Nov 30, 2020
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new gl-button in subscriptions checkout step page
parent
c3f15d49
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
ee/app/assets/javascripts/subscriptions/new/components/checkout/step.vue
...avascripts/subscriptions/new/components/checkout/step.vue
+4
-4
ee/changelogs/unreleased/219861-replace-new-gl-button-subscriptions-checkout-step.yml
...861-replace-new-gl-button-subscriptions-checkout-step.yml
+5
-0
ee/spec/frontend/subscriptions/new/components/checkout/step_spec.js
...ontend/subscriptions/new/components/checkout/step_spec.js
+3
-3
No files found.
ee/app/assets/javascripts/subscriptions/new/components/checkout/step.vue
View file @
59916fba
<
script
>
<
script
>
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
GlFormGroup
,
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlFormGroup
,
GlButton
}
from
'
@gitlab/ui
'
;
import
{
convertToSnakeCase
,
dasherize
}
from
'
~/lib/utils/text_utility
'
;
import
{
convertToSnakeCase
,
dasherize
}
from
'
~/lib/utils/text_utility
'
;
import
StepHeader
from
'
./step_header.vue
'
;
import
StepHeader
from
'
./step_header.vue
'
;
import
StepSummary
from
'
./step_summary.vue
'
;
import
StepSummary
from
'
./step_summary.vue
'
;
...
@@ -8,7 +8,7 @@ import StepSummary from './step_summary.vue';
...
@@ -8,7 +8,7 @@ import StepSummary from './step_summary.vue';
export
default
{
export
default
{
components
:
{
components
:
{
GlFormGroup
,
GlFormGroup
,
Gl
Deprecated
Button
,
GlButton
,
StepHeader
,
StepHeader
,
StepSummary
,
StepSummary
,
},
},
...
@@ -66,9 +66,9 @@ export default {
...
@@ -66,9 +66,9 @@ export default {
<div
v-show=
"isActive"
@
keyup.enter=
"nextStep"
>
<div
v-show=
"isActive"
@
keyup.enter=
"nextStep"
>
<slot
name=
"body"
:active=
"isActive"
></slot>
<slot
name=
"body"
:active=
"isActive"
></slot>
<gl-form-group
v-if=
"nextStepButtonText"
class=
"gl-mt-3 gl-mb-0"
>
<gl-form-group
v-if=
"nextStepButtonText"
class=
"gl-mt-3 gl-mb-0"
>
<gl-
deprecated-button
variant=
"success
"
:disabled=
"!isValid"
@
click=
"nextStep"
>
<gl-
button
variant=
"success"
category=
"primary
"
:disabled=
"!isValid"
@
click=
"nextStep"
>
{{
nextStepButtonText
}}
{{
nextStepButtonText
}}
</gl-
deprecated-
button>
</gl-button>
</gl-form-group>
</gl-form-group>
</div>
</div>
<step-summary
v-if=
"isFinished"
:is-editable=
"isEditable"
:edit=
"edit"
>
<step-summary
v-if=
"isFinished"
:is-editable=
"isEditable"
:edit=
"edit"
>
...
...
ee/changelogs/unreleased/219861-replace-new-gl-button-subscriptions-checkout-step.yml
0 → 100644
View file @
59916fba
---
title
:
Use new gl-button in subscriptions checkout step page
merge_request
:
48765
author
:
type
:
other
ee/spec/frontend/subscriptions/new/components/checkout/step_spec.js
View file @
59916fba
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
Vuex
from
'
vuex
'
;
import
Component
from
'
ee/subscriptions/new/components/checkout/step.vue
'
;
import
Component
from
'
ee/subscriptions/new/components/checkout/step.vue
'
;
...
@@ -125,13 +125,13 @@ describe('Step', () => {
...
@@ -125,13 +125,13 @@ describe('Step', () => {
it
(
'
is disabled when this step is not valid
'
,
()
=>
{
it
(
'
is disabled when this step is not valid
'
,
()
=>
{
createComponent
({
isValid
:
false
});
createComponent
({
isValid
:
false
});
expect
(
wrapper
.
find
(
Gl
Deprecated
Button
).
attributes
(
'
disabled
'
)).
toBe
(
'
true
'
);
expect
(
wrapper
.
find
(
GlButton
).
attributes
(
'
disabled
'
)).
toBe
(
'
true
'
);
});
});
it
(
'
is enabled when this step is valid
'
,
()
=>
{
it
(
'
is enabled when this step is valid
'
,
()
=>
{
createComponent
();
createComponent
();
expect
(
wrapper
.
find
(
Gl
Deprecated
Button
).
attributes
(
'
disabled
'
)).
toBeUndefined
();
expect
(
wrapper
.
find
(
GlButton
).
attributes
(
'
disabled
'
)).
toBeUndefined
();
});
});
});
});
});
});
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