File tree 2 files changed +8
-3
lines changed
packages/angular-cli/blueprints/module
tests/e2e/tests/generate/module
2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -58,8 +58,12 @@ module.exports = {
58
58
} ,
59
59
60
60
afterInstall : function ( options ) {
61
- options . entity . name = path . relative ( this . dynamicPath . appRoot , this . generatePath ) ;
62
- options . flat = false ;
61
+ // Note that `this.generatePath` already contains `this.dasherizedModuleName`
62
+ // So, the path will end like `name/name`,
63
+ // which is correct for `name.component.ts` created in module `name`
64
+ var componentPath = path . join ( this . generatePath , this . dasherizedModuleName ) ;
65
+ options . entity . name = path . relative ( this . dynamicPath . appRoot , componentPath ) ;
66
+ options . flat = true ;
63
67
options . route = false ;
64
68
options . inlineTemplate = false ;
65
69
options . inlineStyle = false ;
Original file line number Diff line number Diff line change 1
1
import { join } from 'path' ;
2
2
import { ng } from '../../../utils/process' ;
3
- import { expectFileToExist } from '../../../utils/fs' ;
3
+ import { expectFileToExist , expectFileToMatch } from '../../../utils/fs' ;
4
4
import { expectToFail } from '../../../utils/utils' ;
5
5
6
6
@@ -15,6 +15,7 @@ export default function() {
15
15
. then ( ( ) => expectFileToExist ( join ( moduleDir , 'test-module.component.spec.ts' ) ) )
16
16
. then ( ( ) => expectFileToExist ( join ( moduleDir , 'test-module.component.html' ) ) )
17
17
. then ( ( ) => expectFileToExist ( join ( moduleDir , 'test-module.component.css' ) ) )
18
+ . then ( ( ) => expectFileToMatch ( join ( moduleDir , 'test-module.module.ts' ) , 'TestModuleComponent' ) )
18
19
19
20
// Try to run the unit tests.
20
21
. then ( ( ) => ng ( 'test' , '--single-run' ) ) ;
You can’t perform that action at this time.
0 commit comments