Add latest changes from gitlab-org/gitlab@master

8 files changed, 18 insertions, 21 deletions

diff --git a/spec/features/explore/catalog/catalog_spec.rb b/spec/features/explore/catalog/catalog_spec.rb
index d9ad27904e9..00bbb02ebbf 100644
--- a/spec/features/explore/catalog/catalog_spec.rb
+++ b/spec/features/explore/catalog/catalog_spec.rb
@@ -114,11 +114,11 @@ RSpec.describe 'CI/CD Catalog', :js, feature_category: :pipeline_composition do
     let_it_be(:project) { create(:project, :repository, namespace: namespace) }
 
     before do
-      visit explore_catalog_path(id: new_ci_resource["id"])
+      visit explore_catalog_path(new_ci_resource)
     end
 
     context 'when the resource is published' do
-      let_it_be(:new_ci_resource) { create(:ci_catalog_resource, :published, project: project) }
+      let(:new_ci_resource) { create(:ci_catalog_resource, :published, project: project) }
 
       it 'navigates to the details page' do
         expect(page).to have_content('Go to the project')
@@ -126,7 +126,7 @@ RSpec.describe 'CI/CD Catalog', :js, feature_category: :pipeline_composition do
     end
 
     context 'when the resource is not published' do
-      let_it_be(:new_ci_resource) { create(:ci_catalog_resource, project: project, state: :draft) }
+      let(:new_ci_resource) { create(:ci_catalog_resource, project: project, state: :draft) }
 
       it 'returns a 404' do
         expect(page).to have_title('Not Found')
diff --git a/spec/features/groups/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb
index d03fd532327..51d2e85f779 100644
--- a/spec/features/groups/board_sidebar_spec.rb
+++ b/spec/features/groups/board_sidebar_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Group Issue Boards', :js, feature_category: :groups_and_projects do
+RSpec.describe 'Group Issue Boards', :js, feature_category: :team_planning do
   include BoardHelpers
 
   let(:group)            { create(:group) }
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index 1374aa96578..3f03f62604d 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Group milestones', feature_category: :groups_and_projects do
+RSpec.describe 'Group milestones', feature_category: :team_planning do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project_empty_repo, group: group) }
   let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user }
diff --git a/spec/features/projects/branches/download_buttons_spec.rb b/spec/features/projects/branches/download_buttons_spec.rb
index a888b5b977d..10d1d61a341 100644
--- a/spec/features/projects/branches/download_buttons_spec.rb
+++ b/spec/features/projects/branches/download_buttons_spec.rb
@@ -50,6 +50,11 @@ RSpec.describe 'Download buttons in branches page', feature_category: :groups_an
 
         expect(page).to have_link build.name, href: href
       end
+
+      it 'passes axe automated accessibility testing', :js do
+        find_by_testid('download-source-code-button').click
+        expect(page).to be_axe_clean.within('.project-action-button')
+      end
     end
   end
 end
diff --git a/spec/features/projects/files/template_selector_menu_spec.rb b/spec/features/projects/files/template_selector_menu_spec.rb
index 920da6e72ce..e8aa59a262c 100644
--- a/spec/features/projects/files/template_selector_menu_spec.rb
+++ b/spec/features/projects/files/template_selector_menu_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Template selector menu', :js, feature_category: :groups_and_projects do
+RSpec.describe 'Template selector menu', :js, feature_category: :team_planning do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/gfm_autocomplete_load_spec.rb b/spec/features/projects/gfm_autocomplete_load_spec.rb
index 35ab0094d51..9e23c05a739 100644
--- a/spec/features/projects/gfm_autocomplete_load_spec.rb
+++ b/spec/features/projects/gfm_autocomplete_load_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'GFM autocomplete loading', :js, feature_category: :groups_and_projects do
+RSpec.describe 'GFM autocomplete loading', :js, feature_category: :team_planning do
   let(:project) { create(:project) }
 
   before do
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index bc67cdbfad1..59fea7d7265 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'issuable templates', :js, feature_category: :groups_and_projects do
+RSpec.describe 'issuable templates', :js, feature_category: :team_planning do
   include ProjectForksHelper
 
   let(:user) { create(:user) }
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index 1c25fce5270..a0df18ea6f3 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -79,21 +79,13 @@ RSpec.describe 'New project', :js, feature_category: :groups_and_projects do
       expect(page).to have_content 'Other visibility settings have been disabled by the administrator.'
     end
 
-    context 'with prevent_visibility_restriction feature flag off' do
-      before do
-        stub_feature_flags(prevent_visibility_restriction: false)
-      end
+    it 'shows a message if all levels are restricted' do
+      stub_application_setting(restricted_visibility_levels: Gitlab::VisibilityLevel.values)
 
-      it 'shows a message if all levels are restricted' do
-        Gitlab::CurrentSettings.update!(
-          restricted_visibility_levels: Gitlab::VisibilityLevel.values
-        )
-
-        visit new_project_path
-        click_link 'Create blank project'
+      visit new_project_path
+      click_link 'Create blank project'
 
-        expect(page).to have_content 'Visibility settings have been disabled by the administrator.'
-      end
+      expect(page).to have_content 'Visibility settings have been disabled by the administrator.'
     end
   end