From 38388163277c337bc5d4d32bc5d49eb8d5709f01 Mon Sep 17 00:00:00 2001 From: Muthu Kumar Date: Wed, 19 Sep 2018 18:09:22 +0530 Subject: [PATCH] [reporter] Minor refactor --- src/lib/testrunner.js | 5 ++++- src/reporters/min.js | 10 +--------- src/reporters/xunit.js | 3 ++- src/runner/index.js | 6 ++++++ src/util/nodeutils.js | 12 ++++++++++++ 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 src/util/nodeutils.js diff --git a/src/lib/testrunner.js b/src/lib/testrunner.js index 6fe6993..3e65b5b 100644 --- a/src/lib/testrunner.js +++ b/src/lib/testrunner.js @@ -129,7 +129,10 @@ const testrunner = (instance) => { reduceQueue, pick('results'), )(instance)).then(results => { - results.duration = Date.now() - perf.start; + perf.end = Date.now(); + results.end = perf.end.toUTCString(); + results.start = perf.start.toUTCString(); + results.duration = perf.end - perf.start; return results; }); diff --git a/src/reporters/min.js b/src/reporters/min.js index aa33b80..7fd3bb3 100644 --- a/src/reporters/min.js +++ b/src/reporters/min.js @@ -1,4 +1,5 @@ const { eventMap, eventVerbs } = require('../util/constants'); +const { clear } = require('../util/nodeutils'); const convert = x => x; @@ -11,15 +12,6 @@ const count = { } }; -const clear = () => { - - // clear screen - process.stdout.write('\u001b[2J'); - // set cursor position to top - process.stdout.write('\u001b[1;1H'); - -}; - const doneHandler = event => { clear(); diff --git a/src/reporters/xunit.js b/src/reporters/xunit.js index 49461fe..bfffc8e 100644 --- a/src/reporters/xunit.js +++ b/src/reporters/xunit.js @@ -1,4 +1,5 @@ const toXML = require('jsontoxml'); +const { clear } = require('../util/nodeutils'); const toJSON = resultsArray => { @@ -52,7 +53,7 @@ const convert = results => { xmlHeader: { standalone: true }}); const xunit = runner => - runner.on("end", results => console.log(convert([ results ]))); + runner.on("end", results => (clear(), console.log(convert([ results ])))); module.exports = xunit; module.exports.convert = convert; diff --git a/src/runner/index.js b/src/runner/index.js index 6f56cce..5c6c5b9 100644 --- a/src/runner/index.js +++ b/src/runner/index.js @@ -26,6 +26,8 @@ const runner = instances => (options = {}) => { if (RunInstances.length !== instances.length) throw new Error (`Not all instances were of type ${type}`); + const perf = { start: Date.now() }; + return Promise.all(RunInstances.map(instance => { return ( instance @@ -33,6 +35,10 @@ const runner = instances => (options = {}) => { ); })) .then(results => { + perf.end = Date.now(); + results.start = perf.start.toUTCString(); + results.end = perf.end.toUTCString(); + results.duration = perf.end - perf.start; return options.request ? { diff --git a/src/util/nodeutils.js b/src/util/nodeutils.js new file mode 100644 index 0000000..e10a31d --- /dev/null +++ b/src/util/nodeutils.js @@ -0,0 +1,12 @@ +module.exports = { + + clear: () => { + + // clear screen + process.stdout.write('\u001b[2J'); + // set cursor position to top + process.stdout.write('\u001b[1;1H'); + + }, + +};