Auto merge of #5396 - ember-cli:pr-5315, r=stefanpenner

Pr 5315

lib/utilities/find-build-file.js

@@ -16,7 +16,13 @@ module.exports = function(file) {
 
   process.chdir(baseDir);
 
-  var buildFile = require(buildFilePath);
+  var buildFile = null;
+  try {
+    buildFile = require(buildFilePath);
+  } catch(err) {
+    err.message = 'Could not require \'' + file + '\': '+err.message;
+    throw err;
+  }
 
   return buildFile;
 };

tests/unit/utilities/find-build-file-test.js

@@ -0,0 +1,44 @@
+'use strict';
+
+var expect = require('chai').expect;
+var fs = require('fs-extra');
+var tmp = require('../../helpers/tmp');
+var findBuildFile = require('../../../lib/utilities/find-build-file');
+
+describe('find-build-file', function() {
+  var tmpPath, tmpFilename, tmpFilePath;
+  var currentWorkingDir = process.cwd();
+
+  beforeEach(function() {
+    tmpPath = process.cwd()+'/tmp/';
+    tmpFilename = 'ember-cli-build.js';
+    tmpFilePath = tmpPath + tmpFilename;
+    return tmp.setup(tmpPath)
+      .then(function(){
+        process.chdir(tmpPath);
+      });
+  });
+
+  afterEach(function() {
+    delete require.cache[require.resolve(tmpFilePath)];
+    return tmp.teardown(tmpPath).then(function(){
+      process.chdir(currentWorkingDir);
+    });
+  });
+
+  it('does not throws an error when the file is valid syntax', function() {
+    fs.writeFileSync(tmpFilename, 'module.exports = function(){return {\'a\': \'A\', \'b\': \'B\'};}', { encoding: 'utf8' });
+
+    expect(function() {
+      findBuildFile(tmpFilename);
+    }).to.not.throw();
+  });
+
+  it('throws an SyntaxError if the file contains a syntax mistake', function(){
+    fs.writeFileSync(tmpFilename, 'module.exports = function(){return {\'a\': \'A\' \'b\': \'B\'};}', { encoding: 'utf8' });
+
+    expect(function() {
+      findBuildFile(tmpFilename);
+    }).to.throw(SyntaxError, /Could not require '.*':/);
+  });
+});