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
736545a5
Commit
736545a5
authored
Aug 12, 2020
by
Amelia Bauerly
Committed by
Olena Horal-Koretska
Aug 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Swapping deprecated error tracking buttons
parent
acaf79ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
...ipts/error_tracking/components/error_tracking_actions.vue
+9
-9
spec/frontend/error_tracking/components/error_tracking_actions_spec.js
.../error_tracking/components/error_tracking_actions_spec.js
+3
-3
No files found.
app/assets/javascripts/error_tracking/components/error_tracking_actions.vue
View file @
736545a5
<
script
>
<
script
>
import
{
Gl
Deprecated
Button
,
GlIcon
,
GlButtonGroup
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlIcon
,
GlButtonGroup
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
const
IGNORED
=
'
ignored
'
;
const
IGNORED
=
'
ignored
'
;
...
@@ -10,7 +10,7 @@ const statusValidation = [IGNORED, RESOLVED, UNRESOLVED];
...
@@ -10,7 +10,7 @@ const statusValidation = [IGNORED, RESOLVED, UNRESOLVED];
export
default
{
export
default
{
components
:
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
GlIcon
,
GlIcon
,
GlButtonGroup
,
GlButtonGroup
,
},
},
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
<
template
>
<
template
>
<div>
<div>
<gl-button-group
class=
"gl-flex-direction-column flex-md-row gl-ml-0 ml-md-n4"
>
<gl-button-group
class=
"gl-flex-direction-column flex-md-row gl-ml-0 ml-md-n4"
>
<gl-
deprecated-
button
<gl-button
:key=
"ignoreBtn.status"
:key=
"ignoreBtn.status"
:ref=
"`$
{ignoreBtn.title.toLowerCase()}Error`"
:ref=
"`$
{ignoreBtn.title.toLowerCase()}Error`"
v-gl-tooltip.hover
v-gl-tooltip.hover
...
@@ -55,8 +55,8 @@ export default {
...
@@ -55,8 +55,8 @@ export default {
>
>
<gl-icon
class=
"gl-display-none d-md-inline gl-m-0"
:name=
"ignoreBtn.icon"
:size=
"12"
/>
<gl-icon
class=
"gl-display-none d-md-inline gl-m-0"
:name=
"ignoreBtn.icon"
:size=
"12"
/>
<span
class=
"d-md-none"
>
{{
ignoreBtn
.
title
}}
</span>
<span
class=
"d-md-none"
>
{{
ignoreBtn
.
title
}}
</span>
</gl-
deprecated-
button>
</gl-button>
<gl-
deprecated-
button
<gl-button
:key=
"resolveBtn.status"
:key=
"resolveBtn.status"
:ref=
"`$
{resolveBtn.title.toLowerCase()}Error`"
:ref=
"`$
{resolveBtn.title.toLowerCase()}Error`"
v-gl-tooltip.hover
v-gl-tooltip.hover
...
@@ -66,15 +66,15 @@ export default {
...
@@ -66,15 +66,15 @@ export default {
>
>
<gl-icon
class=
"gl-display-none d-md-inline gl-m-0"
:name=
"resolveBtn.icon"
:size=
"12"
/>
<gl-icon
class=
"gl-display-none d-md-inline gl-m-0"
:name=
"resolveBtn.icon"
:size=
"12"
/>
<span
class=
"d-md-none"
>
{{
resolveBtn
.
title
}}
</span>
<span
class=
"d-md-none"
>
{{
resolveBtn
.
title
}}
</span>
</gl-
deprecated-
button>
</gl-button>
</gl-button-group>
</gl-button-group>
<gl-
deprecated-
button
<gl-button
:href=
"detailsLink"
:href=
"detailsLink"
category=
"
second
ary"
category=
"
prim
ary"
variant=
"info"
variant=
"info"
class=
"gl-display-block d-md-none gl-mb-4 mb-md-0"
class=
"gl-display-block d-md-none gl-mb-4 mb-md-0"
>
>
{{
__
(
'
More details
'
)
}}
{{
__
(
'
More details
'
)
}}
</gl-
deprecated-
button>
</gl-button>
</div>
</div>
</
template
>
</
template
>
spec/frontend/error_tracking/components/error_tracking_actions_spec.js
View file @
736545a5
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
ErrorTrackingActions
from
'
~/error_tracking/components/error_tracking_actions.vue
'
;
import
ErrorTrackingActions
from
'
~/error_tracking/components/error_tracking_actions.vue
'
;
describe
(
'
Error Tracking Actions
'
,
()
=>
{
describe
(
'
Error Tracking Actions
'
,
()
=>
{
...
@@ -20,7 +20,7 @@ describe('Error Tracking Actions', () => {
...
@@ -20,7 +20,7 @@ describe('Error Tracking Actions', () => {
},
},
...
props
,
...
props
,
},
},
stubs
:
{
Gl
Deprecated
Button
},
stubs
:
{
GlButton
},
});
});
}
}
...
@@ -34,7 +34,7 @@ describe('Error Tracking Actions', () => {
...
@@ -34,7 +34,7 @@ describe('Error Tracking Actions', () => {
}
}
});
});
const
findButtons
=
()
=>
wrapper
.
findAll
(
Gl
Deprecated
Button
);
const
findButtons
=
()
=>
wrapper
.
findAll
(
GlButton
);
describe
(
'
when error status is unresolved
'
,
()
=>
{
describe
(
'
when error status is unresolved
'
,
()
=>
{
it
(
'
renders the correct actions buttons to allow ignore and resolve
'
,
()
=>
{
it
(
'
renders the correct actions buttons to allow ignore and resolve
'
,
()
=>
{
...
...
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