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
Boxiang Sun
gitlab-ce
Commits
e86e1e51
Commit
e86e1e51
authored
Jun 06, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to report why it's failing and fix tests
parent
9984f07a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
20 deletions
+35
-20
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
app/services/ci/create_trigger_request_service.rb
app/services/ci/create_trigger_request_service.rb
+2
-1
lib/api/triggers.rb
lib/api/triggers.rb
+5
-4
lib/api/v3/triggers.rb
lib/api/v3/triggers.rb
+4
-3
lib/ci/api/triggers.rb
lib/ci/api/triggers.rb
+4
-3
spec/requests/ci/api/triggers_spec.rb
spec/requests/ci/api/triggers_spec.rb
+12
-2
spec/services/ci/create_trigger_request_service_spec.rb
spec/services/ci/create_trigger_request_service_spec.rb
+6
-6
spec/workers/post_receive_spec.rb
spec/workers/post_receive_spec.rb
+1
-0
No files found.
app/services/ci/create_pipeline_service.rb
View file @
e86e1e51
...
...
@@ -23,7 +23,7 @@ module Ci
return
error
(
'Insufficient permissions to create a new pipeline'
)
end
unless
trigger_request
&&
trigger_request
.
trigger
.
owner
if
trigger_request
&&
!
trigger_request
.
trigger
.
owner
return
error
(
'Legacy trigger without a owner is not allowed'
)
end
...
...
app/services/ci/create_trigger_request_service.rb
View file @
e86e1e51
...
...
@@ -6,7 +6,8 @@ module Ci
pipeline
=
Ci
::
CreatePipelineService
.
new
(
project
,
trigger
.
owner
,
ref:
ref
).
execute
(
:trigger
,
ignore_skip_ci:
true
,
trigger_request:
trigger_request
)
trigger_request
if
pipeline
.
persisted?
trigger_request
.
pipeline
=
pipeline
trigger_request
end
end
end
lib/api/triggers.rb
View file @
e86e1e51
...
...
@@ -28,11 +28,12 @@ module API
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
if
trigger_request
present
trigger_request
.
pipeline
,
with:
Entities
::
Pipeline
pipeline
=
trigger_request
.
pipeline
if
pipeline
.
persisted?
present
pipeline
,
with:
Entities
::
Pipeline
else
errors
=
'No pipeline created'
render_api_error!
(
errors
,
400
)
render_validation_error!
(
pipeline
)
end
end
...
...
lib/api/v3/triggers.rb
View file @
e86e1e51
...
...
@@ -29,11 +29,12 @@ module API
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
].
to_s
,
variables
)
if
trigger_request
pipeline
=
trigger_request
.
pipeline
if
pipeline
.
persisted?
present
trigger_request
,
with:
::
API
::
V3
::
Entities
::
TriggerRequest
else
errors
=
'No builds created'
render_api_error!
(
errors
,
400
)
render_validation_error!
(
pipeline
)
end
end
...
...
lib/ci/api/triggers.rb
View file @
e86e1e51
...
...
@@ -25,11 +25,12 @@ module Ci
# create request and trigger builds
trigger_request
=
Ci
::
CreateTriggerRequestService
.
new
.
execute
(
project
,
trigger
,
params
[
:ref
],
variables
)
if
trigger_request
pipeline
=
trigger_request
.
pipeline
if
pipeline
.
persisted?
present
trigger_request
,
with:
Entities
::
TriggerRequest
else
errors
=
'No builds created'
render_api_error!
(
errors
,
400
)
render_validation_error!
(
pipeline
)
end
end
end
...
...
spec/requests/ci/api/triggers_spec.rb
View file @
e86e1e51
...
...
@@ -5,7 +5,14 @@ describe Ci::API::Triggers do
let!
(
:trigger_token
)
{
'secure token'
}
let!
(
:project
)
{
create
(
:project
,
:repository
,
ci_id:
10
)
}
let!
(
:project2
)
{
create
(
:empty_project
,
ci_id:
11
)
}
let!
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
,
token:
trigger_token
)
}
let!
(
:trigger
)
do
create
(
:ci_trigger
,
project:
project
,
token:
trigger_token
,
owner:
create
(
:user
))
end
let
(
:options
)
do
{
token:
trigger_token
...
...
@@ -14,6 +21,8 @@ describe Ci::API::Triggers do
before
do
stub_ci_pipeline_to_return_yaml_file
project
.
add_developer
(
trigger
.
owner
)
end
context
'Handles errors'
do
...
...
@@ -47,7 +56,8 @@ describe Ci::API::Triggers do
it
'returns bad request with no builds created if there\'s no commit for that ref'
do
post
ci_api
(
"/projects/
#{
project
.
ci_id
}
/refs/other-branch/trigger"
),
options
expect
(
response
).
to
have_http_status
(
400
)
expect
(
json_response
[
'message'
]).
to
eq
(
'No builds created'
)
expect
(
json_response
[
'message'
][
'base'
])
.
to
contain_exactly
(
'Reference not found'
)
end
context
'Validates variables'
do
...
...
spec/services/ci/create_trigger_request_service_spec.rb
View file @
e86e1e51
...
...
@@ -3,10 +3,13 @@ require 'spec_helper'
describe
Ci
::
CreateTriggerRequestService
,
services:
true
do
let
(
:service
)
{
described_class
.
new
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
)
}
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
,
owner:
owner
)
}
let
(
:owner
)
{
create
(
:user
)
}
before
do
stub_ci_pipeline_to_return_yaml_file
project
.
add_developer
(
owner
)
end
describe
'#execute'
do
...
...
@@ -21,9 +24,6 @@ describe Ci::CreateTriggerRequestService, services: true do
end
context
'with owner'
do
let
(
:owner
)
{
create
(
:user
)
}
let
(
:trigger
)
{
create
(
:ci_trigger
,
project:
project
,
owner:
owner
)
}
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
}
...
...
@@ -36,7 +36,7 @@ describe Ci::CreateTriggerRequestService, services: true do
context
'no commit for ref'
do
subject
{
service
.
execute
(
project
,
trigger
,
'other-branch'
)
}
it
{
expect
(
subject
).
to
be_nil
}
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
).
to
be_nil
}
it
{
expect
(
subject
.
pipeline
).
not_to
be_persisted
}
end
end
end
spec/workers/post_receive_spec.rb
View file @
e86e1e51
...
...
@@ -82,6 +82,7 @@ describe PostReceive do
OpenStruct
.
new
(
id:
'123456'
)
end
allow_any_instance_of
(
Ci
::
CreatePipelineService
).
to
receive
(
:branch?
).
and_return
(
true
)
allow_any_instance_of
(
Repository
).
to
receive
(
:ref_exists?
).
and_return
(
true
)
stub_ci_pipeline_to_return_yaml_file
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