|
1 | 1 | "use strict"; |
2 | | -var utils_1 = require('./utils'); |
| 2 | +var path = require('path'); |
| 3 | +var exists_1 = require('./exists'); |
3 | 4 | var create_runner_1 = require('./create-runner'); |
| 5 | +var pathToResults = path.resolve(__dirname, '', 'report.json'); |
| 6 | +function formatFailureMessage(message) { |
| 7 | + return message.split('_').join(' '); |
| 8 | +} |
4 | 9 | function runner(testFile, config, handleResult) { |
5 | 10 | var runner = create_runner_1.createRunner(config, testFile); |
6 | 11 | var final = null; |
7 | | - var signalMatch = new RegExp(utils_1.signal); |
8 | 12 | return new Promise(function (resolve, reject) { |
9 | 13 | runner.stdout.on('data', function (data) { |
10 | 14 | data = data.toString(); |
11 | 15 | console.log(data); |
12 | | - var match = signalMatch.exec(data); |
13 | | - if (!match) { |
14 | | - console.log(data); |
| 16 | + if (!exists_1.default(pathToResults)) { |
| 17 | + console.log('error finding test output file: ', data); |
15 | 18 | return; |
16 | 19 | } |
17 | | - var resultString = data.substring(match.index + utils_1.signal.length); |
18 | | - var result = JSON.parse(JSON.stringify(resultString)); |
19 | | - if (typeof result === 'string') { |
20 | | - result = JSON.parse(result); |
21 | | - } |
22 | | - if (result.pass) { |
23 | | - final = result.passes[result.passes.length - 1]; |
| 20 | + var result = JSON.parse(require(pathToResults)); |
| 21 | + result = result.included[result.included.length - 1].attributes.call; |
| 22 | + if (result.outcome === 'passed') { |
| 23 | + final = { |
| 24 | + pass: true, |
| 25 | + msg: 'Task ${0} Complete', |
| 26 | + taskPosition: 0 |
| 27 | + }; |
24 | 28 | } |
25 | | - else if (result.pass === false) { |
26 | | - final = result.failures[0]; |
| 29 | + else if (result.outcome === 'failed') { |
| 30 | + final = { |
| 31 | + pass: false, |
| 32 | + msg: formatFailureMessage(), |
| 33 | + taskPosition: 0, |
| 34 | + timedOut: false |
| 35 | + }; |
27 | 36 | } |
28 | 37 | else { |
29 | 38 | console.log('error processing result: ', result); |
|
0 commit comments