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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3b635002
Commit
3b635002
authored
Mar 10, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3 lines to One line. Correct spec caption.
parent
2b33e9ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
10 deletions
+5
-10
app/serializers/build_entity.rb
app/serializers/build_entity.rb
+1
-3
app/serializers/pipeline_entity.rb
app/serializers/pipeline_entity.rb
+1
-4
spec/controllers/projects/builds_controller_spec.rb
spec/controllers/projects/builds_controller_spec.rb
+1
-1
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+1
-1
spec/controllers/projects/pipelines_controller_spec.rb
spec/controllers/projects/pipelines_controller_spec.rb
+1
-1
No files found.
app/serializers/build_entity.rb
View file @
3b635002
...
@@ -20,9 +20,7 @@ class BuildEntity < Grape::Entity
...
@@ -20,9 +20,7 @@ class BuildEntity < Grape::Entity
expose
:updated_at
expose
:updated_at
expose
:details
do
expose
:details
do
expose
:detailed_status
,
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
as: :status
,
with:
StatusEntity
end
end
private
private
...
...
app/serializers/pipeline_entity.rb
View file @
3b635002
...
@@ -12,10 +12,7 @@ class PipelineEntity < Grape::Entity
...
@@ -12,10 +12,7 @@ class PipelineEntity < Grape::Entity
end
end
expose
:details
do
expose
:details
do
expose
:detailed_status
,
expose
:detailed_status
,
as: :status
,
with:
StatusEntity
as: :status
,
with:
StatusEntity
expose
:duration
expose
:duration
expose
:finished_at
expose
:finished_at
expose
:stages
,
using:
StageEntity
expose
:stages
,
using:
StageEntity
...
...
spec/controllers/projects/builds_controller_spec.rb
View file @
3b635002
...
@@ -21,7 +21,7 @@ describe Projects::BuildsController do
...
@@ -21,7 +21,7 @@ describe Projects::BuildsController do
format: :json
format: :json
end
end
it
'return
s pipeline status via BuildSerializer
'
do
it
'return
a correct pipeline status
'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
end
end
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
3b635002
...
@@ -1192,7 +1192,7 @@ describe Projects::MergeRequestsController do
...
@@ -1192,7 +1192,7 @@ describe Projects::MergeRequestsController do
format: :json
format: :json
end
end
it
'return
s pipeline status via PipelineSerializer
'
do
it
'return
a correct pipeline status
'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
end
end
...
...
spec/controllers/projects/pipelines_controller_spec.rb
View file @
3b635002
...
@@ -80,7 +80,7 @@ describe Projects::PipelinesController do
...
@@ -80,7 +80,7 @@ describe Projects::PipelinesController do
format: :json
format: :json
end
end
it
'return
s pipeline status via PipelineSerializer
'
do
it
'return
a correct pipeline status
'
do
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
expect
(
json_response
[
'details'
][
'status'
][
'text'
]).
to
eq
'passed'
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