diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-08-21 09:27:32 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-21 09:27:32 +0000 |
commit | 086d4c8eb727fce1796a5363c7f4102e869c86a3 (patch) | |
tree | 700ec1bcdcd1a95a1692f7648225ba4b7ec1caf1 /spec | |
parent | da1e8ee4420a8480785c351ad6edd1bcafd96d9b (diff) | |
parent | 92ac94c26e408842c6dfa44aae93e147a0f3d8f8 (diff) | |
download | gitlab-ce-086d4c8eb727fce1796a5363c7f4102e869c86a3.tar.gz |
Merge branch '56130-deployed_at' into 'master'
Replace finished_at with deployed_at for the internal API Deployment entity
See merge request gitlab-org/gitlab-ce!32000
Diffstat (limited to 'spec')
-rw-r--r-- | spec/fixtures/api/schemas/deployment.json | 4 | ||||
-rw-r--r-- | spec/serializers/deployment_entity_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/fixtures/api/schemas/deployment.json b/spec/fixtures/api/schemas/deployment.json index 9216ad0060b..fe725b97c21 100644 --- a/spec/fixtures/api/schemas/deployment.json +++ b/spec/fixtures/api/schemas/deployment.json @@ -3,7 +3,7 @@ "required": [ "sha", "created_at", - "finished_at", + "deployed_at", "iid", "tag", "last?", @@ -12,7 +12,7 @@ ], "properties": { "created_at": { "type": "string" }, - "finished_at": { "type": ["string", "null"] }, + "deployed_at": { "type": ["string", "null"] }, "id": { "type": "integer" }, "iid": { "type": "integer" }, "last?": { "type": "boolean" }, diff --git a/spec/serializers/deployment_entity_spec.rb b/spec/serializers/deployment_entity_spec.rb index c0ea2b3c389..1b19eac9a97 100644 --- a/spec/serializers/deployment_entity_spec.rb +++ b/spec/serializers/deployment_entity_spec.rb @@ -32,8 +32,8 @@ describe DeploymentEntity do expect(subject).to include(:created_at) end - it 'exposes finished_at' do - expect(subject).to include(:finished_at) + it 'exposes deployed_at' do + expect(subject).to include(:deployed_at) end context 'when the pipeline has another manual action' do |