BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d03e6878
Commit
d03e6878
authored
Jun 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename BuildEntity to JobEntity
parent
0a80e504
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
20 deletions
+41
-20
build_details_entity.rb
app/serializers/build_details_entity.rb
+1
-1
build_serializer.rb
app/serializers/build_serializer.rb
+1
-1
deployment_entity.rb
app/serializers/deployment_entity.rb
+2
-2
job_entity.rb
app/serializers/job_entity.rb
+2
-2
job_group_entity.rb
app/serializers/job_group_entity.rb
+1
-1
build_details_entity_spec.rb
spec/serializers/build_details_entity_spec.rb
+2
-2
job_entity_spec.rb
spec/serializers/job_entity_spec.rb
+32
-11
No files found.
app/serializers/build_details_entity.rb
View file @
d03e6878
class
BuildDetailsEntity
<
Build
Entity
class
BuildDetailsEntity
<
Job
Entity
expose
:coverage
,
:erased_at
,
:duration
expose
:tag_list
,
as: :tags
...
...
app/serializers/build_serializer.rb
View file @
d03e6878
class
BuildSerializer
<
BaseSerializer
entity
Build
Entity
entity
Job
Entity
def
represent_status
(
resource
)
data
=
represent
(
resource
,
{
only:
[
:status
]
})
...
...
app/serializers/deployment_entity.rb
View file @
d03e6878
...
...
@@ -24,6 +24,6 @@ class DeploymentEntity < Grape::Entity
expose
:user
,
using:
UserEntity
expose
:commit
,
using:
CommitEntity
expose
:deployable
,
using:
Build
Entity
expose
:manual_actions
,
using:
Build
Entity
expose
:deployable
,
using:
Job
Entity
expose
:manual_actions
,
using:
Job
Entity
end
app/serializers/
build
_entity.rb
→
app/serializers/
job
_entity.rb
View file @
d03e6878
class
Build
Entity
<
Grape
::
Entity
class
Job
Entity
<
Grape
::
Entity
include
RequestAwareEntity
expose
:id
expose
:name
expose
:build_path
do
|
build
|
build
.
external
_url
||
path_to
(
:namespace_project_job
,
build
)
build
.
target
_url
||
path_to
(
:namespace_project_job
,
build
)
end
expose
:retry_path
,
if:
->
(
*
)
{
retryable?
}
do
|
build
|
...
...
app/serializers/job_group_entity.rb
View file @
d03e6878
...
...
@@ -4,7 +4,7 @@ class JobGroupEntity < Grape::Entity
expose
:name
expose
:size
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
expose
:jobs
,
with:
Build
Entity
expose
:jobs
,
with:
Job
Entity
private
...
...
spec/serializers/build_details_entity_spec.rb
View file @
d03e6878
...
...
@@ -3,8 +3,8 @@ require 'spec_helper'
describe
BuildDetailsEntity
do
set
(
:user
)
{
create
(
:admin
)
}
it
'inherits from
Build
Entity'
do
expect
(
described_class
).
to
be
<
Build
Entity
it
'inherits from
Job
Entity'
do
expect
(
described_class
).
to
be
<
Job
Entity
end
describe
'#as_json'
do
...
...
spec/serializers/
build
_entity_spec.rb
→
spec/serializers/
job
_entity_spec.rb
View file @
d03e6878
require
'spec_helper'
describe
Build
Entity
do
describe
Job
Entity
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:
build
)
{
create
(
:ci_build
)
}
let
(
:project
)
{
build
.
project
}
let
(
:
job
)
{
create
(
:ci_build
)
}
let
(
:project
)
{
job
.
project
}
let
(
:request
)
{
double
(
'request'
)
}
before
do
...
...
@@ -12,12 +12,12 @@ describe BuildEntity do
end
let
(
:entity
)
do
described_class
.
new
(
build
,
request:
request
)
described_class
.
new
(
job
,
request:
request
)
end
subject
{
entity
.
as_json
}
it
'contains paths to
build
page action'
do
it
'contains paths to
job
page action'
do
expect
(
subject
).
to
include
(
:build_path
)
end
...
...
@@ -27,7 +27,7 @@ describe BuildEntity do
end
it
'contains whether it is playable'
do
expect
(
subject
[
:playable
]).
to
eq
build
.
playable?
expect
(
subject
[
:playable
]).
to
eq
job
.
playable?
end
it
'contains timestamps'
do
...
...
@@ -41,7 +41,7 @@ describe BuildEntity do
context
'when build is retryable'
do
before
do
build
.
update
(
status: :failed
)
job
.
update
(
status: :failed
)
end
it
'contains cancel path'
do
...
...
@@ -51,7 +51,7 @@ describe BuildEntity do
context
'when build is cancelable'
do
before
do
build
.
update
(
status: :running
)
job
.
update
(
status: :running
)
end
it
'contains cancel path'
do
...
...
@@ -59,7 +59,7 @@ describe BuildEntity do
end
end
context
'when
build is a regular build
'
do
context
'when
job is a regular job
'
do
it
'does not contain path to play action'
do
expect
(
subject
).
not_to
include
(
:play_path
)
end
...
...
@@ -69,8 +69,8 @@ describe BuildEntity do
end
end
context
'when
build
is a manual action'
do
let
(
:
build
)
{
create
(
:ci_build
,
:manual
)
}
context
'when
job
is a manual action'
do
let
(
:
job
)
{
create
(
:ci_build
,
:manual
)
}
context
'when user is allowed to trigger action'
do
before
do
...
...
@@ -99,4 +99,25 @@ describe BuildEntity do
end
end
end
context
'when job is generic commit status'
do
let
(
:job
)
{
create
(
:generic_commit_status
,
target_url:
'http://google.com'
)
}
it
'contains paths to target action'
do
expect
(
subject
).
to
include
(
:build_path
)
end
it
'does not contain paths to other action paths'
do
expect
(
subject
).
not_to
include
(
:retry_path
,
:cancel_path
,
:play_path
)
end
it
'contains timestamps'
do
expect
(
subject
).
to
include
(
:created_at
,
:updated_at
)
end
it
'contains details'
do
expect
(
subject
).
to
include
:status
expect
(
subject
[
:status
]).
to
include
:icon
,
:favicon
,
:text
,
:label
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