Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2a89bba

Browse files
ShMcKShMcK
committed
test setup refactor
1 parent d5839ea commit 2a89bba

File tree

12 files changed

+22
-57
lines changed

12 files changed

+22
-57
lines changed

‎lib/helpers/babelModules.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎lib/helpers/fileExists.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎lib/helpers/overrideRequire.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎lib/helpers/importPaths.js renamed to ‎lib/importPaths.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function fixImportPaths(_a) {
2121
return '';
2222
}
2323
return line;
24-
}).join('\n') + '\n';
24+
}).join('\n');
2525
}
2626
Object.defineProperty(exports, "__esModule", { value: true });
2727
exports.default = fixImportPaths;

‎lib/index.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
"use strict";
2-
var babelModules_1 = require('./helpers/babelModules');
3-
var process_console_log_1 = require('process-console-log');
4-
var fileExists_1 = require('./helpers/fileExists');
5-
var overrideRequire_1 = require('./helpers/overrideRequire');
6-
var importPaths_1 = require('./helpers/importPaths');
2+
var importPaths_1 = require('./importPaths');
73
var jsCodeRoad = function (_a) {
84
var dir = _a.dir, content = _a.content;
9-
return ("(function(){\n'use strict;'\n"
10-
+ '// babel\n' + babelModules_1.default(dir)
11-
+ '// logger\n' + process_console_log_1.logger + '\n'
12-
+ '// file exists\n' + fileExists_1.default(dir)
13-
+ '// overrideRequire\n' + overrideRequire_1.default
14-
+ '// fix imports\n' + importPaths_1.default({ dir: dir, content: content })
15-
+ '}());');
5+
return ("\n(function(){'use strict';\nrequire('babel-register')({plugins:[['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'" + dir + "'}]]});\n" + require('process-console-log').logger + "\nlet _fileExists = require('node-file-exists');\nlet _resolve = require('fs').resolve;\nglobal.exists = (p) => _fileExists(_resolve('" + dir + "',p));\nrequire = require('rewire-coderoad');\n\n// unit tests\n\n" + importPaths_1.default({ dir: dir, content: content }) + "\n\n}());");
166
};
177
Object.defineProperty(exports, "__esModule", { value: true });
188
exports.default = jsCodeRoad;

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "js-coderoad",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "bundled javascript features for coderoad test runners",
55
"keywords": [
66
"coderoad",

‎src/helpers/babelModules.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/helpers/fileExists.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/helpers/overrideRequire.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/helpers/importPaths.ts renamed to ‎src/importPaths.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ import { join } from 'path';
55
fixImportPaths will replace paths with absolute paths
66
*/
77

8-
// import or require statement with BASE
8+
// import or require statement
99
const importPathRegex =
1010
/require\(["'](BASE.+)["']\)([a-zA-Z0-9\-\_]+)?|^import.+?\s?["'](BASE.+)["'];?$/m;
1111
const relativePathRegex = /^BASE/;
1212

1313
export default function fixImportPaths({dir, content}): string {
14-
1514
// collect import lines
1615
let entries = new Set([]);
1716

@@ -38,5 +37,5 @@ export default function fixImportPaths({dir, content}): string {
3837
}
3938
// no match, return line
4039
return line;
41-
}).join('\n') + '\n';
40+
}).join('\n');
4241
}

‎src/index.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import babelModules from './helpers/babelModules';
2-
import { logger } from 'process-console-log';
3-
import fileExists from './helpers/fileExists';
4-
import overrideRequire from './helpers/overrideRequire';
5-
import fixImportPaths from './helpers/importPaths';
1+
import fixImportPaths from './importPaths';
62

7-
const jsCodeRoad = ({dir, content}) => (
8-
`(function(){\n'use strict;'\n`
9-
+ '// babel\n' + babelModules(dir)
10-
+ '// logger\n' + logger + '\n'
11-
+ '// file exists\n' + fileExists(dir)
12-
+ '// overrideRequire\n' + overrideRequire
13-
+ '// fix imports\n' + fixImportPaths({dir, content})
14-
+ '}());'
3+
const jsCodeRoad = ({dir, content}) => (`
4+
(function(){'use strict';
5+
require('babel-register')({plugins:[['transform-es2015-modules-commonjs',{loose:true,sourceRoot:'${dir}'}]]});
6+
${require('process-console-log').logger}
7+
let _fileExists = require('node-file-exists');
8+
let _resolve = require('fs').resolve;
9+
global.exists = (p) => _fileExists(_resolve('${dir}',p));
10+
require = require('rewire-coderoad');
11+
12+
// unit tests
13+
14+
${fixImportPaths({dir, content})}
15+
16+
}());`
1517
);
1618
export default jsCodeRoad;

‎tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
"src/typings/**/*.d.ts"
1717
],
1818
"files": [
19+
"src/importPaths.ts",
1920
"src/index.ts",
20-
"src/helpers/babelModules.ts",
21-
"src/helpers/fileExists.ts",
22-
"src/helpers/importPaths.ts",
23-
"src/helpers/overrideRequire.ts",
2421
"src/rewire-ts/__get__.ts",
2522
"src/rewire-ts/addImportsAsVars.ts",
2623
"src/rewire-ts/fileExists.ts",

0 commit comments

Comments
 (0)