From 8f55a3949fa78c1efa89de89105968acd9107906 Mon Sep 17 00:00:00 2001 From: Martin Polanka Date: Fri, 20 Oct 2017 19:30:21 +0200 Subject: [PATCH] Bugfix: display correctly test results if time or memory value is zero. --- .../TestResultsTable/TestResultsTable.js | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/components/Submissions/TestResultsTable/TestResultsTable.js b/src/components/Submissions/TestResultsTable/TestResultsTable.js index 57bad603c..ca240cfc9 100644 --- a/src/components/Submissions/TestResultsTable/TestResultsTable.js +++ b/src/components/Submissions/TestResultsTable/TestResultsTable.js @@ -9,7 +9,9 @@ import prettyBytes from 'pretty-bytes'; import exitCodeMapping from '../../helpers/exitCodeMapping'; -const tickOrCrossAndRatioOrValue = (isOK, ratio, value, pretty) => ( +const hasValue = value => value !== null; + +const tickOrCrossAndRatioOrValue = (isOK, ratio, value, pretty) => ( > {' '} - {value && '('} - {(ratio || ratio === 0) && ( + {hasValue(value) && '('} + {(ratio || ratio === 0) && - )} - {value && ') '} - {value && pretty(value * 1000)} + />} + {hasValue(value) && ') '} + {hasValue(value) && pretty(value * 1000)} - -); + ; -const TestResultsTable = ({ results, runtimeEnvironmentId }) => ( +const TestResultsTable = ({ results, runtimeEnvironmentId }) => @@ -138,7 +138,7 @@ const TestResultsTable = ({ results, runtimeEnvironmentId }) => ( time, memory, exitCode - }) => ( + }) => - + @@ -198,11 +197,9 @@ const TestResultsTable = ({ results, runtimeEnvironmentId }) => ( {exitCodeMapping(runtimeEnvironmentId, exitCode)} - ) )} -
( {testName} + {testName} + - {status === 'OK' && ( + {status === 'OK' && - - )} - {status === 'SKIPPED' && ( + } + {status === 'SKIPPED' && - - )} - {status === 'FAILED' && ( + } + {status === 'FAILED' && - - )} + }
-); + ; TestResultsTable.propTypes = { results: PropTypes.arrayOf(