Merge branch '3062-improve-project-cache' into 'master'

Change project cache key to depend on ID instead of full path

Closes #42191

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

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 2502fcac531..187283b284b 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -2301,4 +2301,22 @@ describe Repository do
       repository.merge_base('master', 'fix')
     end
   end
+
+  describe '#cache' do
+    subject(:cache) { repository.send(:cache) }
+
+    it 'returns a RepositoryCache' do
+      expect(subject).to be_kind_of Gitlab::RepositoryCache
+    end
+
+    it 'when is_wiki it includes wiki as part of key' do
+      allow(repository).to receive(:is_wiki) { true }
+
+      expect(subject.namespace).to include('wiki')
+    end
+
+    it 'when is_wiki is false extra_namespace is nil' do
+      expect(subject.namespace).not_to include('wiki')
+    end
+  end
 end