diff options
| author | Mehdi Lahmam <mehdi@lahmam.com> | 2017-08-13 21:15:04 +0200 |
|---|---|---|
| committer | Mehdi Lahmam <mehdi@lahmam.com> | 2017-09-26 13:08:46 +0200 |
| commit | f696b04cc88bd38395caf8ccb4003c28f38a9c47 (patch) | |
| tree | 21b9e50692aa3a8f16eb86bb266c5c64adc278c9 /spec | |
| parent | 178ae69b80d5ac89a5031fa95e682e58db6689ff (diff) | |
| download | gitlab-ce-f696b04cc88bd38395caf8ccb4003c28f38a9c47.tar.gz | |
Expose last pipeline details in API response when getting a single commit
Closes #35692.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/commit/detail.json | 11 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json | 16 | ||||
| -rw-r--r-- | spec/requests/api/commits_spec.rb | 5 |
3 files changed, 30 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/commit/detail.json b/spec/fixtures/api/schemas/public_api/v4/commit/detail.json index b7b2535c204..88a3cad62f6 100644 --- a/spec/fixtures/api/schemas/public_api/v4/commit/detail.json +++ b/spec/fixtures/api/schemas/public_api/v4/commit/detail.json @@ -5,11 +5,18 @@ { "required" : [ "stats", - "status" + "status", + "last_pipeline" ], "properties": { "stats": { "$ref": "../commit_stats.json" }, - "status": { "type": ["string", "null"] } + "status": { "type": ["string", "null"] }, + "last_pipeline": { + "oneOf": [ + { "type": "null" }, + { "$ref": "../pipeline/basic.json" } + ] + } } } ] diff --git a/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json b/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json new file mode 100644 index 00000000000..0d127dc5297 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json @@ -0,0 +1,16 @@ +{ + "type": "object", + "required" : [ + "id", + "sha", + "ref", + "status" + ], + "properties" : { + "id": { "type": "integer" }, + "sha": { "type": "string" }, + "ref": { "type": "string" }, + "status": { "type": "string" } + }, + "additionalProperties": false +} diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index f663719d28c..94462b4572d 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -491,6 +491,7 @@ describe API::Commits do expect(json_response['stats']['deletions']).to eq(commit.stats.deletions) expect(json_response['stats']['total']).to eq(commit.stats.total) expect(json_response['status']).to be_nil + expect(json_response['last_pipeline']).to be_nil end context 'when ref does not exist' do @@ -573,6 +574,10 @@ describe API::Commits do expect(response).to have_http_status(200) expect(response).to match_response_schema('public_api/v4/commit/detail') expect(json_response['status']).to eq('created') + expect(json_response['last_pipeline']['id']).to eq(pipeline.id) + expect(json_response['last_pipeline']['ref']).to eq(pipeline.ref) + expect(json_response['last_pipeline']['sha']).to eq(pipeline.sha) + expect(json_response['last_pipeline']['status']).to eq(pipeline.status) end context 'when pipeline succeeds' do |