Merge branch '44725-expire_correct_methods_after_change_head' into 'master'

Expire correct method caches after HEAD changed

Closes #44725

See merge request gitlab-org/gitlab-ce!20102

1 files changed, 10 insertions, 2 deletions

diff --git a/spec/lib/gitlab/repository_cache_adapter_spec.rb b/spec/lib/gitlab/repository_cache_adapter_spec.rb
index 85971f2a7ef..5bd4d6c6a48 100644
--- a/spec/lib/gitlab/repository_cache_adapter_spec.rb
+++ b/spec/lib/gitlab/repository_cache_adapter_spec.rb
@@ -67,10 +67,18 @@ describe Gitlab::RepositoryCacheAdapter do
 
   describe '#expire_method_caches' do
     it 'expires the caches of the given methods' do
-      expect(cache).to receive(:expire).with(:readme)
+      expect(cache).to receive(:expire).with(:rendered_readme)
       expect(cache).to receive(:expire).with(:gitignore)
 
-      repository.expire_method_caches(%i(readme gitignore))
+      repository.expire_method_caches(%i(rendered_readme gitignore))
+    end
+
+    it 'does not expire caches for non-existent methods' do
+      expect(cache).not_to receive(:expire).with(:nonexistent)
+      expect(Rails.logger).to(
+        receive(:error).with("Requested to expire non-existent method 'nonexistent' for Repository"))
+
+      repository.expire_method_caches(%i(nonexistent))
     end
   end
 end