Automatic merge of gitlab-org/gitlab master

app/views/search/_filter.html.haml

@@ -17,10 +17,10 @@
     = dropdown_content
     = dropdown_loading
 
-.dropdown.project-filter.form-group.mb-lg-0.mx-lg-1
+.dropdown.form-group.mb-lg-0.mx-lg-1{ data: { testid: "project-filter" } }
   %label.d-block{ for: "dashboard_search_project" }
     = _("Project")
-  %button.dropdown-menu-toggle.gl-display-inline-flex.js-search-project-dropdown.gl-mt-0{ type: "button", id: "dashboard_search_project", data: { toggle: "dropdown", target: '.project-filter' } }
+  %button.dropdown-menu-toggle.gl-display-inline-flex.js-search-project-dropdown.gl-mt-0{ type: "button", id: "dashboard_search_project", data: { toggle: "dropdown" } }
     %span.dropdown-toggle-text.gl-flex-grow-1.str-truncated-100
       = @project&.full_name || _("Any")
     - if @project.present?

changelogs/unreleased/270412-license-error-in-template.yml

+---
+title: Show error in pipeline when API Fuzzing not licensed
+merge_request: 46064
+author:
+type: changed

ee/spec/lib/gitlab/ci/templates/api_fuzzing_gitlab_ci_yaml_spec.rb

@@ -47,8 +47,8 @@ RSpec.describe 'API-Fuzzing.gitlab-ci.yml' do
         create(:ci_variable, project: project, key: 'FUZZAPI_TARGET_URL', value: 'http://example.com')
       end
 
-      it 'includes no jobs' do
-        expect { pipeline }.to raise_error(Ci::CreatePipelineService::CreateError)
+      it 'includes job to display error' do
+        expect(build_names).to match_array(%w[apifuzzer_fuzz_unlicensed])
       end
     end
 

lib/gitlab/ci/templates/Security/API-Fuzzing.gitlab-ci.yml

@@ -26,6 +26,17 @@ variables:
     FUZZAPI_IMAGE: registry.gitlab.com/gitlab-org/security-products/analyzers/api-fuzzing:${FUZZAPI_VERSION}-engine
     #
 
+apifuzzer_fuzz_unlicensed:
+    stage: fuzz
+    allow_failure: true
+    rules:
+        - if: '$GITLAB_FEATURES !~ /\bapi_fuzzing\b/ && $API_FUZZING_DISABLED == null'
+        - when: never
+    script:
+        - |
+            echo "Error: Your GitLab project is not licensed for API Fuzzing."
+        - exit 1
+
 apifuzzer_fuzz:
     stage: fuzz
     image:

spec/features/search/user_searches_for_code_spec.rb

@@ -28,10 +28,7 @@ RSpec.describe 'User searches for code' do
       before do
         visit(search_path)
         find('.js-search-project-dropdown').click
-
-        page.within('.project-filter') do
-          click_link(project.full_name)
-        end
+        find('[data-testid="project-filter"]').click_link(project.full_name)
       end
 
       include_examples 'top right search form'

spec/features/search/user_searches_for_issues_spec.rb

@@ -86,10 +86,7 @@ RSpec.describe 'User searches for issues', :js do
     context 'when on a project page' do
       it 'finds an issue' do
         find('.js-search-project-dropdown').click
-
-        page.within('.project-filter') do
-          click_link(project.full_name)
-        end
+        find('[data-testid="project-filter"]').click_link(project.full_name)
 
         search_for_issue(issue1.title)
 

spec/features/search/user_searches_for_merge_requests_spec.rb

@@ -31,10 +31,7 @@ RSpec.describe 'User searches for merge requests', :js do
   context 'when on a project page' do
     it 'finds a merge request' do
       find('.js-search-project-dropdown').click
-
-      page.within('.project-filter') do
-        click_link(project.full_name)
-      end
+      find('[data-testid="project-filter"]').click_link(project.full_name)
 
       fill_in('dashboard_search', with: merge_request1.title)
       find('.btn-search').click

spec/features/search/user_searches_for_milestones_spec.rb

@@ -31,10 +31,7 @@ RSpec.describe 'User searches for milestones', :js do
   context 'when on a project page' do
     it 'finds a milestone' do
       find('.js-search-project-dropdown').click
-
-      page.within('.project-filter') do
-        click_link(project.full_name)
-      end
+      find('[data-testid="project-filter"]').click_link(project.full_name)
 
       fill_in('dashboard_search', with: milestone1.title)
       find('.btn-search').click

spec/features/search/user_searches_for_wiki_pages_spec.rb

@@ -19,10 +19,7 @@ RSpec.describe 'User searches for wiki pages', :js do
   shared_examples 'search wiki blobs' do
     it 'finds a page' do
       find('.js-search-project-dropdown').click
-
-      page.within('.project-filter') do
-        click_link(project.full_name)
-      end
+      find('[data-testid="project-filter"]').click_link(project.full_name)
 
       fill_in('dashboard_search', with: search_term)
       find('.btn-search').click

spec/features/search/user_uses_search_filters_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe 'User uses search filters', :js do
 
       expect(find('.js-search-group-dropdown')).to have_content(group.name)
 
-      page.within('.project-filter') do
+      page.within('[data-testid="project-filter"]') do
         find('.js-search-project-dropdown').click
 
         wait_for_requests
@@ -57,7 +57,7 @@ RSpec.describe 'User uses search filters', :js do
     it 'shows a project' do
       visit search_path
 
-      page.within('.project-filter') do
+      page.within('[data-testid="project-filter"]') do
         find('.js-search-project-dropdown').click
 
         wait_for_requests
@@ -77,7 +77,7 @@ RSpec.describe 'User uses search filters', :js do
 
       describe 'clear filter button' do
         it 'removes Project filters' do
-          link = find('.project-filter .js-search-clear')
+          link = find('[data-testid="project-filter"] .js-search-clear')
           params = CGI.parse(URI.parse(link[:href]).query)
 
           expect(params).not_to include(:project_id)