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
e4d5c3cb
Commit
e4d5c3cb
authored
Feb 16, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update status icons for requirements
Changelog: changed EE: true
parent
b4bdcd48
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
ee/app/assets/javascripts/requirements/components/requirement_status_badge.vue
...ipts/requirements/components/requirement_status_badge.vue
+2
-2
ee/app/assets/javascripts/requirements/components/tokens/status_token.vue
...vascripts/requirements/components/tokens/status_token.vue
+2
-2
ee/spec/frontend/requirements/components/requirement_status_badge_spec.js
.../requirements/components/requirement_status_badge_spec.js
+2
-2
ee/spec/frontend/requirements/components/requirements_root_spec.js
...rontend/requirements/components/requirements_root_spec.js
+2
-2
ee/spec/frontend/requirements/components/tokens/status_token_spec.js
...ntend/requirements/components/tokens/status_token_spec.js
+4
-4
No files found.
ee/app/assets/javascripts/requirements/components/requirement_status_badge.vue
View file @
e4d5c3cb
...
...
@@ -27,14 +27,14 @@ export default {
if
(
this
.
testReport
.
state
===
TestReportStatus
.
Passed
)
{
return
{
variant
:
'
success
'
,
icon
:
'
status
_
success
'
,
icon
:
'
status
-
success
'
,
text
:
__
(
'
satisfied
'
),
tooltipTitle
:
__
(
'
Passed on
'
),
};
}
else
if
(
this
.
testReport
.
state
===
TestReportStatus
.
Failed
)
{
return
{
variant
:
'
danger
'
,
icon
:
'
status
_
failed
'
,
icon
:
'
status
-
failed
'
,
text
:
__
(
'
failed
'
),
tooltipTitle
:
__
(
'
Failed on
'
),
};
...
...
ee/app/assets/javascripts/requirements/components/tokens/status_token.vue
View file @
e4d5c3cb
...
...
@@ -8,7 +8,7 @@ export default {
id
:
1
,
value
:
'
satisfied
'
,
text
:
__
(
'
Satisfied
'
),
icon
:
'
status
_
success
'
,
icon
:
'
status
-
success
'
,
iconClass
:
'
gl-text-green-700
'
,
containerClass
:
'
gl-bg-green-100 gl-text-gray-900
'
,
},
...
...
@@ -16,7 +16,7 @@ export default {
id
:
2
,
value
:
'
failed
'
,
text
:
__
(
'
Failed
'
),
icon
:
'
status
_
failed
'
,
icon
:
'
status
-
failed
'
,
iconClass
:
'
gl-text-red-700
'
,
containerClass
:
'
gl-bg-red-100 gl-text-gray-900
'
,
},
...
...
ee/spec/frontend/requirements/components/requirement_status_badge_spec.js
View file @
e4d5c3cb
...
...
@@ -21,14 +21,14 @@ const findGlTooltip = (wrapper) => wrapper.findComponent(GlTooltip);
const
successBadgeProps
=
{
variant
:
'
success
'
,
icon
:
'
status
_
success
'
,
icon
:
'
status
-
success
'
,
text
:
'
satisfied
'
,
tooltipTitle
:
'
Passed on
'
,
};
const
failedBadgeProps
=
{
variant
:
'
danger
'
,
icon
:
'
status
_
failed
'
,
icon
:
'
status
-
failed
'
,
text
:
'
failed
'
,
tooltipTitle
:
'
Failed on
'
,
};
...
...
ee/spec/frontend/requirements/components/requirements_root_spec.js
View file @
e4d5c3cb
...
...
@@ -1107,12 +1107,12 @@ describe('RequirementsRoot', () => {
it
(
'
renders a failed badge after the update
'
,
async
()
=>
{
await
nextTick
();
expect
(
findBadge
().
props
(
'
icon
'
)).
toBe
(
'
status
_
success
'
);
expect
(
findBadge
().
props
(
'
icon
'
)).
toBe
(
'
status
-
success
'
);
editRequirementToFailed
();
await
waitForPromises
();
expect
(
findBadge
().
props
(
'
icon
'
)).
toBe
(
'
status
_
failed
'
);
expect
(
findBadge
().
props
(
'
icon
'
)).
toBe
(
'
status
-
failed
'
);
});
});
...
...
ee/spec/frontend/requirements/components/tokens/status_token_spec.js
View file @
e4d5c3cb
...
...
@@ -9,11 +9,11 @@ import { mockStatusToken } from '../../mock_data';
const
mockStatuses
=
[
{
text
:
'
Satisfied
'
,
icon
:
'
status
_
success
'
,
icon
:
'
status
-
success
'
,
},
{
text
:
'
Failed
'
,
icon
:
'
status
_
failed
'
,
icon
:
'
status
-
failed
'
,
},
{
text
:
'
Missing
'
,
...
...
@@ -62,8 +62,8 @@ describe('StatusToken', () => {
it
.
each
`
value | text | icon
${
'
satisfied
'
}
|
${
'
Satisfied
'
}
|
${
'
status
_
success
'
}
${
'
failed
'
}
|
${
'
Failed
'
}
|
${
'
status
_
failed
'
}
${
'
satisfied
'
}
|
${
'
Satisfied
'
}
|
${
'
status
-
success
'
}
${
'
failed
'
}
|
${
'
Failed
'
}
|
${
'
status
-
failed
'
}
${
'
missing
'
}
|
${
'
Missing
'
}
|
${
'
status-waiting
'
}
`
(
'
renders token icon and text representing status "$text" when `value.data` is set to "$value"
'
,
...
...
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