diff options
Diffstat (limited to 'spec/lib')
11 files changed, 16 insertions, 15 deletions
diff --git a/spec/lib/api/entities/plan_limit_spec.rb b/spec/lib/api/entities/plan_limit_spec.rb index dd687143aa9..a2d183fd631 100644 --- a/spec/lib/api/entities/plan_limit_spec.rb +++ b/spec/lib/api/entities/plan_limit_spec.rb @@ -17,15 +17,16 @@ RSpec.describe API::Entities::PlanLimit do :ci_registered_group_runners, :ci_registered_project_runners, :conan_max_file_size, + :enforcement_limit, :generic_packages_max_file_size, :helm_max_file_size, :maven_max_file_size, + :notification_limit, :npm_max_file_size, :nuget_max_file_size, :pypi_max_file_size, :terraform_module_max_file_size, :storage_size_limit, - :notification_limit, :pipeline_hierarchy_size ) end diff --git a/spec/lib/api/helpers/members_helpers_spec.rb b/spec/lib/api/helpers/members_helpers_spec.rb index ee1ae6b1781..3afa36656e9 100644 --- a/spec/lib/api/helpers/members_helpers_spec.rb +++ b/spec/lib/api/helpers/members_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Helpers::MembersHelpers, feature_category: :subgroups do +RSpec.describe API::Helpers::MembersHelpers, feature_category: :groups_and_projects do let(:helper) do Class.new.include(described_class).new end diff --git a/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb b/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb index b92f1a74551..2f53a5da272 100644 --- a/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb +++ b/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' RSpec.describe Gitlab::BackgroundMigration::DisableLegacyOpenSourceLicenseForProjectsLessThanFiveMb, :migration, schema: 20221018095434, - feature_category: :projects do + feature_category: :groups_and_projects do let(:namespaces_table) { table(:namespaces) } let(:projects_table) { table(:projects) } let(:project_settings_table) { table(:project_settings) } diff --git a/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb b/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb index f671a673a08..facc3c435da 100644 --- a/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb +++ b/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' -RSpec.describe Gitlab::BackgroundMigration::NullifyCreatorIdColumnOfOrphanedProjects, feature_category: :projects, - schema: 20230130073109 do +RSpec.describe Gitlab::BackgroundMigration::NullifyCreatorIdColumnOfOrphanedProjects, + feature_category: :groups_and_projects, schema: 20230130073109 do let(:users) { table(:users) } let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } diff --git a/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb b/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb index c45c402ab9d..126e928fa77 100644 --- a/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb +++ b/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::BackgroundMigration::RemoveProjectGroupLinkWithMissingGroups, :migration, - feature_category: :subgroups, schema: 20230206172702 do + feature_category: :groups_and_projects, schema: 20230206172702 do let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } let(:project_group_links) { table(:project_group_links) } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb index 2cb84e2f02a..370d03b495c 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete, feature_category: :subgroups do +RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete, feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb index 5b5661020b0..b00a1d4a9e1 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :delete, -feature_category: :subgroups do +feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } let(:namespace) { create(:group, name: 'the-path') } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb index 787c9e87038..d2665664fb0 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :delete, -feature_category: :projects do +feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } let(:project) do diff --git a/spec/lib/gitlab/metrics/rails_slis_spec.rb b/spec/lib/gitlab/metrics/rails_slis_spec.rb index 32d3b7581f1..ef996f61082 100644 --- a/spec/lib/gitlab/metrics/rails_slis_spec.rb +++ b/spec/lib/gitlab/metrics/rails_slis_spec.rb @@ -11,7 +11,7 @@ RSpec.describe Gitlab::Metrics::RailsSlis, feature_category: :error_budgets do [ { endpoint_id: "ProjectsController#index", - feature_category: :projects, + feature_category: :groups_and_projects, request_urgency: :default } ] diff --git a/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb b/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb index 25b4544d9d6..16c0fceae3b 100644 --- a/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb @@ -33,8 +33,8 @@ RSpec.describe Gitlab::SidekiqMiddleware::DeferJobs, feature_category: :scalabil describe '#call' do context 'when sidekiq_defer_jobs feature flag is enabled for a worker' do before do - stub_feature_flags("defer_sidekiq_jobs:#{TestDeferredWorker.name}": true) - stub_feature_flags("defer_sidekiq_jobs:#{UndeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{TestDeferredWorker.name}": true) + stub_feature_flags("defer_sidekiq_jobs_#{UndeferredWorker.name}": false) end context 'for the affected worker' do @@ -59,8 +59,8 @@ RSpec.describe Gitlab::SidekiqMiddleware::DeferJobs, feature_category: :scalabil context 'when sidekiq_defer_jobs feature flag is disabled' do before do - stub_feature_flags("defer_sidekiq_jobs:#{TestDeferredWorker.name}": false) - stub_feature_flags("defer_sidekiq_jobs:#{UndeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{TestDeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{UndeferredWorker.name}": false) end it 'runs the job normally' do diff --git a/spec/lib/gitlab/sidekiq_middleware_spec.rb b/spec/lib/gitlab/sidekiq_middleware_spec.rb index dabd734aa51..7e53b6598b6 100644 --- a/spec/lib/gitlab/sidekiq_middleware_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware_spec.rb @@ -31,7 +31,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do shared_examples "a middleware chain" do before do configurator.call(chain) - stub_feature_flags("defer_sidekiq_jobs:#{worker_class.name}": false) # not letting this worker deferring its jobs + stub_feature_flags("defer_sidekiq_jobs_#{worker_class.name}": false) # not letting this worker deferring its jobs end it "passes through the right middlewares", :aggregate_failures do enabled_sidekiq_middlewares.each do |middleware| |