diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
commit | 43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch) | |
tree | dceebdc68925362117480a5d672bcff122fb625b /spec/services/protected_branches | |
parent | 20c84b99005abd1c82101dfeff264ac50d2df211 (diff) |
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'spec/services/protected_branches')
4 files changed, 5 insertions, 4 deletions
diff --git a/spec/services/protected_branches/api_service_spec.rb b/spec/services/protected_branches/api_service_spec.rb index c98e253267b..f7f5f451a49 100644 --- a/spec/services/protected_branches/api_service_spec.rb +++ b/spec/services/protected_branches/api_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProtectedBranches::ApiService do +RSpec.describe ProtectedBranches::ApiService, feature_category: :compliance_management do shared_examples 'execute with entity' do it 'creates a protected branch with prefilled defaults' do expect(::ProtectedBranches::CreateService).to receive(:new).with( diff --git a/spec/services/protected_branches/cache_service_spec.rb b/spec/services/protected_branches/cache_service_spec.rb index ea434922661..0abf8a673f9 100644 --- a/spec/services/protected_branches/cache_service_spec.rb +++ b/spec/services/protected_branches/cache_service_spec.rb @@ -3,7 +3,7 @@ # require 'spec_helper' -RSpec.describe ProtectedBranches::CacheService, :clean_gitlab_redis_cache do +RSpec.describe ProtectedBranches::CacheService, :clean_gitlab_redis_cache, feature_category: :compliance_management do shared_examples 'execute with entity' do subject(:service) { described_class.new(entity, user) } @@ -145,6 +145,7 @@ RSpec.describe ProtectedBranches::CacheService, :clean_gitlab_redis_cache do context 'when feature flag disabled' do before do stub_feature_flags(group_protected_branches: false) + stub_feature_flags(allow_protected_branches_for_group: false) end it_behaves_like 'execute with entity' diff --git a/spec/services/protected_branches/destroy_service_spec.rb b/spec/services/protected_branches/destroy_service_spec.rb index 421d4aae5bb..e02b4475c02 100644 --- a/spec/services/protected_branches/destroy_service_spec.rb +++ b/spec/services/protected_branches/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProtectedBranches::DestroyService do +RSpec.describe ProtectedBranches::DestroyService, feature_category: :compliance_management do shared_examples 'execute with entity' do subject(:service) { described_class.new(entity, user) } diff --git a/spec/services/protected_branches/update_service_spec.rb b/spec/services/protected_branches/update_service_spec.rb index c70cc032a6a..8b11604aa15 100644 --- a/spec/services/protected_branches/update_service_spec.rb +++ b/spec/services/protected_branches/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProtectedBranches::UpdateService do +RSpec.describe ProtectedBranches::UpdateService, feature_category: :compliance_management do shared_examples 'execute with entity' do let(:params) { { name: new_name } } |