Fix E2E govern specs for filtered search feature flag

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

@@ -47,16 +47,26 @@ def status_listbox_item_selector(report)
           end
 
           def filter_by_status(statuses)
-            wait_until(max_duration: 30, message: "Waiting for status dropdown element to appear") do
-              has_element?('filter-status-dropdown')
-            end
-
             if has_element?('group-by-new-feature')
               within_element('group-by-new-feature') do
                 click_element('close-button')
               end
             end
 
+            if has_element?('filtered-search-token', wait: 10)
+              filter_by_status_new(statuses)
+            else
+              filter_by_status_old(statuses)
+            end
+
+            state = statuses_list(statuses).map { |item| "state=#{item}" }.join("&")
+            raise 'Status unchanged in the URL' unless page.current_url.downcase.include?(state)
+          end
+
+          def filter_by_status_old(statuses)
+            wait_until(max_duration: 30, message: "Waiting for status dropdown element to appear") do
+              has_element?('filter-status-dropdown')
+            end
             # Retry on exception to avoid ElementNotFound errors when clicks are sent too fast for the UI to update
             retry_on_exception(sleep_interval: 2, message: "Retrying status click until current url matches state") do
               find(status_dropdown_button_selector, wait: 5).click
@@ -66,11 +76,23 @@ def filter_by_status(statuses)
                 wait_for_requests # It takes a moment to update the page after changing selections
               end
               find(status_dropdown_button_selector, wait: 5).click
-              state = statuses_list(statuses).map { |item| "state=#{item}" }.join("&")
-              page.current_url.downcase.include?(state)
             end
           end
 
+          def filter_by_status_new(statuses)
+            click_element('clear-icon')
+            click_element('filtered-search-token-segment')
+            click_link('Status')
+            click_link('All statuses')
+            statuses_list_advanced_filter(statuses).each do |status|
+              click_link(status) unless status == 'Dismissed'
+              click_link('All dismissal reasons') if status == 'Dismissed'
+              wait_for_requests
+            end
+            click_element('search-button')
+            click_element('search-button') # second click removes the dynamic dropdown
+          end
+
           def statuses_list(statuses)
             statuses.map do |status|
               case status
@@ -84,6 +106,19 @@ def statuses_list(statuses)
             end
           end
 
+          def statuses_list_advanced_filter(statuses)
+            statuses.map do |status|
+              case status
+              when /all/i
+                'All statuses'
+              when /needs triage/i
+                'Needs triage'
+              else
+                status.capitalize
+              end
+            end
+          end
+
           def status_dropdown_button_selector
             "[data-testid='filter-status-dropdown'] > button"
           end

qa/qa/specs/features/ee/browser_ui/10_govern/change_vulnerability_status_spec.rb

@@ -27,7 +27,6 @@ module QA
 
       let(:vuln_name) { "Greyhound vulnerability" }
       let(:dismissed_state) { "dismissed" }
-      let(:dismissal_reason) { "false_positive" }
       let(:confirmed_state) { "confirmed" }
       let(:resolved_state) { "resolved" }
       let(:vuln_status_hash) { { resolved: 'resolve', confirmed: 'confirm' } }
@@ -68,7 +67,7 @@ module QA
         verify_changed_status(confirmed_state)
       end
 
-      it 'can bulk dismiss vulnerabilities as false positive in vulnerability report', :blocking,
+      it 'can bulk dismiss vulnerabilities as not applicable in vulnerability report', :blocking,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/415647' do
         Page::Project::Menu.perform(&:go_to_vulnerability_report)
         bulk_change_status(dismissed_state)