Merge branch 'zm-dast-generic-qa' into 'master'

Allow for generic DAST count matching

Closes #36559

See merge request gitlab-org/gitlab!21193

qa/qa/ee/page/merge_request/show.rb

@@ -248,8 +248,8 @@ module QA
             find_element(:container_scan_report).has_content?(/Container scanning detected #{expected}( new)? vulnerabilit/)
           end
 
-          def has_dast_vulnerability_count_of?(expected)
-            find_element(:dast_scan_report).has_content?(/DAST detected #{expected}( new)? vulnerabilit/)
+          def has_dast_vulnerability_count?
+            find_element(:dast_scan_report).has_content?(/DAST detected \d*( new)? vulnerabilit/)
           end
 
           def has_opened_dismissed_vulnerability?(reason = nil)

qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb

@@ -11,7 +11,6 @@ module QA
       let(:sast_vuln_count) { 33 }
       let(:dependency_scan_vuln_count) { 4 }
       let(:container_scan_vuln_count) { 8 }
-      let(:dast_vuln_count) { 4 }
       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" }
 
@@ -80,7 +79,7 @@ module QA
           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_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