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