Skip to content

Commit 10ff005

Browse files
committed
fix options namespace issue
1 parent 9733249 commit 10ff005

10 files changed

+20
-24
lines changed

src/create-runner.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,22 @@ function createRunner(config, tests) {
1818
else {
1919
node = process.execPath;
2020
}
21+
var runnerOptions = setRunnerOptions(config);
2122
return spawn(node, [
2223
'/usr/local/bin/mocha',
2324
'--bail',
24-
("--reporter=" + path.join(__dirname, 'reporter')),
25-
].concat(tests), options);
25+
("--reporter=" + path.join(__dirname, 'reporter'))
26+
].concat(runnerOptions).concat(tests), options);
2627
}
2728
exports.createRunner = createRunner;
29+
function setRunnerOptions(config) {
30+
var runnerOptions = [];
31+
if (!config.testRunnerOptions) {
32+
return runnerOptions;
33+
}
34+
if (config.testRunnerOptions.babel) {
35+
require('babel-core');
36+
runnerOptions.push('--compilers js:babel-core/register');
37+
}
38+
return runnerOptions;
39+
}

src/loaders.js

-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
var vm = require('vm');
2-
var fs = require('fs');
3-
var path = require('path');
4-
global.loadJS = function loadJS(pathToContext) {
5-
var absPath = path.join(process.env.DIR, pathToContext);
6-
var context = fs.readFileSync(absPath, 'utf8');
7-
vm.runInThisContext(context);
8-
};

test/tests/load-context-01.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var expect = require('chai').expect;
2-
var loadContext = require('../utils/loadContext').default;
2+
var loadContext = require('../utils/load-context').default;
33
loadContext('./context/addOne.js');
44

55
describe('load-context-01', function () {

test/tests/load-context-02.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var expect = require('chai').expect;
22
var path = require('path');
3-
var loadContext = require('../utils/loadContext').default;
3+
var loadContext = require('../utils/load-context').default;
44
loadContext('./context/addOne.js');
55
loadContext('./context/subtractOne.js');
66

test/tests/load-context-03.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var expect = require('chai').expect;
22
var path = require('path');
3-
var loadContext = require('../utils/loadContext').default;
3+
var loadContext = require('../utils/load-context').default;
44
loadContext('./context/addOne.js');
55
loadContext('./context/subtractOne.js');
66
var a = JSON.parse(JSON.stringify(require('../context/data.json')));

test/tests/load-file-01.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var expect = require('chai').expect;
22
var path = require('path');
3-
var loadContext = require('../utils/loadContext').default;
3+
var loadContext = require('../utils/load-context').default;
44
global.data = JSON.parse(JSON.stringify(require('../context/data.json')));
55
loadContext('./context/array-method.js');
66

test/tests/load-file-02.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var expect = require('chai').expect;
22
var path = require('path');
3-
var loadContext = require('../utils/loadContext').default;
3+
var loadContext = require('../utils/load-context').default;
44
data = JSON.parse(JSON.stringify(require('../context/data.json')));
55
loadContext('./context/array-method.js');
66

test/tests/loader-js-01.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var expect = require('chai').expect;
2-
var loadJS = require('../utils/loadContext').default;
2+
var loadJS = require('../utils/load-context').default;
33
loadJS('./context/addOne.js');
44

55
describe('loader-js-01', function () {
File renamed without changes.

test/utils/loadContext.ts

-8
This file was deleted.

0 commit comments

Comments
 (0)