diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-15 09:04:21 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-15 09:04:21 +0300 |
| commit | 740d158019480f41d0b1e528d0d42c9441d2c2ac (patch) | |
| tree | 593440a5df388437380869ea2038d13d33f4c8a3 /spec/workers/git_garbage_collect_worker_spec.rb | |
| parent | 7533bda8a804e6c2d6054eef7a5c3c37c606ea21 (diff) | |
| parent | d8bf06926eb67a02bea039261589df5fd2c2fbb6 (diff) | |
Merge branch '10-0-stable-prepare-rc3' into '10-0-stable'
Prepare 10.0 RC3 release
See merge request gitlab-org/gitlab-ce!14266
Diffstat (limited to 'spec/workers/git_garbage_collect_worker_spec.rb')
| -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 |