@@ -177,6 +177,10 @@ describe('Schematic Tests Nest Add', () => {
177
177
'/package.json' ,
178
178
'/tsconfig.build.json' ,
179
179
'/tsconfig.json' ,
180
+ '/.funcignore' ,
181
+ '/host.json' ,
182
+ '/local.settings.json' ,
183
+ '/proxies.json' ,
180
184
'/src/app.controller.spec.ts' ,
181
185
'/src/app.controller.ts' ,
182
186
'/src/app.module.ts' ,
@@ -186,22 +190,18 @@ describe('Schematic Tests Nest Add', () => {
186
190
'/test/jest-e2e.json' ,
187
191
'/apps/nestjs-azure-func-http/tsconfig.app.json' ,
188
192
`/apps/${ projectName } /tsconfig.app.json` ,
189
- `/apps/${ projectName } /webpack.config.js` ,
190
193
`/apps/${ projectName } /src/app.controller.spec.ts` ,
191
194
`/apps/${ projectName } /src/app.controller.ts` ,
192
195
`/apps/${ projectName } /src/app.module.ts` ,
193
196
`/apps/${ projectName } /src/app.service.ts` ,
194
197
`/apps/${ projectName } /src/main.ts` ,
195
- `/apps/${ projectName } /src/.funcignore` ,
196
- `/apps/${ projectName } /src/host.json` ,
197
- `/apps/${ projectName } /src/local.settings.json` ,
198
198
`/apps/${ projectName } /src/main.azure.ts` ,
199
- `/apps/${ projectName } /src/proxies.json` ,
200
- `/apps/${ projectName } /src/main/function.json` ,
201
- `/apps/${ projectName } /src/main/index.ts` ,
202
- `/apps/${ projectName } /src/main/sample.dat` ,
203
199
`/apps/${ projectName } /test/app.e2e-spec.ts` ,
204
- `/apps/${ projectName } /test/jest-e2e.json`
200
+ `/apps/${ projectName } /test/jest-e2e.json` ,
201
+ `/${ projectName } /function.json` ,
202
+ `/${ projectName } /index.ts` ,
203
+ `/${ projectName } /sample.dat` ,
204
+ `/${ projectName } /webpack.config.js`
205
205
] ) ;
206
206
} ) ;
207
207
@@ -288,13 +288,10 @@ describe('Schematic Tests Nest Add', () => {
288
288
const tree = await runner
289
289
. runSchematicAsync ( 'nest-add' , options , nestTree )
290
290
. toPromise ( ) ;
291
- const fileContent = getFileContent (
292
- tree ,
293
- `/apps/${ projectName } /src/main/index.ts`
294
- ) ;
291
+ const fileContent = getFileContent ( tree , `/${ projectName } /index.ts` ) ;
295
292
296
293
expect ( fileContent ) . toContain (
297
- `import { createApp } from '../main.azure';`
294
+ `import { createApp } from '../apps/ ${ projectName } /src/ main.azure';`
298
295
) ;
299
296
} ) ;
300
297
@@ -323,11 +320,9 @@ describe('Schematic Tests Nest Add', () => {
323
320
324
321
const fileContent = getFileContent (
325
322
tree ,
326
- `/apps/${ projectName } /webpack.config.js`
327
- ) ;
328
- expect ( fileContent ) . toContain (
329
- `filename: 'apps/${ projectName } /main/index.js'`
323
+ `/${ projectName } /webpack.config.js`
330
324
) ;
325
+ expect ( fileContent ) . toContain ( `filename: '${ projectName } /index.js'` ) ;
331
326
} ) ;
332
327
333
328
it ( 'should add a custom webpack config to the compilerOptions for monorepo app' , async ( ) => {
@@ -358,7 +353,7 @@ describe('Schematic Tests Nest Add', () => {
358
353
expect ( compilerOptions ) . toEqual ( {
359
354
tsConfigPath : `apps/${ projectName } /tsconfig.app.json` ,
360
355
webpack : true ,
361
- webpackConfigPath : `apps/ ${ projectName } /webpack.config.js`
356
+ webpackConfigPath : `${ projectName } /webpack.config.js`
362
357
} ) ;
363
358
} ) ;
364
359
@@ -385,14 +380,9 @@ describe('Schematic Tests Nest Add', () => {
385
380
. runSchematicAsync ( 'nest-add' , options , nestTree )
386
381
. toPromise ( ) ;
387
382
388
- const fileContent = getFileContent (
389
- tree ,
390
- `apps/${ projectName } /src/main/function.json`
391
- ) ;
383
+ const fileContent = getFileContent ( tree , `${ projectName } /function.json` ) ;
392
384
const parsedFile = JSON . parse ( fileContent ) ;
393
- expect ( parsedFile . scriptFile ) . toEqual (
394
- '../../../../dist/apps/azure-2/main/index.js'
395
- ) ;
385
+ expect ( parsedFile . scriptFile ) . toEqual ( `../dist/${ projectName } /index.js` ) ;
396
386
} ) ;
397
387
} ) ;
398
388
0 commit comments