Skip to content

Commit af4897f

Browse files
committed
merge helpers into a single file
1 parent a2a632e commit af4897f

14 files changed

+36
-47
lines changed

lib/writeTests/context.js

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/writeTests/helpers.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
function helpers(projectDir) {
3+
return "\n // run time compiler\n require('babel-core/register')({plugins: [['transform-es2015-modules-commonjs',{\n loose:true}]]});\n\n // fileExists test helper\n function fileExists(e,r){void 0===r&&(r=!0);try{accessSync(e,F_OK)}catch(c){if(c)return r||console.log(c),!1}return!0}var _require=require(\"fs\"),accessSync=_require.accessSync,F_OK=_require.F_OK,_require2=require(\"path\"),resolve=_require2.resolve;function exists(p){return fileExists(resolve('" + projectDir + "',p))}\n\n // overwrite require to catch globals in tests\n require = require('rewire');\n ";
4+
}
5+
Object.defineProperty(exports, "__esModule", { value: true });
6+
exports.default = helpers;
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"use strict";
2-
var babelRegister = "// run time compiler\nrequire('babel-core/register')({plugins: [['transform-es2015-modules-commonjs',{\nloose:true}]]});\n\n";
2+
var babelRegister = "";
33
Object.defineProperty(exports, "__esModule", { value: true });
44
exports.default = babelRegister;

lib/writeTests/helpers/exists.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
function default_1(projectDir) {
3-
return "function fileExists(e,r){void 0===r&&(r=!0);try{accessSync(e,F_OK)}catch(c){if(c)return r||console.log(c),!1}return!0}var _require=require(\"fs\"),accessSync=_require.accessSync,F_OK=_require.F_OK,_require2=require(\"path\"),resolve=_require2.resolve;function exists(p){return fileExists(resolve('" + projectDir + "',p))}\n\n";
3+
return "function fileExists(e,r){void 0===r&&(r=!0);try{accessSync(e,F_OK)}catch(c){if(c)return r||console.log(c),!1}return!0}var _require=require(\"fs\"),accessSync=_require.accessSync,F_OK=_require.F_OK,_require2=require(\"path\"),resolve=_require2.resolve;function exists(p){return fileExists(resolve('" + projectDir + "',p))}\n";
44
}
55
Object.defineProperty(exports, "__esModule", { value: true });
66
exports.default = default_1;

lib/writeTests/helpers/rewire.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"use strict";
2-
var rewire = "require = require('rewire');";
2+
var rewire = "require = require('rewire');\n";
33
Object.defineProperty(exports, "__esModule", { value: true });
44
exports.default = rewire;

lib/writeTests/index.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
var fs_1 = require('fs');
33
var process_console_log_1 = require('process-console-log');
44
var import_paths_1 = require('./import-paths');
5-
var exists_1 = require('./helpers/exists');
6-
var babel_register_1 = require('./helpers/babel-register');
7-
var rewire_1 = require('./helpers/rewire');
5+
var helpers_1 = require('./helpers');
86
function writeTest(_a) {
97
var dir = _a.dir, tests = _a.tests, testPath = _a.testPath;
108
var fixImports = import_paths_1.default(dir, tests);
119
var output = '(function(){\n'
12-
.concat('// run time compiler\n' + babel_register_1.default)
13-
.concat('// override console.log\n' + process_console_log_1.logger)
14-
.concat('// file exists function\n' + exists_1.default(dir))
15-
.concat('// rewire\n' + rewire_1.default)
10+
.concat(process_console_log_1.logger)
11+
.concat(helpers_1.default(dir))
1612
.concat(fixImports)
1713
.concat('\n}());');
1814
return new Promise(function (resolve, reject) {

package.json

-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
"test": "echo \"Error: no test specified\" && exit 1"
2727
},
2828
"dependencies": {
29-
"babel-core": "^6.13.2",
3029
"babel-plugin-transform-es2015-modules-commonjs": "^6.11.5",
31-
"babel-preset-es2015": "^6.13.2",
3230
"babel-register": "^6.11.6",
3331
"mocha": "^3.0.1",
3432
"node-file-exists": "^1.1.0",

src/writeTests/compiler.ts

-11
This file was deleted.

src/writeTests/helpers.ts

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
export default function helpers(projectDir) {
2+
return `
3+
// run time compiler
4+
require('babel-core/register')({plugins: [['transform-es2015-modules-commonjs',{
5+
loose:true}]]});
6+
7+
// fileExists test helper
8+
function fileExists(e,r){void 0===r&&(r=!0);try{accessSync(e,F_OK)}catch(c){if(c)return r||console.log(c),!1}return!0}var _require=require("fs"),accessSync=_require.accessSync,F_OK=_require.F_OK,_require2=require("path"),resolve=_require2.resolve;function exists(p){return fileExists(resolve('${projectDir}',p))}
9+
10+
// overwrite require to catch globals in tests
11+
require = require('rewire');
12+
`;
13+
}

src/writeTests/helpers/babel-register.ts

-4
This file was deleted.

src/writeTests/helpers/exists.ts

-3
This file was deleted.

src/writeTests/helpers/rewire.ts

-2
This file was deleted.

src/writeTests/index.ts

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import {writeFile} from 'fs';
22
import {logger} from 'process-console-log';
33
import importPaths from './import-paths';
4-
import exists from './helpers/exists';
5-
// import compiler from './compiler';
6-
import babelRegister from './helpers/babel-register';
7-
import rewire from './helpers/rewire';
4+
import helpers from './helpers';
85

96
export default function writeTest({ dir, tests, testPath }) {
107

@@ -13,14 +10,12 @@ export default function writeTest({ dir, tests, testPath }) {
1310
// const compiled = compiler(fixImports);
1411

1512
const output = '(function(){\n'
16-
// babel hook to handle import / export in other files
17-
.concat('// run time compiler\n' + babelRegister)
1813
// append logger for capturing log values and types
19-
.concat('// override console.log\n' + logger)
20-
// exists polyfill for file/folder exists checks
21-
.concat('// file exists function\n' + exists(dir))
22-
// allow access to module globals
23-
.concat('// rewire\n' + rewire)
14+
.concat(logger)
15+
// 1. babel hook to handle import / export in other files
16+
// 2. exists polyfill for file/folder exists checks
17+
// 3. allow access to module globals
18+
.concat(helpers(dir))
2419
// fixed imports
2520
.concat(fixImports)
2621
.concat('\n}());');

tsconfig.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@
3535
"src/typings/process-console-log/index.d.ts",
3636
"src/typings/set/set.d.ts",
3737
"src/typings/tsd.d.ts",
38-
"src/writeTests/compiler.ts",
39-
"src/writeTests/helpers/babel-register.ts",
40-
"src/writeTests/helpers/exists.ts",
41-
"src/writeTests/helpers/rewire.ts",
38+
"src/writeTests/helpers.ts",
4239
"src/writeTests/import-paths.ts",
4340
"src/writeTests/index.ts"
4441
],

0 commit comments

Comments
 (0)