Merge pull request #149 from bekzod/insert-comments-fix

kratiahuja · web-flow · commit 257cc5e3ff90 · 2017-06-04T12:52:26.000-07:00
throw when insert comments are not replaced
diff --git a/src/result.js b/src/result.js
@@ -9,9 +9,9 @@ const HTMLSerializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap);
  * method.
  */
 class Result {
-  constructor(options) {
-    this.instanceBooted = false;
-    this.instanceDestroyed = false;
+  constructor(options) {
+    this.instanceBooted = false;
+    this.instanceDestroyed = false;
     this._doc = options.doc;
     this._html = options.html;
     this._fastbootInfo = options.fastbootInfo;
@@ -43,7 +43,7 @@ class Result {
       }
     }
 
-    return Promise.resolve(insertIntoIndexHTML(this._html, this._head, this._body));
+    return insertIntoIndexHTML(this._html, this._head, this._body);
   }
 
   /**
@@ -84,10 +84,10 @@ class Result {
     return this;
   }
 
-  _finalizeMetadata(instance) {
-    if (this.instanceBooted) {
-      this.url = instance.getURL();
-    }
+  _finalizeMetadata(instance) {
+    if (this.instanceBooted) {
+      this.url = instance.getURL();
+    }
 
     let response = this._fastbootInfo.response;
 
@@ -112,22 +112,38 @@ class Result {
   }
 }
 
-/**
- * `String.replace()` converts '$$' to '$', so we must escape each '$' as '$$';
- * but because we’re using `String.replace()` to do it, we must use '$$$'!
- */
-function escapeForStringReplace(string) {
-  return string.replace(/\$/g, '$$$');
+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) {
-  html = html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", escapeForStringReplace(body));
+  if (!html) { return Promise.resolve(html); }
+
+  if (body) {
+    let isBodyReplaced = false;
+    html = html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", function() {
+      isBodyReplaced = true;
+      return body;
+    });
+
+    if (!isBodyReplaced) {
+      return missingTag('<!--EMBER_CLI_FASTBOTT_BODY-->');
+    }
+  }
 
   if (head) {
-    html = html.replace("<!-- EMBER_CLI_FASTBOOT_HEAD -->", escapeForStringReplace(head));
+    let isHeadReplaced = false;
+    html = html.replace("<!-- EMBER_CLI_FASTBOOT_HEAD -->", function() {
+      isHeadReplaced = true;
+      return head;
+    });
+
+    if (!isHeadReplaced) {
+      return missingTag('<!--EMBER_CLI_FASTBOTT_HEAD-->');
+    }
   }
 
-  return html;
+  return Promise.resolve(html);
 }
 
 module.exports = Result;
diff --git a/test/result-test.js b/test/result-test.js
@@ -29,6 +29,38 @@ describe('Result', function() {
 
   describe('html()', function () {
 
+    describe('reject when body insert comment missing', function () {
+      beforeEach(function () {
+        result._html = '<head></head><body></body>';
+        result._body = '<h1>news</h2>';
+      });
+
+      it('rejects when body insert comment missing', function (done) {
+        return result.html()
+          .catch(function (e) {
+            expect(e).to.be.an('error');
+            expect(e.message).to.equal("Fastboot was not able to find <!--EMBER_CLI_FASTBOTT_BODY--> in base HTML. It could not replace the contents.");
+            done();
+          });
+      });
+    });
+
+    describe('reject when head insert comment missing', function () {
+      beforeEach(function () {
+        result._html = '<head></head><body><!-- EMBER_CLI_FASTBOOT_BODY --></body>';
+        result._head = '<title>news</title>';
+      });
+
+      it('rejects when head insert comment missing', function (done) {
+        return result.html()
+          .catch(function (e) {
+            expect(e).to.be.an('error');
+            expect(e.message).to.equal("Fastboot was not able to find <!--EMBER_CLI_FASTBOTT_HEAD--> in base HTML. It could not replace the contents.");
+            done();
+          });
+      });
+    });
+
     describe('when the response status code is 204', function () {
       beforeEach(function () {
         result._fastbootInfo.response.statusCode = 204;
@@ -37,9 +69,9 @@ describe('Result', function() {
 
       it('should return an empty message body', function () {
         return result.html()
-        .then(function (result) {
-          expect(result).to.equal('');
-        });
+          .then(function (result) {
+            expect(result).to.equal('');
+          });
       });
     });
 
