[BUGFIX] Fixes broccoli errors when tests dir is not present

resolves #5946
ember-cli · Jun 20, 2016 · 692b3a6 · 692b3a6
1 parent 0387fab
commit 692b3a6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -198,7 +198,9 @@ EmberApp.prototype._initOptions = function(options) {
   }
 
   var appTree = new WatchedDir(this._resolveLocal('app'));
-  var testsTree = new WatchedDir(this._resolveLocal('tests'));
+
+  var testsPath = this._resolveLocal('tests');
+  var testsTree = existsSync(testsPath) ? new WatchedDir(testsPath) : null;
 
   // these are contained within app/ no need to watch again
   // (we should probably have the builder or the watcher dedup though)
@@ -1607,7 +1609,7 @@ EmberApp.prototype.toArray = function() {
     this.publicTree()
   ];
 
-  if (this.tests) {
+  if (this.tests && this.trees.test) {
     sourceTrees = sourceTrees.concat(this.testIndex(), this.test());
   }