fix(generate): fix module component path if module is created in child folder

fixes #3063

Author: Meligy

packages/angular-cli/blueprints/module/index.js

@@ -58,7 +58,9 @@ module.exports = {
   },
 
   afterInstall: function (options) {
-    options.entity.name = path.join(this.dasherizedModuleName, this.dasherizedModuleName);
+    var componentPath = path.join(this.generatePath, this.dasherizedModuleName);
+        
+    options.entity.name = path.relative(this.dynamicPath.appRoot, componentPath);
     options.flat = true;
     options.route = false;
     options.inlineTemplate = false;

tests/acceptance/generate-module.spec.js

@@ -56,4 +56,14 @@ describe('Acceptance: ng generate module', function () {
       expect(existsSync(path.join(testPath, 'two-word', 'two-word.module.spec.ts'))).to.equal(false);
     });
   });
+
+  it('ng generate module parent/child', function () {
+    return ng(['generate', 'module', 'parent']).then(() =>
+      ng(['generate', 'module', 'parent/child']).then(() => {
+        expect(existsSync(path.join(testPath, 'parent/child', 'child.module.ts'))).to.equal(true);
+        expect(existsSync(path.join(testPath, 'parent/child', 'child.module.spec.ts'))).to.equal(false);
+        expect(existsSync(path.join(testPath, 'parent/child', 'child.component.ts'))).to.equal(true);
+      })
+    );
+  });
 });