diff options
Diffstat (limited to 'spec/services/snippets')
-rw-r--r-- | spec/services/snippets/destroy_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/snippets/update_repository_storage_service_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/services/snippets/destroy_service_spec.rb b/spec/services/snippets/destroy_service_spec.rb index ace9847185e..29898e3ab09 100644 --- a/spec/services/snippets/destroy_service_spec.rb +++ b/spec/services/snippets/destroy_service_spec.rb @@ -70,7 +70,6 @@ RSpec.describe Snippets::DestroyService, feature_category: :source_code_manageme it 'does not schedule anything and return success' do allow(snippet).to receive(:repository).and_return(nil) - expect(GitlabShellWorker).not_to receive(:perform_in) expect_next_instance_of(Repositories::DestroyService) do |instance| expect(instance).to receive(:execute).and_call_original end @@ -151,7 +150,6 @@ RSpec.describe Snippets::DestroyService, feature_category: :source_code_manageme expect(snippet.repository).not_to be_nil expect(snippet.repository.exists?).to be_falsey - expect(GitlabShellWorker).not_to receive(:perform_in) expect_next_instance_of(Repositories::DestroyService) do |instance| expect(instance).to receive(:execute).and_call_original end diff --git a/spec/services/snippets/update_repository_storage_service_spec.rb b/spec/services/snippets/update_repository_storage_service_spec.rb index c417fbfd8b1..66847a43335 100644 --- a/spec/services/snippets/update_repository_storage_service_spec.rb +++ b/spec/services/snippets/update_repository_storage_service_spec.rb @@ -67,6 +67,7 @@ RSpec.describe Snippets::UpdateRepositoryStorageService, feature_category: :sour expect(snippet_repository_double).to receive(:replicate) .with(snippet.repository.raw) .and_raise(Gitlab::Git::CommandError) + expect(snippet_repository_double).to receive(:remove) expect do subject.execute @@ -101,10 +102,11 @@ RSpec.describe Snippets::UpdateRepositoryStorageService, feature_category: :sour .with(snippet.repository.raw) expect(snippet_repository_double).to receive(:checksum) .and_return('not matching checksum') + expect(snippet_repository_double).to receive(:remove) expect do subject.execute - end.to raise_error(UpdateRepositoryStorageMethods::Error, /Failed to verify snippet repository checksum from \w+ to not matching checksum/) + end.to raise_error(Repositories::ReplicateService::Error, /Failed to verify snippet repository checksum from \w+ to not matching checksum/) expect(snippet).not_to be_repository_read_only expect(snippet.repository_storage).to eq('default') |