diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:32 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 12:06:32 +0000 |
commit | 61f0c58946ebac453b55a657cd4be1ac50a01e11 (patch) | |
tree | 7b164c1cc9dc8ab1d100ca4fe90decf6d72e984b /app/assets/javascripts/pipelines | |
parent | d23b2a0871f3ca507aafa949e0314625f1f0c6a7 (diff) | |
download | gitlab-ce-61f0c58946ebac453b55a657cd4be1ac50a01e11.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/test_reports/test_summary.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/stores/test_reports/utils.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue index 5fc0e220a72..dce8b020d6f 100644 --- a/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue +++ b/app/assets/javascripts/pipelines/components/test_reports/test_summary.vue @@ -1,7 +1,7 @@ <script> import { GlButton, GlLink, GlProgressBar } from '@gitlab/ui'; import { __ } from '~/locale'; -import { formatTime } from '~/lib/utils/datetime_utility'; +import { formatTime, secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import Icon from '~/vue_shared/components/icon.vue'; export default { @@ -31,7 +31,7 @@ export default { return Math.round((this.report.success_count / this.report.total_count) * 100) || 0; }, formattedDuration() { - return formatTime(this.report.total_time * 1000); + return formatTime(secondsToMilliseconds(this.report.total_time)); }, progressBarVariant() { if (this.successPercentage < 33) { diff --git a/app/assets/javascripts/pipelines/stores/test_reports/utils.js b/app/assets/javascripts/pipelines/stores/test_reports/utils.js index c426a5f0bb5..95466587d6b 100644 --- a/app/assets/javascripts/pipelines/stores/test_reports/utils.js +++ b/app/assets/javascripts/pipelines/stores/test_reports/utils.js @@ -1,5 +1,5 @@ import { TestStatus } from '~/pipelines/constants'; -import { formatTime } from '~/lib/utils/datetime_utility'; +import { formatTime, secondsToMilliseconds } from '~/lib/utils/datetime_utility'; function iconForTestStatus(status) { switch (status) { @@ -12,7 +12,7 @@ function iconForTestStatus(status) { } } -export const formattedTime = timeInSeconds => formatTime(timeInSeconds * 1000); +export const formattedTime = timeInSeconds => formatTime(secondsToMilliseconds(timeInSeconds)); export const addIconStatus = testCase => ({ ...testCase, |