Merge branch 'transfer-service-spec-cleanups' into 'master'
Transfer service spec cleanups Simplify the current tests for Projects::TransferService See merge request !208
This commit is contained in:
commit
1ad78be981
1 changed files with 9 additions and 11 deletions
|
@ -3,15 +3,12 @@ require 'spec_helper'
|
|||
describe Projects::TransferService do
|
||||
let(:user) { create(:user) }
|
||||
let(:group) { create(:group) }
|
||||
let(:group2) { create(:group) }
|
||||
let(:project) { create(:project, namespace: user.namespace) }
|
||||
|
||||
context 'namespace -> namespace' do
|
||||
before do
|
||||
group.add_owner(user)
|
||||
@service = Projects::TransferService.new(project, user, namespace_id: group.id)
|
||||
@service.gitlab_shell.stub(mv_repository: true)
|
||||
@result = @service.execute
|
||||
@result = transfer_project(project, user, namespace_id: group.id)
|
||||
end
|
||||
|
||||
it { @result.should be_true }
|
||||
|
@ -20,24 +17,25 @@ describe Projects::TransferService do
|
|||
|
||||
context 'namespace -> no namespace' do
|
||||
before do
|
||||
group.add_owner(user)
|
||||
@service = Projects::TransferService.new(project, user, namespace_id: nil)
|
||||
@service.gitlab_shell.stub(mv_repository: true)
|
||||
@result = @service.execute
|
||||
@result = transfer_project(project, user, namespace_id: nil)
|
||||
end
|
||||
|
||||
it { @result.should_not be_nil } # { result.should be_false } passes on nil
|
||||
it { @result.should be_false }
|
||||
it { project.namespace.should == user.namespace }
|
||||
end
|
||||
|
||||
context 'namespace -> not allowed namespace' do
|
||||
before do
|
||||
@service = Projects::TransferService.new(project, user, namespace_id: group2.id)
|
||||
@service.gitlab_shell.stub(mv_repository: true)
|
||||
@result = @service.execute
|
||||
@result = transfer_project(project, user, namespace_id: group.id)
|
||||
end
|
||||
|
||||
it { @result.should_not be_nil } # { result.should be_false } passes on nil
|
||||
it { @result.should be_false }
|
||||
it { project.namespace.should == user.namespace }
|
||||
end
|
||||
|
||||
def transfer_project(project, user, params)
|
||||
Projects::TransferService.new(project, user, params).execute
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue