summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKrasimir Angelov <kangelov@gitlab.com>2019-08-20 12:28:55 +0300
committerKrasimir Angelov <kangelov@gitlab.com>2019-08-20 12:39:19 +0300
commit92ac94c26e408842c6dfa44aae93e147a0f3d8f8 (patch)
tree24251ef5b17baa744cb96f5b7448c4900e196f1b /spec
parent51c19691e4c4ceb60ef28fd08c6b13549a423a39 (diff)
downloadgitlab-ce-92ac94c26e408842c6dfa44aae93e147a0f3d8f8.tar.gz
Replace finished_at with deployed_at for Deployment entity56130-deployed_at
Instead of `finished_at` attribute use `deployed_at` methods which also takes into account the deployment status. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/56130.
Diffstat (limited to 'spec')
-rw-r--r--spec/fixtures/api/schemas/deployment.json4
-rw-r--r--spec/serializers/deployment_entity_spec.rb4
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