Commit 20b3be6e authored by Douwe Maan's avatar Douwe Maan Committed by Rémy Coutable

Merge branch 'flush-cache-web-editor' into 'master'

Flush emptiness caches whenever needed



See merge request !2903
parent 3d83a063
...@@ -239,6 +239,10 @@ class Repository ...@@ -239,6 +239,10 @@ class Repository
end end
expire_branch_cache(branch_name) expire_branch_cache(branch_name)
# This ensures this particular cache is flushed after the first commit to a
# new repository.
expire_emptiness_caches if empty?
end end
# Expires _all_ caches, including those that would normally only be expired # Expires _all_ caches, including those that would normally only be expired
......
...@@ -361,6 +361,20 @@ describe Repository, models: true do ...@@ -361,6 +361,20 @@ describe Repository, models: true do
repository.expire_cache('master') repository.expire_cache('master')
end end
it 'expires the emptiness cache for an empty repository' do
expect(repository).to receive(:empty?).and_return(true)
expect(repository).to receive(:expire_emptiness_caches)
repository.expire_cache
end
it 'does not expire the emptiness cache for a non-empty repository' do
expect(repository).to receive(:empty?).and_return(false)
expect(repository).to_not receive(:expire_emptiness_caches)
repository.expire_cache
end
end end
describe '#expire_root_ref_cache' do describe '#expire_root_ref_cache' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment