bug(generate): fix relative path module generations

Author: Brocco

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

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

tests/e2e/tests/generate/module/module-relative-path.ts

@@ -0,0 +1,26 @@
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectFileToExist, createDir} from '../../../utils/fs';
+import {expectToFail} from '../../../utils/utils';
+
+
+export default function() {
+  const moduleDir = join('src', 'app', 'test-module');
+
+
+  return Promise.resolve()
+    .then(() => createDir('src/app/fldr'))
+    .then(() => process.chdir('./src/app/fldr'))
+    .then(() => process.env.PWD = process.cwd()))
+    .then(() => ng('generate', 'module', '../test-module'))
+    .then(() => expectFileToExist(moduleDir))
+    .then(() => expectFileToExist(join(moduleDir, 'test-module.module.ts')))
+    .then(() => expectToFail(() => expectFileToExist(join(moduleDir, 'test-module.routing.ts'))))
+    .then(() => expectFileToExist(join(moduleDir, 'test-module.component.ts')))
+    .then(() => expectFileToExist(join(moduleDir, 'test-module.component.spec.ts')))
+    .then(() => expectFileToExist(join(moduleDir, 'test-module.component.html')))
+    .then(() => expectFileToExist(join(moduleDir, 'test-module.component.css')))
+
+    // Try to run the unit tests.
+    .then(() => ng('test', '--single-run'));
+}

tests/e2e_runner.js

@@ -91,9 +91,11 @@ testsToRun.reduce((previous, relativeName) => {
         throw new Error('Invalid test module.');
       };
 
+    let currentDir = null;
     let clean = true;
     return Promise.resolve()
       .then(() => printHeader(currentFileName))
+      .then(() => currentDir = process.cwd())
       .then(() => fn(argv, () => clean = false))
       .then(() => console.log('  ----'))
       .then(() => {
@@ -103,6 +105,11 @@ testsToRun.reduce((previous, relativeName) => {
           return gitClean();
         }
       })
+      .then(() => {
+        if (allSetups.indexOf(relativeName) == -1) {
+          process.chdir(currentDir);
+        }
+      })
       .then(() => printFooter(currentFileName, start),
             (err) => {
               printFooter(currentFileName, start);