Fix failing ./spec/lib/backup/repository_spec.rb by clearing the memoized value

2 files changed, 8 insertions, 1 deletions

diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index f6bf7a162f6..5acf40ea5ce 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -463,13 +463,14 @@ describe Gitlab::Git::Repository, seed_helper: true do
 
         it 'returns false when there are no branches' do
           # Sanity check
-          expect(repository.uncached_has_local_branches?).to eq(true)
+          expect(repository.has_local_branches?).to eq(true)
 
           FileUtils.rm_rf(File.join(repository.path, 'packed-refs'))
           heads_dir = File.join(repository.path, 'refs/heads')
           FileUtils.rm_rf(heads_dir)
           FileUtils.mkdir_p(heads_dir)
 
+          repository.expire_has_local_branches_cache
           expect(repository.has_local_branches?).to eq(false)
         end
       end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 60ab52565cb..e45fe7db1e7 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1437,6 +1437,12 @@ describe Repository do
 
       repository.expire_emptiness_caches
     end
+
+    it 'expires the memoized repository cache' do
+      allow(repository.raw_repository).to receive(:expire_has_local_branches_cache).and_call_original
+
+      repository.expire_emptiness_caches
+    end
   end
 
   describe 'skip_merges option' do