bug(generate): ensure classes and imports are in lower case (#2920)

Fixes #2833
angular · Nov 1, 2016 · cabc9dc · cabc9dc
1 parent 30cc482
commit cabc9dc
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/packages/angular-cli/blueprints/component/index.js b/packages/angular-cli/blueprints/component/index.js
@@ -124,7 +124,7 @@ module.exports = {
     const returns = [];
     const className = stringUtils.classify(`${options.entity.name}Component`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
-    const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath);
+    const componentDir = path.relative(path.dirname(this.pathToModule), this.generatePath).toLowerCase();
     const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {

diff --git a/packages/angular-cli/blueprints/directive/index.js b/packages/angular-cli/blueprints/directive/index.js
@@ -87,7 +87,7 @@ module.exports = {
     const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
     const fullGeneratePath = path.join(this.project.root, this.generatePath);
     const moduleDir = path.parse(this.pathToModule).dir;
-    const relativeDir = path.relative(moduleDir, fullGeneratePath);
+    const relativeDir = path.relative(moduleDir, fullGeneratePath).toLowerCase();
     const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {

diff --git a/packages/angular-cli/blueprints/pipe/index.js b/packages/angular-cli/blueprints/pipe/index.js
@@ -75,7 +75,7 @@ module.exports = {
     const fileName = stringUtils.dasherize(`${options.entity.name}.pipe`);
     const fullGeneratePath = path.join(this.project.root, this.generatePath);
     const moduleDir = path.parse(this.pathToModule).dir;
-    const relativeDir = path.relative(moduleDir, fullGeneratePath);
+    const relativeDir = path.relative(moduleDir, fullGeneratePath).toLowerCase();
     const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {

diff --git a/tests/e2e/tests/generate/component.ts → ...sts/generate/component/component-basic.ts b/tests/e2e/tests/generate/component.ts → ...sts/generate/component/component-basic.ts
@@ -1,6 +1,6 @@
 import {join} from 'path';
-import {ng} from '../../utils/process';
-import {expectFileToExist} from '../../utils/fs';
+import {ng} from '../../../utils/process';
+import {expectFileToExist} from '../../../utils/fs';
 
 
 export default function() {

diff --git a/tests/e2e/tests/generate/component/component-path-case.ts b/tests/e2e/tests/generate/component/component-path-case.ts
@@ -0,0 +1,20 @@
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectFileToExist, createDir} from '../../../utils/fs';
+
+
+export default function() {
+  const rootDir = join('src', 'app', 'upper-dir');
+  const componentDir = join(rootDir.toLowerCase(), 'test-component');
+  createDir(rootDir);
+
+  return ng('generate', 'component', 'Upper-Dir', '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')))
+
+    // Try to run the unit tests.
+    .then(() => ng('test', '--watch=false'));
+}