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
0019deb5
Commit
0019deb5
authored
Aug 12, 2020
by
Suzanne Selhorn
Committed by
Jarek Ostrowski
Aug 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated-button with button
Closes:
https://gitlab.com/gitlab-org/gitlab/-/issues/219784
parent
b2639156
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
ee/app/assets/javascripts/jobs/components/shared_runner_limit_block.vue
...javascripts/jobs/components/shared_runner_limit_block.vue
+5
-4
ee/spec/frontend/jobs/shared_runner_limit_block_spec.js
ee/spec/frontend/jobs/shared_runner_limit_block_spec.js
+6
-6
No files found.
ee/app/assets/javascripts/jobs/components/shared_runner_limit_block.vue
View file @
0019deb5
<
script
>
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
export
default
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
},
props
:
{
quotaUsed
:
{
...
...
@@ -55,13 +55,14 @@ export default {
<a
:href=
"runnersPath"
>
{{
__
(
'
Runners page.
'
)
}}
</a>
</
template
>
</p>
<gl-
deprecated-
button
<gl-button
v-if=
"subscriptionsMoreMinutesUrl"
variant=
"danger"
category=
"primary"
:href=
"subscriptionsMoreMinutesUrl"
class=
"btn-inverted"
>
{{ __('Purchase more minutes') }}
</gl-
deprecated-
button>
</gl-button>
</div>
</template>
ee/spec/frontend/jobs/shared_runner_limit_block_spec.js
View file @
0019deb5
import
SharedRunnerLimitBlock
from
'
ee/jobs/components/shared_runner_limit_block.vue
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
trimText
}
from
'
helpers/text_helper
'
;
describe
(
'
Shared Runner Limit Block
'
,
()
=>
{
...
...
@@ -40,12 +40,12 @@ describe('Shared Runner Limit Block', () => {
);
});
it
(
'
renders call to action gl-
deprecated-
button with the right href
'
,
()
=>
{
const
gl
DeprecatedButton
=
wrapper
.
find
(
GlDeprecated
Button
);
it
(
'
renders call to action gl-button with the right href
'
,
()
=>
{
const
gl
Button
=
wrapper
.
find
(
Gl
Button
);
expect
(
gl
Deprecated
Button
.
isVisible
()).
toBe
(
true
);
expect
(
gl
Deprecated
Button
.
attributes
(
'
variant
'
)).
toBe
(
'
danger
'
);
expect
(
gl
Deprecated
Button
.
attributes
(
'
href
'
)).
toBe
(
subscriptionsMoreMinutesUrl
);
expect
(
glButton
.
isVisible
()).
toBe
(
true
);
expect
(
glButton
.
attributes
(
'
variant
'
)).
toBe
(
'
danger
'
);
expect
(
glButton
.
attributes
(
'
href
'
)).
toBe
(
subscriptionsMoreMinutesUrl
);
});
});
...
...
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