bug(generate): directive selectors are now camelCase

Brocco · filipesilva · commit 97196b82b280 · 2016-09-26T21:48:23.000+01:00
Fixes angular#1216 Close angular#2323
diff --git a/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.ts b/packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.ts
@@ -1,7 +1,7 @@
 import { Directive } from '@angular/core';
 
 @Directive({
-  selector: '[<%= rawEntityName %>]'
+  selector: '[<%= selector %>]'
 })
 export class <%= classifiedModuleName %>Directive {
 
diff --git a/packages/angular-cli/blueprints/directive/index.js b/packages/angular-cli/blueprints/directive/index.js
@@ -31,17 +31,17 @@ module.exports = {
         this.project.ngConfig.apps[0].prefix) {
       defaultPrefix = this.project.ngConfig.apps[0].prefix;
     }
-    var prefix = this.options.prefix ? defaultPrefix : '';
+    var prefix = this.options.prefix ? `${defaultPrefix}-` : '';
 
-    this.rawEntityName = prefix + parsedPath.name;
+    this.selector = stringUtils.camelize(prefix + parsedPath.name);
     return parsedPath.name;
   },
 
   locals: function (options) {
     return {
       dynamicPath: this.dynamicPath.dir,
       flat: options.flat,
-      rawEntityName: this.rawEntityName
+      selector: this.selector
     };
   },
 
diff --git a/tests/acceptance/generate-directive.spec.js b/tests/acceptance/generate-directive.spec.js
@@ -156,4 +156,15 @@ describe('Acceptance: ng generate directive', function () {
       expect(err).to.equal(`Invalid path: "..${path.sep}my-dir" cannot be above the "src${path.sep}app" directory`);
     });
   });
+
+  it('converts dash-cased-name to a camelCasedSelector', () => {
+    const appRoot = path.join(root, 'tmp/foo');
+    const directivePath = path.join(appRoot, 'src/app/my-dir.directive.ts');
+    return ng(['generate', 'directive', 'my-dir'])
+      .then(() => readFile(directivePath, 'utf-8'))
+      .then(content => {
+        // expect(content).matches(/selector: [app-my-dir]/m);
+        expect(content).matches(/selector: '\[appMyDir\]'/);
+      });
+  });
 });
