fix(@angular/cli): Revert changes to test files

Author: Brocco

tests/e2e/tests/build/aot/aot-decorators.ts

@@ -1,5 +1,5 @@
 import {ng} from '../../../utils/process';
-import { appendToFile, expectFileToMatch, prependToFile, replaceInFile } from '../../../utils/fs';
+import {appendToFile, expectFileToMatch, prependToFile, replaceInFile} from '../../../utils/fs';
 import {expectToFail} from '../../../utils/utils';
 
 export default function() {

tests/e2e/tests/generate/component/component-path-case.ts

@@ -10,13 +10,13 @@ export default function() {
   const componentDir = join(rootDir, 'test-component');
   const componentTwoDir = join(rootDir, 'test-component-two');
 
-  return ng('generate', 'component', join(upperDirs, 'test-component'))
+  return ng('generate', 'component', `${upperDirs}/test-component`)
     .then(() => expectFileToExist(componentDir))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.ts')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.spec.ts')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.html')))
     .then(() => expectFileToExist(join(componentDir, 'test-component.component.css')))
-    .then(() => ng('generate', 'component', join(upperDirs, 'Test-Component-Two')))
+    .then(() => ng('generate', 'component', `${upperDirs}/Test-Component-Two`))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.ts')))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.spec.ts')))
     .then(() => expectFileToExist(join(componentTwoDir, 'test-component-two.component.html')))

tests/e2e/tests/generate/interface.ts

@@ -6,7 +6,7 @@ import {expectFileToExist} from '../../utils/fs';
 export default function() {
   const interfaceDir = join('src', 'app');
 
-  return ng('generate', 'interface', 'test-interface', '--type', 'model')
+  return ng('generate', 'interface', 'test-interface', 'model')
     .then(() => expectFileToExist(interfaceDir))
     .then(() => expectFileToExist(join(interfaceDir, 'test-interface.model.ts')))
 

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

@@ -33,12 +33,12 @@ export default function () {
     .then(() => expectFileToMatch(join('src', 'app', 'test4', 'test4.module.ts'),
       /imports: \[(.|\s)*Test4RoutingModule(.|\s)*\]/m))
 
-    .then(() => ng('generate', 'module', 'test5', '--module', join('sub', 'sub')))
+    .then(() => ng('generate', 'module', 'test5', '--module', 'sub'))
     .then(() => expectFileToMatch(subModulePath,
       /import { Test5Module } from '..\/test5\/test5.module'/))
     .then(() => expectFileToMatch(subModulePath, /imports: \[(.|\s)*Test5Module(.|\s)*\]/m))
 
-    .then(() => ng('generate', 'module', 'test6', '--module', join('sub', 'deep', 'deep'))
+    .then(() => ng('generate', 'module', 'test6', '--module', join('sub', 'deep'))
     .then(() => expectFileToMatch(deepSubModulePath,
       /import { Test6Module } from '..\/..\/test6\/test6.module'/))
     .then(() => expectFileToMatch(deepSubModulePath, /imports: \[(.|\s)*Test6Module(.|\s)*\]/m)));