diff --git a/app/serializers/build_entity.rb b/app/serializers/build_entity.rb index 10151d94e68cca2fd2bb2d3d8dacfc8359484105..35566c55950328b33f055a814d0b80725c70a908 100644 --- a/app/serializers/build_entity.rb +++ b/app/serializers/build_entity.rb @@ -20,9 +20,7 @@ class BuildEntity < Grape::Entity expose :updated_at expose :details do - expose :detailed_status, - as: :status, - with: StatusEntity + expose :detailed_status, as: :status, with: StatusEntity end private diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb index 1c1fa9e3dee43214cb44f36001b735b5a215dcb1..3f16dd66d54b4c6f235ed64d0ad85e304823a604 100644 --- a/app/serializers/pipeline_entity.rb +++ b/app/serializers/pipeline_entity.rb @@ -12,10 +12,7 @@ class PipelineEntity < Grape::Entity end expose :details do - expose :detailed_status, - as: :status, - with: StatusEntity - + expose :detailed_status, as: :status, with: StatusEntity expose :duration expose :finished_at expose :stages, using: StageEntity diff --git a/spec/controllers/projects/builds_controller_spec.rb b/spec/controllers/projects/builds_controller_spec.rb index 53a307aa362626dfa0f6693cd1fcbed03a9e5fcc..4411069918ae4704d99b3393723bbdac2996b00b 100644 --- a/spec/controllers/projects/builds_controller_spec.rb +++ b/spec/controllers/projects/builds_controller_spec.rb @@ -21,7 +21,7 @@ describe Projects::BuildsController do format: :json end - it 'returns pipeline status via BuildSerializer' do + it 'return a correct pipeline status' do expect(response).to have_http_status(:ok) expect(json_response['details']['status']['text']).to eq 'passed' end diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 2cbb46d8274693297c1d7aea13fa4afe8f9bdb3b..3bcea2b6517666decd43435c03d0cd6cf801a66a 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1192,7 +1192,7 @@ describe Projects::MergeRequestsController do format: :json end - it 'returns pipeline status via PipelineSerializer' do + it 'return a correct pipeline status' do expect(response).to have_http_status(:ok) expect(json_response['details']['status']['text']).to eq 'passed' end diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 5a9e02331f78e60324fc86c4450d088c05fc0652..aa6415d58e8ff0a50c26f00585d73645f92d1488 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -80,7 +80,7 @@ describe Projects::PipelinesController do format: :json end - it 'returns pipeline status via PipelineSerializer' do + it 'return a correct pipeline status' do expect(response).to have_http_status(:ok) expect(json_response['details']['status']['text']).to eq 'passed' end