Commit 25190274 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

Merge branch 'avoid-expect_any_instance_of' into 'master'

Avoid expect_any_instance_of in transfer service spec

See merge request !13191
......@@ -37,18 +37,18 @@
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 @@ def current_path
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 @@ def current_path
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment