Expose errors running ember

Author: dfreeman

node-tests/helpers/skeleton-app.js

@@ -37,22 +37,30 @@ module.exports = class SkeletonApp {
       this._watched.kill();
     }
 
-    // Windows doesn't necessarily kill the process immediately, so
-    // leave a little time before trying to remove the directory.
-    setTimeout(() => {
-      try {
-        fs.removeSync(this.appDir);
-      } catch (error) {
-        // eslint-disable-next-line no-console
-        console.warn(`Warning: unable to remove skeleton-app tmpdir ${this.appDir} (${error.code})`);
-      }
-    }, 250);
+    this._cleanupAppDir({ retries: 1 });
   }
 
   _ember(args) {
     let ember = require.resolve('ember-cli/bin/ember');
     return execa('node', [ember].concat(args), { cwd: this.appDir });
   }
+
+  _cleanupAppDir(options) {
+    let retries = options && options.retries || 0;
+
+    try {
+      fs.removeSync(this.appDir);
+    } catch (error) {
+      if (retries > 0) {
+        // Windows doesn't necessarily kill the process immediately, so
+        // leave a little time before trying to remove the directory.
+        setTimeout(() => this._cleanupAppDir({ retries: retries - 1 }), 250);
+      } else {
+        // eslint-disable-next-line no-console
+        console.warn(`Warning: unable to remove skeleton-app tmpdir ${this.appDir} (${error.code})`);
+      }
+    }
+  }
 }
 
 class WatchedBuild extends EventEmitter {
@@ -62,14 +70,19 @@ class WatchedBuild extends EventEmitter {
     this._ember.stdout.on('data', (data) => {
       let output = data.toString();
       if (output.includes('Build successful')) {
-        this.emit('rebuild-complete');
+        this.emit('did-rebuild');
       }
     });
+
+    this._ember.catch((error) => {
+      this.emit('did-error', error);
+    });
   }
 
   waitForBuild() {
-    return new Promise((resolve) => {
-      this.once('rebuild-complete', resolve);
+    return new Promise((resolve, reject) => {
+      this.once('did-rebuild', resolve);
+      this.once('did-error', reject);
     });
   }