fix(@angular/cli): fix component not finding closest module

fixes angular#5127

Author: delasteve

packages/@angular/cli/blueprints/component/index.ts

@@ -95,8 +95,7 @@ export default Blueprint.extend({
       }
     } else {
       try {
-        this.pathToModule = findParentModule(
-          this.project.root, appConfig.root, this.dynamicPath.dir);
+        this.pathToModule = findParentModule(this.project.root, appConfig.root, this.generatePath);
       } catch (e) {
         if (!options.skipImport) {
           throw `Error locating module for declaration\n\t${e}`;

tests/e2e/tests/generate/component/component-in-existing-module-dir.ts

@@ -0,0 +1,13 @@
+import { join } from 'path';
+import { ng } from '../../../utils/process';
+import { expectFileToMatch } from '../../../utils/fs';
+
+
+export default function () {
+  const modulePath = join('src', 'app', 'foo', 'foo.module.ts');
+
+  return Promise.resolve()
+    .then(() => ng('generate', 'module', 'foo'))
+    .then(() => ng('generate', 'component', 'foo'))
+    .then(() => expectFileToMatch(modulePath, /import { FooComponent } from '.\/foo.component'/));
+}