diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-08-16 19:53:57 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-08-16 19:53:57 +0000 |
commit | b0a230daedd99b5a7b41ddf544c66a6ed57adefc (patch) | |
tree | 3dbeb5f11039722f520694041e6e161d15b628f0 /spec/services | |
parent | b3145bc976836f4c28a2f97a57e40b9f315aa3a4 (diff) | |
parent | f14647fdae4a07c3c59665576b70f847ab866c58 (diff) | |
download | gitlab-ce-b0a230daedd99b5a7b41ddf544c66a6ed57adefc.tar.gz |
Merge branch 'sh-post-receive-cache-clear-once' into 'master'
Expire project caches once per push instead of once per ref
Closes #52046
See merge request gitlab-org/gitlab-ce!31876
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/git/branch_hooks_service_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb index 8af51848b7b..3929f51a0e2 100644 --- a/spec/services/git/branch_hooks_service_spec.rb +++ b/spec/services/git/branch_hooks_service_spec.rb @@ -158,9 +158,13 @@ describe Git::BranchHooksService do let(:blank_sha) { Gitlab::Git::BLANK_SHA } def clears_cache(extended: []) - expect(ProjectCacheWorker) - .to receive(:perform_async) - .with(project.id, extended, %i[commit_count repository_size]) + expect(service).to receive(:invalidated_file_types).and_return(extended) + + if extended.present? + expect(ProjectCacheWorker) + .to receive(:perform_async) + .with(project.id, extended, [], false) + end service.execute end |