Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
fb27b27ddf78
Commit
0711d9ad
authored
Jul 21, 2017
by
Kamil Trzcinski
Browse files
Fix support for old CI API when image or services are not specified
parent
fc2f3ee58baa
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/ci/api/entities.rb
View file @
fb27b27d
...
...
@@ -52,7 +52,7 @@ class BuildDetails < Build
# when old API will be removed (planned for August 2017).
model
.
options
.
dup
.
tap
do
|
options
|
options
[
:image
]
=
options
[
:image
][
:name
]
if
options
[
:image
].
is_a?
(
Hash
)
options
[
:services
].
map!
do
|
service
|
options
[
:services
]
&
.
map!
do
|
service
|
if
service
.
is_a?
(
Hash
)
service
[
:name
]
else
...
...
spec/requests/ci/api/builds_spec.rb
View file @
fb27b27d
...
...
@@ -69,6 +69,72 @@
end
end
context
'when an old image syntax is used'
do
before
do
build
.
update!
(
options:
{
image:
'codeclimate'
})
end
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
"options"
]).
to
eq
({
"image"
=>
"codeclimate"
})
end
end
context
'when a new image syntax is used'
do
before
do
build
.
update!
(
options:
{
image:
{
name:
'codeclimate'
}
})
end
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
"options"
]).
to
eq
({
"image"
=>
"codeclimate"
})
end
end
context
'when an old service syntax is used'
do
before
do
build
.
update!
(
options:
{
services:
[
'mysql'
]
})
end
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
"options"
]).
to
eq
({
"services"
=>
[
"mysql"
]
})
end
end
context
'when a new service syntax is used'
do
before
do
build
.
update!
(
options:
{
services:
[
name:
'mysql'
]
})
end
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
"options"
]).
to
eq
({
"services"
=>
[
"mysql"
]
})
end
end
context
'when no image or service is defined'
do
before
do
build
.
update!
(
options:
{})
end
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
"options"
]).
to
be_empty
end
end
context
'when there is a pending build'
do
it
'starts a build'
do
register_builds
info:
{
platform: :darwin
}
...
...
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