Commit 54f642eb authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'update-create-MR-sec-spec' into 'master'

Update create_merge_request_with_secure_spec failing test

See merge request gitlab-org/gitlab!47519
parents 60aaf864 f2fb58fd
...@@ -189,19 +189,19 @@ module QA ...@@ -189,19 +189,19 @@ module QA
end end
def has_sast_vulnerability_count_of?(expected) def has_sast_vulnerability_count_of?(expected)
find_element(:sast_scan_report).has_content?(/SAST detected #{expected}( new)? vulnerabilit/) find_element(:sast_scan_report).has_content?(/SAST detected #{expected}( new)?( potential)? vulnerabilit/)
end end
def has_dependency_vulnerability_count_of?(expected) def has_dependency_vulnerability_count_of?(expected)
find_element(:dependency_scan_report).has_content?(/Dependency scanning detected #{expected}( new)? vulnerabilit|Dependency scanning detected .* vulnerabilities out of #{expected}/) find_element(:dependency_scan_report).has_content?(/Dependency scanning detected #{expected}( new)?( potential)? vulnerabilit|Dependency scanning detected .* vulnerabilities out of #{expected}/)
end end
def has_container_vulnerability_count_of?(expected) def has_container_vulnerability_count_of?(expected)
find_element(:container_scan_report).has_content?(/Container scanning detected #{expected}( new)? vulnerabilit|Container scanning detected .* vulnerabilities out of #{expected}/) find_element(:container_scan_report).has_content?(/Container scanning detected #{expected}( new)?( potential)? vulnerabilit|Container scanning detected .* vulnerabilities out of #{expected}/)
end end
def has_dast_vulnerability_count? def has_dast_vulnerability_count?
find_element(:dast_scan_report).has_content?(/DAST detected \d*( new)? vulnerabilit/) find_element(:dast_scan_report).has_content?(/DAST detected \d*( new)?( potential)? vulnerabilit/)
end end
def has_opened_dismissed_vulnerability?(reason = nil) def has_opened_dismissed_vulnerability?(reason = nil)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment