From cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Mar 2020 12:09:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/services/projects/fork_service_spec.rb | 2 ++ spec/services/projects/update_repository_storage_service_spec.rb | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'spec/services/projects') diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index 731febe75b3..55987c6fa0f 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -312,6 +312,8 @@ describe Projects::ForkService do # Stub everything required to move a project to a Gitaly shard that does not exist stub_storage_settings('test_second_storage' => { 'path' => TestEnv::SECOND_STORAGE_PATH }) + allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_repository) + .and_return(true) allow_any_instance_of(Gitlab::Git::Repository).to receive(:replicate) allow_any_instance_of(Gitlab::Git::Repository).to receive(:checksum) .and_return(::Gitlab::Git::BLANK_SHA) diff --git a/spec/services/projects/update_repository_storage_service_spec.rb b/spec/services/projects/update_repository_storage_service_spec.rb index 106a639ba28..23ce6f9165d 100644 --- a/spec/services/projects/update_repository_storage_service_spec.rb +++ b/spec/services/projects/update_repository_storage_service_spec.rb @@ -32,6 +32,8 @@ describe Projects::UpdateRepositoryStorageService do project.repository.path_to_repo end + expect(project_repository_double).to receive(:create_repository) + .and_return(true) expect(project_repository_double).to receive(:replicate) .with(project.repository.raw) expect(project_repository_double).to receive(:checksum) @@ -58,6 +60,8 @@ describe Projects::UpdateRepositoryStorageService do context 'when the move fails' do it 'unmarks the repository as read-only without updating the repository storage' do + expect(project_repository_double).to receive(:create_repository) + .and_return(true) expect(project_repository_double).to receive(:replicate) .with(project.repository.raw) .and_raise(Gitlab::Git::CommandError) @@ -73,6 +77,8 @@ describe Projects::UpdateRepositoryStorageService do context 'when the checksum does not match' do it 'unmarks the repository as read-only without updating the repository storage' do + expect(project_repository_double).to receive(:create_repository) + .and_return(true) expect(project_repository_double).to receive(:replicate) .with(project.repository.raw) expect(project_repository_double).to receive(:checksum) @@ -91,6 +97,8 @@ describe Projects::UpdateRepositoryStorageService do let!(:pool) { create(:pool_repository, :ready, source_project: project) } it 'leaves the pool' do + expect(project_repository_double).to receive(:create_repository) + .and_return(true) expect(project_repository_double).to receive(:replicate) .with(project.repository.raw) expect(project_repository_double).to receive(:checksum) -- cgit v1.2.3