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
a8cba0a8
Commit
a8cba0a8
authored
Jul 15, 2020
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vendor to conditionally render
- update tests
parent
9fd8789a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
...ity_dashboard/components/security_dashboard_table_row.vue
+2
-2
ee/spec/frontend/security_dashboard/components/security_dashboard_table_row_spec.js
...dashboard/components/security_dashboard_table_row_spec.js
+1
-0
No files found.
ee/app/assets/javascripts/security_dashboard/components/security_dashboard_table_row.vue
View file @
a8cba0a8
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
return
convertReportType
(
this
.
vulnerability
.
report_type
);
return
convertReportType
(
this
.
vulnerability
.
report_type
);
},
},
vulnerabilityVendor
()
{
vulnerabilityVendor
()
{
return
this
.
vulnerability
.
scanner
?.
vendor
||
''
;
return
this
.
vulnerability
.
scanner
?.
vendor
;
},
},
},
},
methods
:
{
methods
:
{
...
@@ -162,7 +162,7 @@ export default {
...
@@ -162,7 +162,7 @@ export default {
<div
class=
"text-capitalize"
>
<div
class=
"text-capitalize"
>
{{ useConvertReportType }}
{{ useConvertReportType }}
</div>
</div>
<div
class=
"gl-text-gray-500
"
>
<div
v-if=
"vulnerabilityVendor"
class=
"gl-text-gray-500"
data-testid=
"vulnerability-vendor
"
>
{{ vulnerabilityVendor }}
{{ vulnerabilityVendor }}
</div>
</div>
</div>
</div>
...
...
ee/spec/frontend/security_dashboard/components/security_dashboard_table_row_spec.js
View file @
a8cba0a8
...
@@ -55,6 +55,7 @@ describe('Security Dashboard Table Row', () => {
...
@@ -55,6 +55,7 @@ describe('Security Dashboard Table Row', () => {
it
(
'
should render a `` for the report type and scanner
'
,
()
=>
{
it
(
'
should render a `` for the report type and scanner
'
,
()
=>
{
expect
(
findContent
(
3
).
text
()).
toEqual
(
''
);
expect
(
findContent
(
3
).
text
()).
toEqual
(
''
);
expect
(
wrapper
.
find
(
'
vulnerability-vendor
'
).
exists
()).
toBeFalsy
();
});
});
it
(
'
should not render action buttons
'
,
()
=>
{
it
(
'
should not render action buttons
'
,
()
=>
{
...
...
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