diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /spec/requests/admin | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'spec/requests/admin')
9 files changed, 11 insertions, 9 deletions
diff --git a/spec/requests/admin/applications_controller_spec.rb b/spec/requests/admin/applications_controller_spec.rb index 03553757080..c83137ebbce 100644 --- a/spec/requests/admin/applications_controller_spec.rb +++ b/spec/requests/admin/applications_controller_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe Admin::ApplicationsController, :enable_admin_mode do +RSpec.describe Admin::ApplicationsController, :enable_admin_mode, +feature_category: :authentication_and_authorization do let_it_be(:admin) { create(:admin) } let_it_be(:application) { create(:oauth_application, owner_id: nil, owner_type: nil) } let_it_be(:show_path) { admin_application_path(application) } diff --git a/spec/requests/admin/background_migrations_controller_spec.rb b/spec/requests/admin/background_migrations_controller_spec.rb index fe2a2470511..db3e2fa0df6 100644 --- a/spec/requests/admin/background_migrations_controller_spec.rb +++ b/spec/requests/admin/background_migrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::BackgroundMigrationsController, :enable_admin_mode do +RSpec.describe Admin::BackgroundMigrationsController, :enable_admin_mode, feature_category: :database do let(:admin) { create(:admin) } before do diff --git a/spec/requests/admin/batched_jobs_controller_spec.rb b/spec/requests/admin/batched_jobs_controller_spec.rb index fb51b3bce88..8060b19b8b3 100644 --- a/spec/requests/admin/batched_jobs_controller_spec.rb +++ b/spec/requests/admin/batched_jobs_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::BatchedJobsController, :enable_admin_mode do +RSpec.describe Admin::BatchedJobsController, :enable_admin_mode, feature_category: :database do let(:admin) { create(:admin) } before do diff --git a/spec/requests/admin/broadcast_messages_controller_spec.rb b/spec/requests/admin/broadcast_messages_controller_spec.rb index eb29092845c..69b84d6d795 100644 --- a/spec/requests/admin/broadcast_messages_controller_spec.rb +++ b/spec/requests/admin/broadcast_messages_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::BroadcastMessagesController, :enable_admin_mode do +RSpec.describe Admin::BroadcastMessagesController, :enable_admin_mode, feature_category: :onboarding do let(:broadcast_message) { build(:broadcast_message) } let(:broadcast_message_params) { broadcast_message.as_json(root: true, only: [:message, :starts_at, :ends_at]) } diff --git a/spec/requests/admin/clusters/integrations_controller_spec.rb b/spec/requests/admin/clusters/integrations_controller_spec.rb index ee1c1d5aad4..d5e3f03627a 100644 --- a/spec/requests/admin/clusters/integrations_controller_spec.rb +++ b/spec/requests/admin/clusters/integrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::Clusters::IntegrationsController, :enable_admin_mode do +RSpec.describe Admin::Clusters::IntegrationsController, :enable_admin_mode, feature_category: :integrations do include AccessMatchersForController shared_examples 'a secure endpoint' do diff --git a/spec/requests/admin/hook_logs_controller_spec.rb b/spec/requests/admin/hook_logs_controller_spec.rb index f8d3381c052..fa9f317dbba 100644 --- a/spec/requests/admin/hook_logs_controller_spec.rb +++ b/spec/requests/admin/hook_logs_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::HookLogsController, :enable_admin_mode do +RSpec.describe Admin::HookLogsController, :enable_admin_mode, feature_category: :integrations do let_it_be(:user) { create(:admin) } let_it_be_with_refind(:web_hook) { create(:system_hook) } let_it_be_with_refind(:web_hook_log) { create(:web_hook_log, web_hook: web_hook) } diff --git a/spec/requests/admin/impersonation_tokens_controller_spec.rb b/spec/requests/admin/impersonation_tokens_controller_spec.rb index ee0e12ad0c0..15212db0e77 100644 --- a/spec/requests/admin/impersonation_tokens_controller_spec.rb +++ b/spec/requests/admin/impersonation_tokens_controller_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' -RSpec.describe Admin::ImpersonationTokensController, :enable_admin_mode do +RSpec.describe Admin::ImpersonationTokensController, :enable_admin_mode, +feature_category: :authentication_and_authorization do let(:admin) { create(:admin) } let!(:user) { create(:user) } diff --git a/spec/requests/admin/integrations_controller_spec.rb b/spec/requests/admin/integrations_controller_spec.rb index 128aada0975..efd0e3d91ee 100644 --- a/spec/requests/admin/integrations_controller_spec.rb +++ b/spec/requests/admin/integrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::IntegrationsController, :enable_admin_mode do +RSpec.describe Admin::IntegrationsController, :enable_admin_mode, feature_category: :integrations do let_it_be(:admin) { create(:admin) } before do diff --git a/spec/requests/admin/version_check_controller_spec.rb b/spec/requests/admin/version_check_controller_spec.rb index 7e2f33d5bc5..47221bf37e5 100644 --- a/spec/requests/admin/version_check_controller_spec.rb +++ b/spec/requests/admin/version_check_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::VersionCheckController, :enable_admin_mode do +RSpec.describe Admin::VersionCheckController, :enable_admin_mode, feature_category: :not_owned do let(:admin) { create(:admin) } before do |