Commit 1965d323 authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '26247-junit-xml-tests-mis-present-the-test-execution-time-from-test-cases' into 'master'

Resolve "JUnit XML tests mis-present test execution time"

Closes #26247

See merge request gitlab-org/gitlab!24019
parents f5f75675 11e45118
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
</a> </a>
</template> </template>
<template v-else-if="field.type === $options.fieldTypes.miliseconds">{{ <template v-else-if="field.type === $options.fieldTypes.seconds">{{
sprintf(__('%{value} ms'), { value: field.value }) sprintf(__('%{value} s'), { value: field.value })
}}</template> }}</template>
<template v-else-if="field.type === $options.fieldTypes.text"> <template v-else-if="field.type === $options.fieldTypes.text">
......
export const fieldTypes = { export const fieldTypes = {
codeBock: 'codeBlock', codeBock: 'codeBlock',
link: 'link', link: 'link',
miliseconds: 'miliseconds', seconds: 'seconds',
text: 'text', text: 'text',
}; };
......
...@@ -48,7 +48,7 @@ export default () => ({ ...@@ -48,7 +48,7 @@ export default () => ({
execution_time: { execution_time: {
value: null, value: null,
text: s__('Reports|Execution time'), text: s__('Reports|Execution time'),
type: fieldTypes.miliseconds, type: fieldTypes.seconds,
}, },
failure: { failure: {
value: null, value: null,
......
---
title: Label MR test modal execution time as seconds
merge_request: 24019
author:
type: fixed
...@@ -484,7 +484,7 @@ msgstr "" ...@@ -484,7 +484,7 @@ msgstr ""
msgid "%{username}'s avatar" msgid "%{username}'s avatar"
msgstr "" msgstr ""
msgid "%{value} ms" msgid "%{value} s"
msgstr "" msgstr ""
msgid "%{verb} %{time_spent_value} spent time." msgid "%{verb} %{time_spent_value} spent time."
......
...@@ -42,8 +42,8 @@ describe('Grouped Test Reports Modal', () => { ...@@ -42,8 +42,8 @@ describe('Grouped Test Reports Modal', () => {
); );
}); });
it('renders miliseconds', () => { it('renders seconds', () => {
expect(vm.$el.textContent).toContain(`${modalDataStructure.execution_time.value} ms`); expect(vm.$el.textContent).toContain(`${modalDataStructure.execution_time.value} s`);
}); });
it('render title', () => { it('render title', () => {
......
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