Set bowerDirectory for project

lib/broccoli/ember-app.js

@@ -74,11 +74,7 @@ function EmberApp(options) {
   this.tests   = options.hasOwnProperty('tests')   ? options.tests   : !isProduction;
   this.hinting = options.hasOwnProperty('hinting') ? options.hinting : !isProduction;
 
-  if (fs.existsSync(path.join(this.project.root, '.bowerrc'))) {
-    this.bowerDirectory = JSON.parse(fs.readFileSync(path.join(this.project.root, '.bowerrc'))).directory;
-  }
-
-  this.bowerDirectory = this.bowerDirectory || 'bower_components';
+  this.bowerDirectory = this.project.bowerDirectory;
 
   if (process.env.EMBER_CLI_TEST_COMMAND) {
     this.tests = true;

lib/models/project.js

@@ -19,8 +19,24 @@ function Project(root, pkg) {
   this.pkg           = pkg;
   this.addonPackages = {};
   this.liveReloadFilterPatterns = [];
+  this.setupBowerDirectory();
 }
 
+Project.prototype.setupBowerDirectory = function() {
+  var bowerrcPath = path.join(this.root, '.bowerrc');
+
+  if (fs.existsSync(bowerrcPath)) {
+    var bowerrcContent = fs.readFileSync(bowerrcPath);
+    try {
+      this.bowerDirectory = JSON.parse(bowerrcContent).directory;
+    } catch (exception) {
+      this.bowerDirectory = null;
+    }
+  }
+
+  this.bowerDirectory = this.bowerDirectory || 'bower_components';
+};
+
 var NULL_PROJECT = new Project(process.cwd(), {});
 
 NULL_PROJECT.isEmberCLIProject = function() {

tests/fixtures/bower-directory-tests/bowerrc-with-directory/.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "vendor"
+}

tests/fixtures/bower-directory-tests/bowerrc-without-directory/.bowerrc

@@ -0,0 +1,2 @@
+{
+}

tests/fixtures/bower-directory-tests/invalid-bowerrc/.bowerrc

@@ -0,0 +1,3 @@
+({
+  "directory": "vendor"
+})

tests/helpers/mock-project.js

@@ -3,9 +3,9 @@
 var Project = require('../../lib/models/project');
 
 function MockProject() {
-  Project.apply(this, arguments);
-  this.root = process.cwd();
-  this.pkg = {};
+  var root = process.cwd();
+  var pkg  = {};
+  Project.apply(this, [root, pkg]);
 }
 
 MockProject.prototype.require = function(file) {
@@ -37,6 +37,7 @@ MockProject.prototype.initializeAddons = Project.prototype.initializeAddons;
 MockProject.prototype.buildAddonPackages = Project.prototype.buildAddonPackages;
 MockProject.prototype.discoverAddons = Project.prototype.discoverAddons;
 MockProject.prototype.addIfAddon = Project.prototype.addIfAddon;
+MockProject.prototype.setupBowerDirectory = Project.prototype.setupBowerDirectory;
 MockProject.prototype.dependencies = function() {
   return [];
 };

tests/unit/broccoli/ember-app-test.js

@@ -37,6 +37,15 @@ describe('broccoli/ember-app', function() {
 
       assert.equal(project.configPath(), 'custom config path');
     });
+
+    it('should set bowerDirectory for app', function() {
+      var app = new EmberApp({
+        project: project
+      });
+
+      assert.equal(app.bowerDirectory, project.bowerDirectory);
+      assert.equal(app.bowerDirectory, 'bower_components');
+    });
   });
 
   describe('contentFor', function() {

tests/unit/models/project-test.js

@@ -65,7 +65,7 @@ describe('models/project.js', function() {
       project.config('development');
       assert.equal(addonConfigCalled, true);
     });
-    
+
     it('returns getAddonsConfig result when configPath is not present', function() {
       var expected = {
         foo: 'bar'
@@ -280,4 +280,34 @@ describe('models/project.js', function() {
       assert.equal(project.isEmberCLIAddon(), false);
     });
   });
+
+  describe('bowerDirectory', function() {
+    it('should be initialized in constructor', function() {
+      assert.equal(project.bowerDirectory, 'bower_components');
+    });
+
+    it('should be set to directory property in .bowerrc', function() {
+      projectPath = path.resolve(__dirname, '../../fixtures/bower-directory-tests/bowerrc-with-directory');
+      project = new Project(projectPath, {});
+      assert.equal(project.bowerDirectory, 'vendor');
+    });
+
+    it('should default to ‘bower_components’ unless directory property is set in .bowerrc', function() {
+      projectPath = path.resolve(__dirname, '../../fixtures/bower-directory-tests/bowerrc-without-directory');
+      project = new Project(projectPath, {});
+      assert.equal(project.bowerDirectory, 'bower_components');
+    });
+
+    it('should default to ‘bower_components’ if .bowerrc is not present', function() {
+      projectPath = path.resolve(__dirname, '../../fixtures/bower-directory-tests/no-bowerrc');
+      project = new Project(projectPath, {});
+      assert.equal(project.bowerDirectory, 'bower_components');
+    });
+
+    it('should default to ‘bower_components’ if .bowerrc json is invalid', function() {
+      projectPath = path.resolve(__dirname, '../../fixtures/bower-directory-tests/invalid-bowerrc');
+      project = new Project(projectPath, {});
+      assert.equal(project.bowerDirectory, 'bower_components');
+    });
+  });
 });