devotox · devotox · Feb 20, 2020 · Aug 27, 2017 · Sep 20, 2017 · Sep 20, 2017
diff --git a/src/result.js b/src/result.js
@@ -42,7 +42,7 @@ class Result {
       }
     }
 
-    return insertIntoIndexHTML(this._html, this._head, this._body);
+    return insertIntoIndexHTML(this._html, this._head, this._body, this._bodyAttributes);
   }
 
   /**
@@ -109,6 +109,12 @@ class Result {
     let head = this._doc.head;
     let body = this._doc.body;
 
+    if (body.attributes.length > 0) {
+      this._bodyAttributes = HTMLSerializer.attributes(body.attributes);
+    } else {
+      this._bodyAttributes = null;
+    }
+
     if (head) {
       head = HTMLSerializer.serializeChildren(head);
     }
@@ -124,7 +130,7 @@ function missingTag(tag) {
   return Promise.reject(new Error(`Fastboot was not able to find ${tag} in base HTML. It could not replace the contents.`));
 }
 
-function insertIntoIndexHTML(html, head, body) {
+function insertIntoIndexHTML(html, head, body, bodyAttributes) {
   if (!html) { return Promise.resolve(html); }
   let isBodyReplaced = false;
   let isHeadReplaced = false;
@@ -140,6 +146,12 @@ function insertIntoIndexHTML(html, head, body) {
     return '';
   });
 
+  if (bodyAttributes) {
+    html = html.replace(/<body[^>]*/i, function(match) {
+      return match + ' ' + bodyAttributes;
+    });
+  }
+
   if (head && !isHeadReplaced) {
     return missingTag('<!--EMBER_CLI_FASTBOOT_HEAD-->');
   }

diff --git a/test/fastboot-test.js b/test/fastboot-test.js
@@ -87,6 +87,18 @@ describe("FastBoot", function() {
       });
   });
 
+  it("outputs body attributes from the fastboot app", function() {
+    var fastboot = new FastBoot({
+      distPath: fixture('custom-body-attrs')
+    });
+
+    return fastboot.visit('/')
+      .then(r => r.html())
+      .then(html => {
+        expect(html).to.match(/<body data-foo=1 +class="it-works"/);
+      });
+  });
+
   it("can serialize the head and body", function() {
     var fastboot = new FastBoot({
       distPath: fixture('basic-app')