diff --git a/index.js b/index.js index b960a316..72c2b63b 100644 --- a/index.js +++ b/index.js @@ -252,7 +252,7 @@ module.exports = { if (this.parent.isEmberCLIAddon()) { return this._findCoveredAddon().name; } else { - return this.parent.name; + return this.parent.name(); } }, diff --git a/test/unit/index-test.js b/test/unit/index-test.js index 85f946d6..2b542be6 100644 --- a/test/unit/index-test.js +++ b/test/unit/index-test.js @@ -256,6 +256,9 @@ describe('index.js', function() { Index.parent = { isEmberCLIAddon: function() { return false; + }, + name: function() { + return 'test'; } }; }); @@ -403,7 +406,9 @@ describe('index.js', function() { beforeEach(function() { Index.parent = { - name: 'parent-app', + name: function() { + return 'parent-app'; + }, isEmberCLIAddon: function() { return isAddon; }