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
53cd2173
Commit
53cd2173
authored
Nov 05, 2021
by
Zamir Martins
Committed by
Illya Klymov
Nov 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes by removing cluster_image_scanning as part
parent
a3be5595
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
ee/app/assets/javascripts/approvals/components/rule_form.vue
ee/app/assets/javascripts/approvals/components/rule_form.vue
+2
-1
ee/spec/frontend/approvals/components/rule_form_spec.js
ee/spec/frontend/approvals/components/rule_form_spec.js
+20
-0
No files found.
ee/app/assets/javascripts/approvals/components/rule_form.vue
View file @
53cd2173
...
...
@@ -75,7 +75,7 @@ export default {
severityLevels
:
[],
vulnerabilityStates
:
[],
approvalVulnerabilityStatesKeys
:
Object
.
keys
(
APPROVAL_VULNERABILITY_STATES
),
reportTypesKeys
:
Object
.
keys
(
REPORT_TYPES
),
reportTypesKeys
:
Object
.
keys
(
this
.
$options
.
REPORT_TYPES
),
severityLevelsKeys
:
Object
.
keys
(
SEVERITY_LEVELS
),
...
this
.
getInitialData
(),
};
...
...
@@ -513,6 +513,7 @@ export default {
key=
"all"
is-check-item
:is-checked=
"areAllScannersSelected"
data-testid=
"all-scanners-selected"
@
click.native.capture.stop=
"setAllSelectedScanners"
>
<gl-truncate
:text=
"$options.APPROVAL_DIALOG_I18N.form.selectAllLabel"
/>
...
...
ee/spec/frontend/approvals/components/rule_form_spec.js
View file @
53cd2173
...
...
@@ -643,6 +643,26 @@ describe('EE Approvals RuleForm', () => {
});
});
describe
(
'
and with all scanners selected
'
,
()
=>
{
const
findAllScannersSelected
=
()
=>
wrapper
.
findByTestId
(
'
all-scanners-selected
'
);
beforeEach
(()
=>
{
createComponent
({
initRule
:
TEST_RULE_VULNERABILITY_CHECK
,
});
findAllScannersSelected
().
trigger
(
'
click
'
);
findForm
().
trigger
(
'
submit
'
);
});
it
(
`dispatches the action on submit without including
${
EXCLUDED_REPORT_TYPE
}
`
,
()
=>
{
const
reportTypesKeys
=
Object
.
keys
(
REPORT_TYPES
);
const
expectedScanners
=
reportTypesKeys
.
filter
((
item
)
=>
item
!==
EXCLUDED_REPORT_TYPE
);
expect
(
actions
.
postRule
).
toHaveBeenCalledWith
(
expect
.
anything
(),
expect
.
objectContaining
({
scanners
:
expectedScanners
}),
);
});
});
describe
(
'
with invalid number of vulnerabilities
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
({
...
...
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