Skip to content

Commit 84fc781

Browse files
ShMcKShMcK
committed
faster test runner
1 parent 02102b0 commit 84fc781

27 files changed

+301
-300
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mocha-coderoad",
3-
"version": "0.2.2",
3+
"version": "0.3.0",
44
"description": "mocha test runner & reporter for atom-coderoad",
55
"main": "src/runner.js",
66
"scripts": {

‎src/create-runner.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var path = require('path');
33
var spawn = require('child_process').spawn;
4-
function createRunner(config, tests) {
4+
function createRunner(config, testFile) {
55
var options = {
66
cwd: config.dir
77
};
@@ -18,13 +18,13 @@ function createRunner(config, tests) {
1818
else {
1919
node = process.execPath;
2020
}
21-
var runnerOptions = [];
2221
return spawn(node, [
2322
'/usr/local/bin/mocha',
2423
'--bail',
2524
'--harmony',
2625
'--no-colors',
27-
("--reporter=" + path.join(__dirname, 'reporter'))
28-
].concat(tests), options);
26+
("--reporter=" + path.join(__dirname, 'reporter')),
27+
testFile
28+
], options);
2929
}
3030
exports.createRunner = createRunner;

‎src/loaders.js

Whitespace-only changes.

‎src/reporter.js

+21-9
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,37 @@ function reporter(runner) {
55
var result = {
66
passes: [],
77
failures: [],
8-
failedAtFile: null
8+
pass: true
99
};
1010
runner.on('pass', function (test) {
11+
var title = test.fullTitle();
12+
var obj = getIndexAndTitle(title);
1113
result.passes.push({
12-
msg: test.fullTitle(),
13-
file: test.file
14+
msg: "Task " + obj.index + " Complete",
15+
taskPosition: obj.index - 1
1416
});
1517
});
1618
runner.on('fail', function (test, err) {
19+
var title = test.fullTitle();
20+
var obj = getIndexAndTitle(title);
1721
result.failures.push({
18-
msg: test.fullTitle(),
19-
file: test.file,
20-
body: test.body,
21-
timedOut: test.timedOut,
22-
duration: test.duration
22+
msg: obj.msg,
23+
taskPosition: obj.index - 1,
24+
timedOut: test.timedOut
2325
});
24-
result.failedAtFile = test.file;
26+
result.pass = false;
2527
});
2628
runner.on('end', function () {
2729
process.stdout.write(utils_1.signal + JSON.stringify(result, null, 2));
2830
});
31+
function getIndexAndTitle(title) {
32+
var indexString = title.match(/^[0-9]+/);
33+
if (!indexString) {
34+
throw 'Tests should begin with a number, indicating the task number';
35+
}
36+
return {
37+
index: parseInt(indexString[0]),
38+
msg: title.slice(indexString[0].length + 1)
39+
};
40+
}
2941
}

‎src/runner.js

+24-49
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,48 @@
11
"use strict";
22
var utils_1 = require('./utils');
33
var create_runner_1 = require('./create-runner');
4-
function runner(files, config, handleResult, handleLog) {
5-
var tests = utils_1.concatAll(files);
6-
var runner = create_runner_1.createRunner(config, tests);
7-
var result = {
8-
pass: false,
9-
taskPosition: 0,
10-
failedAtFile: null,
11-
msg: null
12-
};
4+
;
5+
function runner(testFile, config, handleResult, handleLog) {
6+
var runner = create_runner_1.createRunner(config, testFile);
7+
var final = null;
8+
var signalMatch = new RegExp(utils_1.signal);
139
return new Promise(function (resolve, reject) {
1410
runner.stdout.on('data', function (data) {
15-
var signalMatch = new RegExp(utils_1.signal);
1611
var match = signalMatch.exec(data);
17-
if (!!match) {
18-
var printed = data.toString().substring(0, match.index);
19-
if (!!printed.length) {
20-
var start = printed.substring(0, printed.length / files.length);
21-
var end = printed.substring(printed.length / files.length, printed.length);
22-
var message = '';
23-
if (start === end) {
24-
message = start;
25-
}
26-
else {
27-
message = printed;
28-
}
29-
handleLog(message);
30-
}
31-
var testResultString = data.toString().substring(match.index + utils_1.signal.length);
32-
var testResult = JSON.parse(JSON.stringify(testResultString));
33-
if (typeof testResult === 'string') {
34-
testResult = JSON.parse(testResult);
35-
}
36-
if (testResult.failedAtFile) {
37-
result.taskPosition = findFailureTestPosition(files, testResult.failedAtFile);
38-
result.msg = testResult.failures[0].msg;
39-
result.failedAtFile = testResult.failedAtFile;
40-
}
41-
else {
42-
result.taskPosition = files.length;
43-
result.msg = testResult.passes[testResult.passes.length - 1].msg;
12+
if (!match) {
13+
throw 'Result test data doesn\'t match signal string', data.toString();
14+
}
15+
if (match.index > 0) {
16+
var log = data.toString().substring(0, match.index);
17+
if (!!log.length) {
18+
handleLog(log);
4419
}
4520
}
21+
var resultString = data.toString().substring(match.index + utils_1.signal.length);
22+
var result = JSON.parse(JSON.stringify(resultString));
23+
if (typeof result === 'string') {
24+
result = JSON.parse(result);
25+
}
26+
if (!result.pass) {
27+
final = result.failures[0];
28+
}
4629
else {
47-
console.log('Result test data doesn\'t match signal string', data.toString());
30+
final = result.passes[result.passes.length - 1];
4831
}
49-
handleResult(result);
32+
handleResult(final);
5033
});
5134
runner.stderr.on('data', function (data) {
5235
console.log('test error', data.toString());
5336
});
5437
runner.on('close', function (code) {
5538
if (code === 0) {
56-
resolve(result);
39+
resolve(final);
5740
}
5841
else {
59-
resolve(result);
42+
resolve(final);
6043
}
6144
});
6245
});
6346
}
6447
Object.defineProperty(exports, "__esModule", { value: true });
6548
exports.default = runner;
66-
function findFailureTestPosition(files, file) {
67-
for (var i = 0; i < files.length; i++) {
68-
if (files[i].indexOf(file) > -1) {
69-
return i;
70-
}
71-
}
72-
return 0;
73-
}

‎src/utils.js

-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
11
"use strict";
22
exports.signal = '@@@CodeRoad Results@@@';
3-
function concatAll(items) {
4-
var results = [];
5-
items.forEach(function (subArray) {
6-
subArray.forEach(function (item) {
7-
results.push(item);
8-
});
9-
});
10-
return results;
11-
}
12-
exports.concatAll = concatAll;

‎test/babel.spec.js

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
var chai = require('chai');
2-
var chaiAsPromised = require("chai-as-promised");
3-
4-
chai.use(chaiAsPromised);
5-
var expect = chai.expect;
6-
7-
var getRunner = require('./utils/runner').getRunner;
8-
var getBabelRunner = require('./utils/babel-runner').getRunner;
9-
10-
describe('babel', function() {
11-
12-
it('should load tests written in es6', function() {
13-
var files = [
14-
['./babel-01.js']
15-
];
16-
var run = getRunner(files);
17-
var expected = {
18-
pass: true,
19-
taskPosition: 1,
20-
failedAtFile: null,
21-
msg: 'babel-01 should pass'
22-
};
23-
24-
return expect(run).to.eventually.deep.equal(expected);
25-
});
26-
27-
it('should compile files before running tests', function() {
28-
var files = [
29-
['./babel-02.js']
30-
];
31-
var run = getBabelRunner(files);
32-
var expected = {
33-
pass: true,
34-
taskPosition: 1,
35-
failedAtFile: null,
36-
msg: 'babel-02 should pass'
37-
};
38-
39-
return expect(run).to.eventually.deep.equal(expected);
40-
});
41-
42-
});
1+
// var chai = require('chai');
2+
// var chaiAsPromised = require("chai-as-promised");
3+
//
4+
// chai.use(chaiAsPromised);
5+
// var expect = chai.expect;
6+
//
7+
// var getRunner = require('./utils/runner').getRunner;
8+
// var getBabelRunner = require('./utils/babel-runner').getRunner;
9+
//
10+
// describe('babel', function() {
11+
//
12+
// it('should load tests written in es6', function() {
13+
// var files = [
14+
// ['./babel-01.js']
15+
// ];
16+
// var run = getRunner(files);
17+
// var expected = {
18+
// pass: true,
19+
// taskPosition: 1,
20+
// failedAtFile: null,
21+
// msg: 'babel-01 should pass'
22+
// };
23+
//
24+
// return expect(run).to.eventually.deep.equal(expected);
25+
// });
26+
//
27+
// it('should compile files before running tests', function() {
28+
// var files = [
29+
// ['./babel-02.js']
30+
// ];
31+
// var run = getBabelRunner(files);
32+
// var expected = {
33+
// pass: true,
34+
// taskPosition: 1,
35+
// failedAtFile: null,
36+
// msg: 'babel-02 should pass'
37+
// };
38+
//
39+
// return expect(run).to.eventually.deep.equal(expected);
40+
// });
41+
//
42+
// });

0 commit comments

Comments
 (0)