Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 780cf7b104a..530b03714b4 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -2277,10 +2277,34 @@ RSpec.describe Repository do
         .with(%i(branch_names merged_branch_names branch_count has_visible_content? has_ambiguous_refs?))
         .and_call_original
 
+      expect_next_instance_of(ProtectedBranches::CacheService) do |cache_service|
+        expect(cache_service).to receive(:refresh)
+      end
+
       repository.expire_branches_cache
     end
   end
 
+  describe '#expire_protected_branches_cache' do
+    it 'expires the cache' do
+      expect_next_instance_of(ProtectedBranches::CacheService) do |cache_service|
+        expect(cache_service).to receive(:refresh)
+      end
+
+      repository.expire_protected_branches_cache
+    end
+
+    context 'when repository does not have a project' do
+      let!(:snippet) { create(:personal_snippet, :repository) }
+
+      it 'does not expire the cache' do
+        expect(ProtectedBranches::CacheService).not_to receive(:new)
+
+        snippet.repository.expire_protected_branches_cache
+      end
+    end
+  end
+
   describe '#expire_tags_cache' do
     it 'expires the cache' do
       expect(repository).to receive(:expire_method_caches)