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
a62dc11a
Commit
a62dc11a
authored
Sep 12, 2019
by
Aleksandr Soborov
Committed by
Walmyr Lima e Silva Filho
Sep 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added E2E tests for SAST reports
Additionally updated fixture to provide SAST report
parent
96313e86
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
993 additions
and
1 deletion
+993
-1
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
+10
-0
qa/qa/ee/fixtures/secure_premade_reports/gl-sast-report.json
qa/qa/ee/fixtures/secure_premade_reports/gl-sast-report.json
+967
-0
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
...rowser_ui/secure/create_merge_request_with_secure_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb
...cs/features/ee/browser_ui/secure/security_reports_spec.rb
+15
-0
No files found.
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
View file @
a62dc11a
...
@@ -24,3 +24,13 @@ container_scanning:
...
@@ -24,3 +24,13 @@ container_scanning:
artifacts
:
artifacts
:
reports
:
reports
:
container_scanning
:
gl-container-scanning-report.json
container_scanning
:
gl-container-scanning-report.json
sast
:
tags
:
-
qa
-
test
script
:
-
echo "Skipped"
artifacts
:
reports
:
sast
:
gl-sast-report.json
qa/qa/ee/fixtures/secure_premade_reports/gl-sast-report.json
0 → 100644
View file @
a62dc11a
This diff is collapsed.
Click to expand it.
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
View file @
a62dc11a
...
@@ -5,7 +5,7 @@ require 'pathname'
...
@@ -5,7 +5,7 @@ require 'pathname'
module
QA
module
QA
context
'Secure'
,
:docker
do
context
'Secure'
,
:docker
do
describe
'Security Reports in a Merge Request'
do
describe
'Security Reports in a Merge Request'
do
let
(
:total_vuln_count
)
{
12
}
let
(
:total_vuln_count
)
{
45
}
after
do
after
do
Service
::
Runner
.
new
(
@executor
).
remove!
Service
::
Runner
.
new
(
@executor
).
remove!
...
...
qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb
View file @
a62dc11a
...
@@ -10,6 +10,8 @@ module QA
...
@@ -10,6 +10,8 @@ module QA
let
(
:dependency_scan_example_vuln
)
{
'jQuery before 3.4.0'
}
let
(
:dependency_scan_example_vuln
)
{
'jQuery before 3.4.0'
}
let
(
:container_scan_vuln_count
)
{
8
}
let
(
:container_scan_vuln_count
)
{
8
}
let
(
:container_scan_example_vuln
)
{
'CVE-2017-18269 in glibc'
}
let
(
:container_scan_example_vuln
)
{
'CVE-2017-18269 in glibc'
}
let
(
:sast_scan_vuln_count
)
{
33
}
let
(
:sast_scan_example_vuln
)
{
'Cipher with no integrity'
}
describe
'Security Reports'
do
describe
'Security Reports'
do
after
do
after
do
...
@@ -64,6 +66,11 @@ module QA
...
@@ -64,6 +66,11 @@ module QA
expect
(
pipeline
).
to
have_vulnerability_count_of
container_scan_vuln_count
expect
(
pipeline
).
to
have_vulnerability_count_of
container_scan_vuln_count
expect
(
pipeline
).
to
have_content
container_scan_example_vuln
expect
(
pipeline
).
to
have_content
container_scan_example_vuln
end
end
filter_report_and_perform
(
pipeline
,
"SAST"
)
do
expect
(
pipeline
).
to
have_vulnerability_count_of
sast_scan_vuln_count
expect
(
pipeline
).
to
have_content
sast_scan_example_vuln
end
end
end
end
end
...
@@ -79,6 +86,10 @@ module QA
...
@@ -79,6 +86,10 @@ module QA
filter_report_and_perform
(
dashboard
,
"Container Scanning"
)
do
filter_report_and_perform
(
dashboard
,
"Container Scanning"
)
do
expect
(
dashboard
).
to
have_low_vulnerability_count_of
2
expect
(
dashboard
).
to
have_low_vulnerability_count_of
2
end
end
filter_report_and_perform
(
dashboard
,
"SAST"
)
do
expect
(
dashboard
).
to
have_low_vulnerability_count_of
17
end
end
end
end
end
...
@@ -99,6 +110,10 @@ module QA
...
@@ -99,6 +110,10 @@ module QA
filter_report_and_perform
(
dashboard
,
"Container Scanning"
)
do
filter_report_and_perform
(
dashboard
,
"Container Scanning"
)
do
expect
(
dashboard
).
to
have_content
container_scan_example_vuln
expect
(
dashboard
).
to
have_content
container_scan_example_vuln
end
end
filter_report_and_perform
(
dashboard
,
"SAST"
)
do
expect
(
dashboard
).
to
have_content
sast_scan_example_vuln
end
end
end
end
end
...
...
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