fixed forcefully destroy the app instance test

Author: bekzod

src/ember-app.js

@@ -266,7 +266,7 @@ class EmberApp {
     let res = options.response;
     let html = options.html || this.html;
     let disableShoebox = options.disableShoebox || false;
-    let destroyAppInstanceInMs = options.destroyAppInstanceInMs;
+    let destroyAppInstanceInMs = parseInt(options.destroyAppInstanceInMs, 10);
 
     let shouldRender = (options.shouldRender !== undefined) ? options.shouldRender : true;
     let bootOptions = buildBootOptions(shouldRender);
@@ -285,23 +285,19 @@ class EmberApp {
     });
 
     let destroyAppInstanceTimer;
-    if (parseInt(destroyAppInstanceInMs, 10) > 0) {
+    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 (instance && !result.instanceDestroyed) {
+        if (result.instance && !result.instanceDestroyed) {
           result.instanceDestroyed = true;
           result.error = new Error('App instance was forcefully destroyed in ' + destroyAppInstanceInMs + 'ms');
-          instance.destroy();
+          result.instance.destroy();
         }
       }, destroyAppInstanceInMs);
     }
 
-    let instance;
     return this.visitRoute(path, fastbootInfo, bootOptions, result)
-      .then(appInstance => {
-        instance = appInstance;
-      })
       .then(() => {
         if (!disableShoebox) {
           // if shoebox is not disabled, then create the shoebox and send API data
@@ -311,9 +307,9 @@ class EmberApp {
       .catch(error => result.error = error)
       .then(() => result._finalize())
       .finally(() => {
-        if (instance && !result.instanceDestroyed) {
+        if (result.instance && !result.instanceDestroyed) {
           result.instanceDestroyed = true;
-          instance.destroy();
+          result.instance.destroy();
 
           if (destroyAppInstanceTimer) {
             clearTimeout(destroyAppInstanceTimer);

test/fastboot-test.js

@@ -106,6 +106,17 @@ describe("FastBoot", function() {
       distPath: fixture('basic-app')
     });
 
+    // delaying `visitRoute` to forcefully destroy app instance
+    let originalVisitRoute = fastboot._app.visitRoute;
+    fastboot._app.visitRoute = function() {
+      return originalVisitRoute.apply(this, arguments)
+        .then(function() {
+          return new Promise(function(resolve) {
+            setTimeout(resolve, 2000);
+          });
+        });
+    };
+
     return fastboot.visit('/', { destroyAppInstanceInMs: 5 })
       .catch((e) => {
         expect(e.message).to.equal('App instance was forcefully destroyed in 5ms');