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
18ca7848
Commit
18ca7848
authored
Aug 11, 2020
by
Amelia Bauerly
Committed by
Jose Ivan Vargas
Aug 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Swap deprecated button in settings > operations
parent
e1724883
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
app/assets/javascripts/operation_settings/components/metrics_settings.vue
...cripts/operation_settings/components/metrics_settings.vue
+2
-2
spec/frontend/operation_settings/components/metrics_settings_spec.js
...nd/operation_settings/components/metrics_settings_spec.js
+3
-4
No files found.
app/assets/javascripts/operation_settings/components/metrics_settings.vue
View file @
18ca7848
<
script
>
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
Gl
DeprecatedButton
as
Gl
Button
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
}
from
'
@gitlab/ui
'
;
import
ExternalDashboard
from
'
./form_group/external_dashboard.vue
'
;
import
DashboardTimezone
from
'
./form_group/dashboard_timezone.vue
'
;
...
...
@@ -45,7 +45,7 @@ export default {
<dashboard-timezone
/>
<external-dashboard
/>
<div
class=
"gl-display-flex gl-justify-content-end"
>
<gl-button
variant=
"success"
@
click=
"saveChanges"
>
<gl-button
variant=
"success"
category=
"primary"
@
click=
"saveChanges"
>
{{
__
(
'
Save Changes
'
)
}}
</gl-button>
</div>
...
...
spec/frontend/operation_settings/components/metrics_settings_spec.js
View file @
18ca7848
import
{
mount
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
,
GlLink
,
GlFormGroup
,
GlFormInput
,
GlFormSelect
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
,
GlFormGroup
,
GlFormInput
,
GlFormSelect
}
from
'
@gitlab/ui
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
MetricsSettings
from
'
~/operation_settings/components/metrics_settings.vue
'
;
...
...
@@ -61,7 +61,7 @@ describe('operation settings external dashboard component', () => {
describe
(
'
expand/collapse button
'
,
()
=>
{
it
(
'
renders as an expand button by default
'
,
()
=>
{
const
button
=
wrapper
.
find
(
Gl
Deprecated
Button
);
const
button
=
wrapper
.
find
(
GlButton
);
expect
(
button
.
text
()).
toBe
(
'
Expand
'
);
});
...
...
@@ -160,8 +160,7 @@ describe('operation settings external dashboard component', () => {
});
describe
(
'
submit button
'
,
()
=>
{
const
findSubmitButton
=
()
=>
wrapper
.
find
(
'
.settings-content form
'
).
find
(
GlDeprecatedButton
);
const
findSubmitButton
=
()
=>
wrapper
.
find
(
'
.settings-content form
'
).
find
(
GlButton
);
const
endpointRequest
=
[
operationsSettingsEndpoint
,
...
...
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