Commit edc97c9d authored by Filipa Lacerda's avatar Filipa Lacerda

Use created date from last_deployment

Adds test

Adds changelog entry
parent 43c8788e
......@@ -147,6 +147,12 @@
this.model.last_deployment.deployable;
},
canShowDate() {
return this.model.last_deployment &&
this.model.last_deployment.deployable &&
this.model.last_deployment.deployable.created_at;
},
/**
* Human readable date.
*
......@@ -155,7 +161,7 @@
createdDate() {
const timeagoInstance = new timeago(); // eslint-disable-line
return timeagoInstance.format(this.model.created_at);
return timeagoInstance.format(this.model.last_deployment.deployable.created_at);
},
/**
......@@ -453,7 +459,7 @@
<td>
<span
v-if="!isFolder && model.last_deployment"
v-if="!isFolder && canShowDate"
class="environment-created-date-timeago">
{{createdDate}}
</span>
......
---
title: Fixes Environments displaying incorrect date since 8.14 upgrade
merge_request:
author:
//= require vue
//= require timeago
//= require environments/components/environment_item
describe('Environment item', () => {
......@@ -109,6 +110,8 @@ describe('Environment item', () => {
name: 'deploy',
build_path: '/root/ci-folders/builds/1279',
retry_path: '/root/ci-folders/builds/1279/retry',
created_at: '2016-11-29T18:11:58.430Z',
updated_at: '2016-11-29T18:11:58.430Z',
},
manual_actions: [
{
......@@ -149,6 +152,17 @@ describe('Environment item', () => {
).toContain('#');
});
it('should render last deployment date', () => {
const timeagoInstance = new timeago(); // eslint-disable-line
const formatedDate = timeagoInstance.format(
environment.last_deployment.deployable.created_at
);
expect(
component.$el.querySelector('.environment-created-date-timeago').textContent
).toContain(formatedDate);
});
describe('With user information', () => {
it('should render user avatar with link to profile', () => {
expect(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment