Merge branch 'dequarantine-sec-reports-spec' into 'master'

Dequarantine security_reports_spec adding QA selectors after previous removed

See merge request gitlab-org/gitlab!47286

ee/app/assets/javascripts/security_dashboard/components/filters/filter_item.vue

@@ -14,6 +14,11 @@ export default {
       default: '',
     },
   },
+  computed: {
+    qaSelector() {
+      return `filter_${this.text.toLowerCase().replace(' ', '_')}_dropdown`;
+    },
+  },
 };
 </script>
 
@@ -21,6 +26,7 @@ export default {
   <gl-dropdown-item
     is-check-item
     :is-checked="isChecked"
+    :data-qa-selector="qaSelector"
     @click.native.capture.stop="$emit('click')"
   >
     <slot>

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

@@ -24,9 +24,8 @@ module QA
 
           def filter_report_type(report)
             click_element(:filter_scanner_dropdown)
-            within_element(:filter_dropdown_content) do
-              click_on report
-            end
+
+            click_element "filter_#{report.downcase.tr(" ", "_")}_dropdown"
 
             # Click the dropdown to close the modal and ensure it isn't open if this function is called again
             click_element(:filter_scanner_dropdown)

qa/qa/ee/page/group/secure/show.rb

@@ -18,9 +18,7 @@ module QA
 
             def filter_project(project)
               click_element(:filter_project_dropdown)
-              within_element(:filter_dropdown_content) do
-                click_on project
-              end
+              click_element "filter_#{project.downcase.tr(" ", "_")}_dropdown"
             end
 
             def has_security_status_project_for_severity?(severity, project)

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

@@ -50,7 +50,7 @@ module QA
         @project.visit!
       end
 
-      it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/565', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/271547' } do
+      it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/565' do
         Flow::Pipeline.visit_latest_pipeline
 
         Page::Project::Pipeline::Show.perform do |pipeline|
@@ -74,9 +74,9 @@ module QA
         end
       end
 
-      it 'displays security reports in the project security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/566', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/271547' } do
+      it 'displays security reports in the project security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/566' do
         Page::Project::Menu.perform(&:click_project)
-        Page::Project::Menu.perform(&:click_on_security_dashboard)
+        Page::Project::Menu.perform(&:click_on_vulnerability_report)
 
         EE::Page::Project::Secure::Show.perform do |dashboard|
           filter_report_and_perform(dashboard, "Dependency Scanning") do
@@ -97,7 +97,7 @@ module QA
         end
       end
 
-      it 'displays security reports in the group security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/567', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/271547' } do
+      it 'displays security reports in the group security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/567' do
         Page::Main::Menu.perform(&:go_to_groups)
         Page::Dashboard::Groups.perform do |groups|
           groups.click_group @project.group.path