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
0e5659f1
Commit
0e5659f1
authored
Dec 17, 2019
by
Zeff Morgan
Committed by
Mark Lapierre
Dec 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow for generic DAST count matching
parent
5d114e16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
qa/qa/ee/page/merge_request/show.rb
qa/qa/ee/page/merge_request/show.rb
+2
-2
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
-2
No files found.
qa/qa/ee/page/merge_request/show.rb
View file @
0e5659f1
...
@@ -248,8 +248,8 @@ module QA
...
@@ -248,8 +248,8 @@ module QA
find_element
(
:container_scan_report
).
has_content?
(
/Container scanning detected
#{
expected
}
( new)? vulnerabilit/
)
find_element
(
:container_scan_report
).
has_content?
(
/Container scanning detected
#{
expected
}
( new)? vulnerabilit/
)
end
end
def
has_dast_vulnerability_count
_of?
(
expected
)
def
has_dast_vulnerability_count
?
find_element
(
:dast_scan_report
).
has_content?
(
/DAST detected
#{
expected
}
( new)? vulnerabilit/
)
find_element
(
:dast_scan_report
).
has_content?
(
/DAST detected
\d*
( new)? vulnerabilit/
)
end
end
def
has_opened_dismissed_vulnerability?
(
reason
=
nil
)
def
has_opened_dismissed_vulnerability?
(
reason
=
nil
)
...
...
qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb
View file @
0e5659f1
...
@@ -11,7 +11,6 @@ module QA
...
@@ -11,7 +11,6 @@ module QA
let
(
:sast_vuln_count
)
{
33
}
let
(
:sast_vuln_count
)
{
33
}
let
(
:dependency_scan_vuln_count
)
{
4
}
let
(
:dependency_scan_vuln_count
)
{
4
}
let
(
:container_scan_vuln_count
)
{
8
}
let
(
:container_scan_vuln_count
)
{
8
}
let
(
:dast_vuln_count
)
{
4
}
let
(
:vuln_name
)
{
"Regular Expression Denial of Service in debug"
}
let
(
:vuln_name
)
{
"Regular Expression Denial of Service in debug"
}
let
(
:remediable_vuln_name
)
{
"Authentication bypass via incorrect DOM traversal and canonicalization in saml2-js"
}
let
(
:remediable_vuln_name
)
{
"Authentication bypass via incorrect DOM traversal and canonicalization in saml2-js"
}
...
@@ -80,7 +79,7 @@ module QA
...
@@ -80,7 +79,7 @@ module QA
expect
(
merge_request
).
to
have_sast_vulnerability_count_of
(
sast_vuln_count
)
expect
(
merge_request
).
to
have_sast_vulnerability_count_of
(
sast_vuln_count
)
expect
(
merge_request
).
to
have_dependency_vulnerability_count_of
(
dependency_scan_vuln_count
)
expect
(
merge_request
).
to
have_dependency_vulnerability_count_of
(
dependency_scan_vuln_count
)
expect
(
merge_request
).
to
have_container_vulnerability_count_of
(
container_scan_vuln_count
)
expect
(
merge_request
).
to
have_container_vulnerability_count_of
(
container_scan_vuln_count
)
expect
(
merge_request
).
to
have_dast_vulnerability_count
_of
(
dast_vuln_count
)
expect
(
merge_request
).
to
have_dast_vulnerability_count
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