Merge pull request #1717 from hlindset/fix-blueprint-name-errors

Normalize entity name before getting locals

CHANGELOG.md

@@ -1,5 +1,6 @@
 # ember-cli Changelog
 
+* [BUGFIX] Call `normalizeEntityName` hook before `locals` hook [#1717](https://github.com/stefanpenner/ember-cli/pull/1717)
 * [ENHANCEMENT] replace multiple instances of __name__ in blueprints.
 * [ENHANCEMENT] adds http-proxy for explicit, multi proxy use[#1474](https://github.com/stefanpenner/ember-cli/pull/1530)
 * [BREAKING ENHANCEMENT] renames apiStub to http-mock to match other http-related generators [#1474] (https://github.com/stefanpenner/ember-cli/pull/1530)

lib/models/blueprint.js

@@ -215,7 +215,6 @@ Blueprint.prototype.install = function(options) {
   var ui       = this.ui = options.ui;
   var intoDir  = options.target;
   var dryRun   = options.dryRun;
-  var locals   = this._locals(options);
   this.project = options.project;
   this.testing = options.testing;
 
@@ -269,6 +268,8 @@ Blueprint.prototype.install = function(options) {
     options.entity.name = this.normalizeEntityName(options.entity.name);
   }
 
+  var locals = this._locals(options);
+
   return Promise.resolve()
     .then(this.beforeInstall.bind(this, options))
     .then(this.processFiles.bind(this, intoDir, locals)).map(commit)

tests/unit/models/blueprint-test.js

@@ -336,6 +336,16 @@ describe('Blueprint', function() {
             assert.deepEqual(actualFiles, basicBlueprintFiles);
           });
     });
+
+    it('calls normalizeEntityName before locals hook is called', function(done) {
+      blueprint.normalizeEntityName = function(){ return 'foo'; };
+      blueprint.locals = function(options) {
+        assert.equal(options.entity.name, 'foo');
+        done();
+      };
+      options.entity = { name: 'bar' };
+      blueprint.install(options);
+    });
   });
 
   describe('addPackageToProject', function() {