test(@angular/cli): Add more tests for running 'generate' in a subdirectory (#7135)

Author: andrewkww

tests/e2e/tests/generate/component/component-module.ts

@@ -19,6 +19,11 @@ export default function() {
     .then(() => expectFileToMatch(modulePath,
       /import { TestComponent2Component } from '.\/test-component2\/test-component2.component'/))
 
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'component', 'test-component3', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestComponent3Component } from '.\/test-component3\/test-component3.component'/))
+
     // Try to run the unit tests.
     .then(() => ng('build'));
 }

tests/e2e/tests/generate/directive/directive-module.ts

@@ -19,6 +19,11 @@ export default function() {
     .then(() => expectFileToMatch(modulePath,
       /import { TestDirective2Directive } from '.\/test-directive2.directive'/))
 
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'directive', 'test-directive3', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestDirective3Directive } from '.\/test-directive3.directive'/))
+
     // Try to run the unit tests.
     .then(() => ng('build'));
 }

tests/e2e/tests/generate/guard/guard-module.ts

@@ -21,5 +21,10 @@ export default function() {
     .then(() => expectFileToMatch(modulePath,
       /import { TestGuard2Guard } from '.\/test-guard2.guard'/))
 
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'guard', 'test-guard3', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestGuard3Guard } from '.\/test-guard3.guard'/))
+
     .then(() => ng('build'));
 }

tests/e2e/tests/generate/module/module-import.ts

@@ -52,4 +52,10 @@ export default function () {
     .then(() => expectFileToMatch(modulePath,
       /import { Test7Module } from '.\/test7\/test7.module'/))
     .then(() => expectFileToMatch(modulePath, /imports: \[(.|\s)*Test7Module(.|\s)*\]/m))
+
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'module', 'test8', '--module', 'app.module.ts')))
+    .then(() => expectFileToMatch(modulePath,
+      /import { Test8Module } from '.\/test8\/test8.module'/))
+    .then(() => expectFileToMatch(modulePath, /imports: \[(.|\s)*Test8Module(.|\s)*\]/m))
 }

tests/e2e/tests/generate/pipe/pipe-module.ts

@@ -19,6 +19,11 @@ export default function() {
     .then(() => expectFileToMatch(modulePath,
       /import { TestPipe2Pipe } from '.\/test-pipe2.pipe'/))
 
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'pipe', 'test-pipe3', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestPipe3Pipe } from '.\/test-pipe3.pipe'/))
+
     // Try to run the unit tests.
     .then(() => ng('build'));
 }

tests/e2e/tests/generate/service/service-module.ts

@@ -19,6 +19,11 @@ export default function() {
     .then(() => expectFileToMatch(modulePath,
       /import { TestService2Service } from '.\/test-service2.service'/))
 
+    .then(() => process.chdir(join(root, 'src', 'app', 'sub-dir')))
+    .then(() => ng('generate', 'service', 'test-service3', '--module', 'app.module.ts'))
+    .then(() => expectFileToMatch(modulePath,
+      /import { TestService3Service } from '.\/test-service3.service'/))
+
     // Try to run the unit tests.
     .then(() => ng('build'));
 }