Merge pull request #277 from bobisjan/resilient-result-finalization

Robert Jackson · web-flow · commit 9b69cf5a6f09 · 2020-10-23T09:39:18.000-04:00
diff --git a/src/ember-app.js b/src/ember-app.js
@@ -328,12 +328,11 @@ class EmberApp {
         // if shoebox is not disabled, then create the shoebox and send API data
         createShoebox(doc, fastbootInfo);
       }
-
-      result._finalize();
     } catch (error) {
       // eslint-disable-next-line require-atomic-updates
       result.error = error;
     } finally {
+      result._finalize();
       // ensure we invoke `Ember.Application.destroy()` and
       // `Ember.ApplicationInstance.destroy()`, but use `result._destroy()` so
       // that the `result` object's internal `this.isDestroyed` flag is correct
diff --git a/test/fastboot-test.js b/test/fastboot-test.js
@@ -242,7 +242,10 @@ describe('FastBoot', function() {
 
     return fastboot
       .visit('/')
-      .then(r => r.html())
+      .then(r => {
+        expect(r.finalized).to.be.true;
+        return r.html();
+      })
       .then(html => {
         expect(html).to.match(/<body>/);
       });
