diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-06 08:31:09 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-06 08:31:09 +0000 |
| commit | ec2a1ac5e57946817fdd98347f99d101235454f5 (patch) | |
| tree | 633723b5035c77c512d1fac7cc4279d49360308c | |
| parent | a93e34acc3e52ccf81369d3345faaa48fee08581 (diff) | |
| parent | 7519a25a6161b2ca540ca9fc4e42e4b03aed4eeb (diff) | |
| download | gitlab-ce-ec2a1ac5e57946817fdd98347f99d101235454f5.tar.gz | |
Merge branch '46858-triggered-at' into 'master'
Resolve "Manual job's triggered by datetime is wrong"
Closes #46858
See merge request gitlab-org/gitlab-ce!19438
| -rw-r--r-- | app/assets/javascripts/jobs/components/header.vue | 5 | ||||
| -rw-r--r-- | spec/javascripts/jobs/header_spec.js | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/header.vue b/app/assets/javascripts/jobs/components/header.vue index c1044f4cd42..5704d753277 100644 --- a/app/assets/javascripts/jobs/components/header.vue +++ b/app/assets/javascripts/jobs/components/header.vue @@ -42,6 +42,9 @@ export default { jobStarted() { return !this.job.started === false; }, + headerTime() { + return this.jobStarted ? this.job.started : this.job.created_at; + }, }, watch: { job() { @@ -73,7 +76,7 @@ export default { :status="status" item-name="Job" :item-id="job.id" - :time="job.created_at" + :time="headerTime" :user="job.user" :actions="actions" :has-sidebar-button="true" diff --git a/spec/javascripts/jobs/header_spec.js b/spec/javascripts/jobs/header_spec.js index 4f861c39d3f..cef30a007db 100644 --- a/spec/javascripts/jobs/header_spec.js +++ b/spec/javascripts/jobs/header_spec.js @@ -13,6 +13,9 @@ describe('Job details header', () => { const threeWeeksAgo = new Date(); threeWeeksAgo.setDate(threeWeeksAgo.getDate() - 21); + const twoDaysAgo = new Date(); + twoDaysAgo.setDate(twoDaysAgo.getDate() - 2); + props = { job: { status: { @@ -31,7 +34,7 @@ describe('Job details header', () => { email: 'foo@bar.com', avatar_url: 'link', }, - started: '2018-01-08T09:48:27.319Z', + started: twoDaysAgo.toISOString(), new_issue_path: 'path', }, isLoading: false, @@ -69,7 +72,7 @@ describe('Job details header', () => { .querySelector('.header-main-content') .textContent.replace(/\s+/g, ' ') .trim(), - ).toEqual('failed Job #123 triggered 3 weeks ago by Foo'); + ).toEqual('failed Job #123 triggered 2 days ago by Foo'); }); it('should render new issue link', () => { |