diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-14 16:50:58 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 17:59:20 +0300 |
| commit | e4ef2406c6f12d2ea098e76297224324d1d3b354 (patch) | |
| tree | d1d3816508b5657c1a938ef4bc84dd061f164ad7 /spec/workers | |
| parent | e83260bda36808ba0313cd13c5ec2a9364a2b6c1 (diff) | |
Merge branch 'repo-cache-fix' into 'master'
Restore has_visible_content? to improve performance (cache)
See merge request gitlab-org/gitlab-ce!14264
Diffstat (limited to 'spec/workers')
| -rw-r--r-- | spec/workers/git_garbage_collect_worker_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb index 6f9ddb6c63c..f7b67b8efc6 100644 --- a/spec/workers/git_garbage_collect_worker_spec.rb +++ b/spec/workers/git_garbage_collect_worker_spec.rb @@ -31,8 +31,8 @@ describe GitGarbageCollectWorker do expect_any_instance_of(Repository).to receive(:after_create_branch).and_call_original expect_any_instance_of(Repository).to receive(:branch_names).and_call_original + expect_any_instance_of(Repository).to receive(:has_visible_content?).and_call_original expect_any_instance_of(Gitlab::Git::Repository).to receive(:branch_count).and_call_original - expect_any_instance_of(Gitlab::Git::Repository).to receive(:has_visible_content?).and_call_original subject.perform(project.id, :gc, lease_key, lease_uuid) end @@ -77,8 +77,8 @@ describe GitGarbageCollectWorker do expect_any_instance_of(Repository).to receive(:after_create_branch).and_call_original expect_any_instance_of(Repository).to receive(:branch_names).and_call_original + expect_any_instance_of(Repository).to receive(:has_visible_content?).and_call_original expect_any_instance_of(Gitlab::Git::Repository).to receive(:branch_count).and_call_original - expect_any_instance_of(Gitlab::Git::Repository).to receive(:has_visible_content?).and_call_original subject.perform(project.id) end |