Skip to content

Commit 5a5976d

Browse files
committed
fix test
1 parent 3c76a14 commit 5a5976d

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/apps/common.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ export function removeFiles(dir, files: string[]): Promise<string[]> {
3939
return Promise.all(p);
4040
}
4141

42+
export const toNodeModules = (d: string) => resolve(join(d, 'node_modules'));
43+
4244
export function webpackConfig(
4345
resolveModules: string[],
4446
root: string,
@@ -49,7 +51,6 @@ export function webpackConfig(
4951
sourceMaps: boolean = false
5052
) {
5153
outpath = outpath || root;
52-
const modules = (d: string) => resolve(join(d, 'node_modules'));
5354

5455
const base = baseConfig(root);
5556

@@ -60,15 +61,9 @@ export function webpackConfig(
6061
resolve(join(__dirname, '../../node_modules'))
6162
].concat(_.compact(support.modules));
6263

63-
// const resolveModules = [
64-
// modules(dirs.configure),
65-
// modules(dirs.controllers),
66-
// modules(dirs.root),
67-
// ].concat(coreModules);
68-
69-
resolveModules = resolveModules.concat(coreModules);
64+
resolveModules = resolveModules.map(toNodeModules).concat(coreModules);
7065

71-
const resolveLoaderModules = [modules(root)].concat(coreModules);
66+
const resolveLoaderModules = [toNodeModules(root)].concat(coreModules);
7267

7368
const out = _.extend(base, {
7469
context: root,

test/unit/apps/item/index-test.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ describe('item app', () => {
5151
http: {
5252
createServer: stub().returns({})
5353
},
54+
path: {
55+
resolve: stub().returnsArg(0),
56+
join: stub().returnsArg(0)
57+
},
5458
'fs-extra': {
5559
readFileSync: stub().returns(''),
5660
readJsonSync: stub().returns({
@@ -140,7 +144,7 @@ describe('item app', () => {
140144
it('calls webpackConfig', () => {
141145
assert.calledWith(
142146
deps['../common'].webpackConfig,
143-
[dirs.root, dirs.controller],
147+
[dirs.root, dirs.controllers].map(mod.modules),
144148
dirs.root,
145149
match.object,
146150
'item.entry.js',

0 commit comments

Comments
 (0)