Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
a05bc477
Commit
a05bc477
authored
Jul 20, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use hash to return multiple objects
parent
d035d735
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
25 deletions
+25
-25
app/services/ci/create_trigger_request_service.rb
app/services/ci/create_trigger_request_service.rb
+4
-4
lib/api/triggers.rb
lib/api/triggers.rb
+2
-2
lib/api/v3/triggers.rb
lib/api/v3/triggers.rb
+3
-3
lib/ci/api/triggers.rb
lib/ci/api/triggers.rb
+3
-3
spec/services/ci/create_trigger_request_service_spec.rb
spec/services/ci/create_trigger_request_service_spec.rb
+13
-13
No files found.
app/services/ci/create_trigger_request_service.rb
View file @
a05bc477
module
Ci
class
CreateTriggerRequestService
def
execute
(
project
,
trigger
,
ref
,
variables
=
nil
)
module
CreateTriggerRequestService
def
self
.
execute
(
project
,
trigger
,
ref
,
variables
=
nil
)
trigger_request
=
trigger
.
trigger_requests
.
create
(
variables:
variables
)
pipeline
=
Ci
::
CreatePipelineService
.
new
(
project
,
trigger
.
owner
,
ref:
ref
)
.
execute
(
:trigger
,
ignore_skip_ci:
true
,
trigger_request:
trigger_request
)
trigger_request
.
pipeline
=
pipeline
trigger_request
{
trigger_request:
trigger_request
,
pipeline:
pipeline
}
end
end
end
lib/api/triggers.rb
View file @
a05bc477
...
...
@@ -27,8 +27,8 @@ module API
end
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
pipeline
=
trigger_request
.
pipeline
result
=
Ci
::
CreateTriggerRequestService
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
pipeline
=
result
[
:pipeline
]
if
pipeline
.
persisted?
present
pipeline
,
with:
Entities
::
Pipeline
...
...
lib/api/v3/triggers.rb
View file @
a05bc477
...
...
@@ -28,11 +28,11 @@ module API
end
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
pipeline
=
trigger_request
.
pipeline
result
=
Ci
::
CreateTriggerRequestService
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
pipeline
=
result
[
:pipeline
]
if
pipeline
.
persisted?
present
trigger_request
,
with:
::
API
::
V3
::
Entities
::
TriggerRequest
present
result
[
:trigger_request
]
,
with:
::
API
::
V3
::
Entities
::
TriggerRequest
else
render_validation_error!
(
pipeline
)
end
...
...
lib/ci/api/triggers.rb
View file @
a05bc477
...
...
@@ -24,11 +24,11 @@ module Ci
end
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
],
variables
)
pipeline
=
trigger_request
.
pipeline
result
=
Ci
::
CreateTriggerRequestService
.
execute
(
project
,
trigger
,
params
[
:ref
],
variables
)
pipeline
=
result
[
:pipeline
]
if
pipeline
.
persisted?
present
trigger_request
,
with:
Entities
::
TriggerRequest
present
result
[
:trigger_request
]
,
with:
Entities
::
TriggerRequest
else
render_validation_error!
(
pipeline
)
end
...
...
spec/services/ci/create_trigger_request_service_spec.rb
View file @
a05bc477
require
'spec_helper'
describe
Ci
::
CreateTriggerRequestService
,
services:
true
do
let
(
:service
)
{
described_class
.
new
}
let
(
:service
)
{
described_class
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
,
owner:
owner
)
}
let
(
:owner
)
{
create
(
:user
)
}
...
...
@@ -17,26 +17,26 @@ describe Ci::CreateTriggerRequestService, services: true do
subject
{
service
.
execute
(
project
,
trigger
,
'master'
)
}
context
'without owner'
do
it
{
expect
(
subject
).
to
be_kind_of
(
Ci
::
TriggerRequest
)
}
it
{
expect
(
subject
.
pipeline
).
to
be_kind_of
(
Ci
::
Pipeline
)
}
it
{
expect
(
subject
.
pipeline
).
to
be_trigger
}
it
{
expect
(
subject
.
builds
.
first
).
to
be_kind_of
(
Ci
::
Build
)
}
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
[
:pipeline
]).
to
be_kind_of
(
Ci
::
Pipeline
)
}
it
{
expect
(
subject
[
:pipeline
]).
to
be_trigger
}
end
context
'with owner'
do
it
{
expect
(
subject
).
to
be_kind_of
(
Ci
::
TriggerRequest
)
}
it
{
expect
(
subject
.
pipeline
).
to
be_kind_of
(
Ci
::
Pipeline
)
}
it
{
expect
(
subject
.
pipeline
).
to
be_trigger
}
it
{
expect
(
subject
.
pipeline
.
user
).
to
eq
(
owner
)
}
it
{
expect
(
subject
.
builds
.
first
).
to
be_kind_of
(
Ci
::
Build
)
}
it
{
expect
(
subject
.
builds
.
first
.
user
).
to
eq
(
owner
)
}
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
.
user
).
to
eq
(
owner
)
}
it
{
expect
(
subject
[
:pipeline
]).
to
be_kind_of
(
Ci
::
Pipeline
)
}
it
{
expect
(
subject
[
:pipeline
]).
to
be_trigger
}
it
{
expect
(
subject
[
:pipeline
]
.
user
).
to
eq
(
owner
)
}
end
end
context
'no commit for ref'
do
subject
{
service
.
execute
(
project
,
trigger
,
'other-branch'
)
}
it
{
expect
(
subject
.
pipeline
).
not_to
be_persisted
}
it
{
expect
(
subject
[
:pipeline
]
).
not_to
be_persisted
}
end
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 }'
)
end
it
{
expect
(
subject
.
pipeline
).
not_to
be_persisted
}
it
{
expect
(
subject
[
:pipeline
]
).
not_to
be_persisted
}
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment