fixed tests, now they are broken

src/ember-app.js

@@ -226,21 +226,31 @@ class EmberApp {
    * @param {Object} result
    * @return {Promise<instance>} instance
    */
-  visitRoute(path, fastbootInfo, bootOptions, result) {
-    let instance;
-
+  visitRoute(path, fastbootInfo, bootOptions, result, destroyAppInstanceInMs) {
     return this.buildAppInstance()
-      .then(appInstance => {
-        instance = appInstance;
+      .then(instance => {
         result.instance = instance;
-        registerFastBootInfo(fastbootInfo, instance);
+        return new Promise((resolve, reject) => {
+          let timer;
+          if (destroyAppInstanceInMs > 0) {
+            // start a timer to destroy the appInstance forcefully in the given ms.
+            // This is a failure mechanism so that node process doesn't get wedged if the `visit` never completes.
+            timer = setTimeout(() => {
+              if (result._destroyAppInstance()) {
+                reject(new Error('Fastboot forcefully destroyed App instance in ' + destroyAppInstanceInMs + 'ms'));
+              }
+            }, destroyAppInstanceInMs);
+          }
 
-        return instance.boot(bootOptions);
-      })
-      .then(() => result.instanceBooted = true)
-      .then(() => instance.visit(path, bootOptions))
-      .then(() => fastbootInfo.deferredPromise)
-      .then(() => instance);
+          registerFastBootInfo(fastbootInfo, instance);
+          instance.boot(bootOptions)
+            .then(() => result.instanceBooted = true)
+            .then(() => result.instance.visit(path, bootOptions))
+            .then(() => fastbootInfo.deferredPromise)
+            .then(() => clearTimeout(timer))
+            .then(resolve, reject);
+        });
+      });
   }
 
   /**
@@ -275,31 +285,15 @@ class EmberApp {
     let shouldRender = (options.shouldRender !== undefined) ? options.shouldRender : true;
     let bootOptions = buildBootOptions(shouldRender);
     let fastbootInfo = new FastBootInfo(
-      req,
-      res,
+      req, res,
       { hostWhitelist: this.hostWhitelist, metadata: options.metadata }
     );
 
     let doc = bootOptions.document;
 
-    let result = new Result({
-      doc: doc,
-      html: html,
-      fastbootInfo: fastbootInfo
-    });
+    let result = new Result({ doc, html, fastbootInfo });
 
-    let destroyAppInstanceTimer;
-    if (destroyAppInstanceInMs > 0) {
-      // start a timer to destroy the appInstance forcefully in the given ms.
-      // This is a failure mechanism so that node process doesn't get wedged if the `visit` never completes.
-      destroyAppInstanceTimer = setTimeout(function() {
-        if (result._destroyAppInstance()) {
-          result.error = new Error('App instance was forcefully destroyed in ' + destroyAppInstanceInMs + 'ms');
-        }
-      }, destroyAppInstanceInMs);
-    }
-
-    return this.visitRoute(path, fastbootInfo, bootOptions, result)
+    return this.visitRoute(path, fastbootInfo, bootOptions, result, destroyAppInstanceInMs)
       .then(() => {
         if (!disableShoebox) {
           // if shoebox is not disabled, then create the shoebox and send API data
@@ -308,13 +302,7 @@ class EmberApp {
       })
       .catch(error => result.error = error)
       .then(() => result._finalize())
-      .finally(() => {
-        if (result._destroyAppInstance()) {
-          if (destroyAppInstanceTimer) {
-            clearTimeout(destroyAppInstanceTimer);
-          }
-        }
-      });
+      .finally(() => result._destroyAppInstance());
   }
 
   /**

src/result.js

@@ -67,6 +67,7 @@ class Result {
    * to this Result instance.
    */
   _finalize() {
+    if (this._instanceDestroyed) { return this; }
     if (this.finalized) {
       throw new Error("Results cannot be finalized more than once");
     }

test/.jshintrc

@@ -1,5 +1,6 @@
 {
   "mocha": true,
   "esnext": true,
-  "node": true
+  "node": true,
+  "expr": true
 }

test/fastboot-test.js

@@ -101,16 +101,15 @@ describe("FastBoot", function() {
       });
   });
 
-  it("can forcefully destroy the app instance using destroyAppInstanceInMs", function() {
+  it("can forcefully destroy the app instance using destroyAppInstanceInMs", function(done) {
     var fastboot = new FastBoot({
-      distPath: fixture('basic-app')
+      distPath: fixture('long-resolving-app')
     });
 
-    return fastboot.visit('/', {
-      destroyAppInstanceInMs: 5
-    })
+    fastboot.visit('/', { destroyAppInstanceInMs: 5 })
       .catch((e) => {
-        expect(e.message).to.equal('App instance was forcefully destroyed in 5ms');
+        expect(e.message).to.equal('Fastboot forcefully destroyed App instance in 5ms');
+        done();
       });
   });
 
@@ -158,14 +157,15 @@ describe("FastBoot", function() {
     return expect(fastboot.visit('/')).to.be.rejected;
   });
 
-  it("catches the error if an error occurs", function() {
+  it("catches the error if an error occurs", function(done) {
     var fastboot = new FastBoot({
       distPath: fixture('rejected-promise')
     });
 
     fastboot.visit('/')
       .catch(function(err) {
-        return expect(err).to.be.not.null;
+        expect(err).to.be.not.null;
+        done();
       });
   });
 
@@ -344,13 +344,16 @@ describe("FastBoot", function() {
     }
   });
 
-  it("handles apps boot-time failures by throwing Errors", function() {
+  it("handles apps boot-time failures by throwing Errors", function(done) {
     var fastboot = new FastBoot({
       distPath: fixture('boot-time-failing-app')
     });
 
-    return fastboot.visit('/')
-    .catch((e) => expect(e).to.be.an('error'));
+    fastboot.visit('/')
+      .catch((e) => {
+        expect(e).to.be.an('error');
+        done();
+      });
   });
 
   it("matches app's fastboot-info and result's fastboot-info", function() {