diff options
author | Gabriel Mazetto <brodock@gmail.com> | 2017-11-24 03:31:08 +0100 |
---|---|---|
committer | Gabriel Mazetto <brodock@gmail.com> | 2017-11-24 03:31:08 +0100 |
commit | dc62441ffd47d63f342c6accbd5049f6e8f99303 (patch) | |
tree | e77f70d50b62d2a0b694638c60f238043850c2d8 /spec/services/projects/hashed_storage_migration_service_spec.rb | |
parent | 05876a49c67fd94777801c09129e7dd77873e668 (diff) | |
download | gitlab-ce-dc62441ffd47d63f342c6accbd5049f6e8f99303.tar.gz |
Backport EE changes to make test possible when prepending modules
Diffstat (limited to 'spec/services/projects/hashed_storage_migration_service_spec.rb')
-rw-r--r-- | spec/services/projects/hashed_storage_migration_service_spec.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/spec/services/projects/hashed_storage_migration_service_spec.rb b/spec/services/projects/hashed_storage_migration_service_spec.rb index 28b6daf217e..466f0b5d7c2 100644 --- a/spec/services/projects/hashed_storage_migration_service_spec.rb +++ b/spec/services/projects/hashed_storage_migration_service_spec.rb @@ -6,32 +6,36 @@ describe Projects::HashedStorageMigrationService do describe '#execute' do context 'repository migration' do + let(:repository_service) { Projects::HashedStorage::MigrateRepositoryService.new(project, subject.logger) } + it 'delegates migration to Projects::HashedStorage::MigrateRepositoryService' do - expect(Projects::HashedStorage::MigrateRepositoryService).to receive(:new).with(project, subject.logger).and_call_original - expect_any_instance_of(Projects::HashedStorage::MigrateRepositoryService).to receive(:execute) + expect(Projects::HashedStorage::MigrateRepositoryService).to receive(:new).with(project, subject.logger).and_return(repository_service) + expect(repository_service).to receive(:execute) service.execute end it 'does not delegate migration if repository is already migrated' do project.storage_version = ::Project::LATEST_STORAGE_VERSION - expect_any_instance_of(Projects::HashedStorage::MigrateRepositoryService).not_to receive(:execute) + expect(Projects::HashedStorage::MigrateRepositoryService).not_to receive(:new) service.execute end end context 'attachments migration' do + let(:attachments_service) { Projects::HashedStorage::MigrateAttachmentsService.new(project, subject.logger) } + it 'delegates migration to Projects::HashedStorage::MigrateRepositoryService' do - expect(Projects::HashedStorage::MigrateAttachmentsService).to receive(:new).with(project, subject.logger).and_call_original - expect_any_instance_of(Projects::HashedStorage::MigrateAttachmentsService).to receive(:execute) + expect(Projects::HashedStorage::MigrateAttachmentsService).to receive(:new).with(project, subject.logger).and_return(attachments_service) + expect(attachments_service).to receive(:execute) service.execute end it 'does not delegate migration if attachments are already migrated' do project.storage_version = ::Project::LATEST_STORAGE_VERSION - expect_any_instance_of(Projects::HashedStorage::MigrateAttachmentsService).not_to receive(:execute) + expect(Projects::HashedStorage::MigrateAttachmentsService).not_to receive(:new) service.execute end |