Merge branch 'secure_report_spec_fix' into 'master'

Fix security_reports_spec test

Closes #213676

See merge request gitlab-org/gitlab!37820

ee/app/assets/javascripts/dependencies/components/dependencies_table.vue

@@ -90,6 +90,7 @@ export default {
     :fields="$options.fields"
     :items="localDependencies"
     :busy="isLoading"
+    data-qa-selector="dependencies_table_content"
     details-td-class="pt-0"
     stacked="md"
     thead-class="gl-text-gray-900"

qa/qa/ee/page/component/secure_report.rb

@@ -23,16 +23,20 @@ module QA
           end
 
           def filter_report_type(report)
-            click_element(:filter_report_type_dropdown)
+            click_element(:filter_scanner_dropdown)
             within_element(:filter_dropdown_content) do
               click_on report
             end
 
             # Click the dropdown to close the modal and ensure it isn't open if this function is called again
-            click_element(:filter_report_type_dropdown)
+            click_element(:filter_scanner_dropdown)
           end
 
           def has_vulnerability?(name)
+            has_element?(:vulnerability, text: name)
+          end
+
+          def has_vulnerability_info_content?(name)
             has_element?(:vulnerability_info_content, text: name)
           end
         end

qa/qa/ee/page/project/secure/dependency_list.rb

@@ -6,12 +6,15 @@ module QA
       module Project
         module Secure
           class DependencyList < QA::Page::Base
-            view 'ee/app/assets/javascripts/dependencies/components/app.vue' do
-              element :dependency_list_all_count, "dependency_list_${label.toLowerCase().replace(' ', '_')" # rubocop:disable QA/ElementWithPattern
+            view 'ee/app/assets/javascripts/dependencies/components/dependencies_table.vue' do
+              element :dependencies_table_content
             end
-
             def has_dependency_count_of?(expected)
-              find_element(:dependency_list_all_count).has_content?(expected)
+              within_element(:dependencies_table_content) do
+                # expected rows plus header row
+                header_row = 1
+                all('tr').count.equal?(expected + header_row)
+              end
             end
           end
         end

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

@@ -3,8 +3,8 @@
 require 'pathname'
 
 module QA
-  RSpec.describe 'Secure', :docker, :runner, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/213676', type: :investigating } do
-    let(:number_of_dependencies_in_fixture) { 7 }
+  RSpec.describe 'Secure', :docker, :runner do
+    let(:number_of_dependencies_in_fixture) { 9 }
     let(:dependency_scan_example_vuln) { 'Prototype pollution attack in mixin-deep' }
     let(:container_scan_example_vuln) { 'CVE-2017-18269 in glibc' }
     let(:sast_scan_example_vuln) { 'Cipher with no integrity' }
@@ -57,19 +57,19 @@ module QA
           pipeline.click_on_security
 
           filter_report_and_perform(pipeline, "Dependency Scanning") do
-            expect(pipeline).to have_vulnerability dependency_scan_example_vuln
+            expect(pipeline).to have_vulnerability_info_content dependency_scan_example_vuln
           end
 
           filter_report_and_perform(pipeline, "Container Scanning") do
-            expect(pipeline).to have_vulnerability container_scan_example_vuln
+            expect(pipeline).to have_vulnerability_info_content container_scan_example_vuln
           end
 
           filter_report_and_perform(pipeline, "SAST") do
-            expect(pipeline).to have_vulnerability sast_scan_example_vuln
+            expect(pipeline).to have_vulnerability_info_content sast_scan_example_vuln
           end
 
           filter_report_and_perform(pipeline, "DAST") do
-            expect(pipeline).to have_vulnerability dast_scan_example_vuln
+            expect(pipeline).to have_vulnerability_info_content dast_scan_example_vuln
           end
         end
       end