Use struct instead of hash
This commit is contained in:
parent
c9c715cd55
commit
e9862a9900
5 changed files with 20 additions and 19 deletions
|
@ -1,13 +1,14 @@
|
||||||
module Ci
|
module Ci
|
||||||
module CreateTriggerRequestService
|
module CreateTriggerRequestService
|
||||||
|
Result = Struct.new(:trigger_request, :pipeline)
|
||||||
|
|
||||||
def self.execute(project, trigger, ref, variables = nil)
|
def self.execute(project, trigger, ref, variables = nil)
|
||||||
trigger_request = trigger.trigger_requests.create(variables: variables)
|
trigger_request = trigger.trigger_requests.create(variables: variables)
|
||||||
|
|
||||||
pipeline = Ci::CreatePipelineService.new(project, trigger.owner, ref: ref)
|
pipeline = Ci::CreatePipelineService.new(project, trigger.owner, ref: ref)
|
||||||
.execute(:trigger, ignore_skip_ci: true, trigger_request: trigger_request)
|
.execute(:trigger, ignore_skip_ci: true, trigger_request: trigger_request)
|
||||||
|
|
||||||
{ trigger_request: trigger_request,
|
Result.new(trigger_request, pipeline)
|
||||||
pipeline: pipeline }
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -28,7 +28,7 @@ module API
|
||||||
|
|
||||||
# create request and trigger builds
|
# create request and trigger builds
|
||||||
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref].to_s, variables)
|
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref].to_s, variables)
|
||||||
pipeline = result[:pipeline]
|
pipeline = result.pipeline
|
||||||
|
|
||||||
if pipeline.persisted?
|
if pipeline.persisted?
|
||||||
present pipeline, with: Entities::Pipeline
|
present pipeline, with: Entities::Pipeline
|
||||||
|
|
|
@ -29,10 +29,10 @@ module API
|
||||||
|
|
||||||
# create request and trigger builds
|
# create request and trigger builds
|
||||||
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref].to_s, variables)
|
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref].to_s, variables)
|
||||||
pipeline = result[:pipeline]
|
pipeline = result.pipeline
|
||||||
|
|
||||||
if pipeline.persisted?
|
if pipeline.persisted?
|
||||||
present result[:trigger_request], with: ::API::V3::Entities::TriggerRequest
|
present result.trigger_request, with: ::API::V3::Entities::TriggerRequest
|
||||||
else
|
else
|
||||||
render_validation_error!(pipeline)
|
render_validation_error!(pipeline)
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,10 +25,10 @@ module Ci
|
||||||
|
|
||||||
# create request and trigger builds
|
# create request and trigger builds
|
||||||
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref], variables)
|
result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref], variables)
|
||||||
pipeline = result[:pipeline]
|
pipeline = result.pipeline
|
||||||
|
|
||||||
if pipeline.persisted?
|
if pipeline.persisted?
|
||||||
present result[:trigger_request], with: Entities::TriggerRequest
|
present result.trigger_request, with: Entities::TriggerRequest
|
||||||
else
|
else
|
||||||
render_validation_error!(pipeline)
|
render_validation_error!(pipeline)
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,26 +17,26 @@ describe Ci::CreateTriggerRequestService, services: true do
|
||||||
subject { service.execute(project, trigger, 'master') }
|
subject { service.execute(project, trigger, 'master') }
|
||||||
|
|
||||||
context 'without owner' do
|
context 'without owner' do
|
||||||
it { expect(subject[:trigger_request]).to be_kind_of(Ci::TriggerRequest) }
|
it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
|
||||||
it { expect(subject[:trigger_request].builds.first).to be_kind_of(Ci::Build) }
|
it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
|
||||||
it { expect(subject[:pipeline]).to be_kind_of(Ci::Pipeline) }
|
it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
|
||||||
it { expect(subject[:pipeline]).to be_trigger }
|
it { expect(subject.pipeline).to be_trigger }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with owner' do
|
context 'with owner' do
|
||||||
it { expect(subject[:trigger_request]).to be_kind_of(Ci::TriggerRequest) }
|
it { expect(subject.trigger_request).to be_kind_of(Ci::TriggerRequest) }
|
||||||
it { expect(subject[:trigger_request].builds.first).to be_kind_of(Ci::Build) }
|
it { expect(subject.trigger_request.builds.first).to be_kind_of(Ci::Build) }
|
||||||
it { expect(subject[:trigger_request].builds.first.user).to eq(owner) }
|
it { expect(subject.trigger_request.builds.first.user).to eq(owner) }
|
||||||
it { expect(subject[:pipeline]).to be_kind_of(Ci::Pipeline) }
|
it { expect(subject.pipeline).to be_kind_of(Ci::Pipeline) }
|
||||||
it { expect(subject[:pipeline]).to be_trigger }
|
it { expect(subject.pipeline).to be_trigger }
|
||||||
it { expect(subject[:pipeline].user).to eq(owner) }
|
it { expect(subject.pipeline.user).to eq(owner) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'no commit for ref' do
|
context 'no commit for ref' do
|
||||||
subject { service.execute(project, trigger, 'other-branch') }
|
subject { service.execute(project, trigger, 'other-branch') }
|
||||||
|
|
||||||
it { expect(subject[:pipeline]).not_to be_persisted }
|
it { expect(subject.pipeline).not_to be_persisted }
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'no builds created' do
|
context 'no builds created' do
|
||||||
|
@ -46,7 +46,7 @@ describe Ci::CreateTriggerRequestService, services: true do
|
||||||
stub_ci_pipeline_yaml_file('script: { only: [develop], script: hello World }')
|
stub_ci_pipeline_yaml_file('script: { only: [develop], script: hello World }')
|
||||||
end
|
end
|
||||||
|
|
||||||
it { expect(subject[:pipeline]).not_to be_persisted }
|
it { expect(subject.pipeline).not_to be_persisted }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue