diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-31 15:35:55 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-31 15:35:55 +0000 |
commit | 2519027442a5645cc9467e842172143e3f56c7c3 (patch) | |
tree | b713817801bd0b178ebd881325eae6b51398627e | |
parent | 0b0d04b4db53c63008de34a07c152f275d868b24 (diff) | |
parent | b720c22fb46009acda19b5cd170d3b64227c89b1 (diff) | |
download | gitlab-ce-2519027442a5645cc9467e842172143e3f56c7c3.tar.gz |
Merge branch 'avoid-expect_any_instance_of' into 'master'
Avoid expect_any_instance_of in transfer service spec
See merge request !13191
-rw-r--r-- | spec/services/projects/transfer_service_spec.rb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index ae32e85b2a7..36db1aab557 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -37,18 +37,18 @@ describe Projects::TransferService do end it 'executes system hooks' do - expect_any_instance_of(described_class).to receive(:execute_system_hooks) - - transfer_project(project, user, group) + transfer_project(project, user, group) do |service| + expect(service).to receive(:execute_system_hooks) + end end end context 'when transfer fails' do let!(:original_path) { project_path(project) } - def attempt_project_transfer + def attempt_project_transfer(&block) expect do - transfer_project(project, user, group) + transfer_project(project, user, group, &block) end.to raise_error(ActiveRecord::ActiveRecordError) end @@ -80,9 +80,9 @@ describe Projects::TransferService do end it "doesn't run system hooks" do - expect_any_instance_of(described_class).not_to receive(:execute_system_hooks) - - attempt_project_transfer + attempt_project_transfer do |service| + expect(service).not_to receive(:execute_system_hooks) + end end end @@ -120,7 +120,11 @@ describe Projects::TransferService do end def transfer_project(project, user, new_namespace) - Projects::TransferService.new(project, user).execute(new_namespace) + service = Projects::TransferService.new(project, user) + + yield(service) if block_given? + + service.execute(new_namespace) end context 'visibility level' do |