Merge pull request #151 from bekzod/refactor-insert-html

refactored `insertIntoIndexHTML`

Author: kratiahuja

src/result.js

@@ -127,29 +127,25 @@ function missingTag(tag) {
 
 function insertIntoIndexHTML(html, head, body) {
   if (!html) { return Promise.resolve(html); }
+  let isBodyReplaced = false;
+  let isHeadReplaced = false;
 
-  if (body) {
-    let isBodyReplaced = false;
-    html = html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", function() {
+  html = html.replace(/<\!-- EMBER_CLI_FASTBOOT_(HEAD|BODY) -->/g, function(match, tag) {
+    if (tag === 'HEAD' && head && !isHeadReplaced) {
+      isHeadReplaced = true;
+      return head;
+    } else if (tag === 'BODY' && body && !isBodyReplaced) {
       isBodyReplaced = true;
       return body;
-    });
-
-    if (!isBodyReplaced) {
-      return missingTag('<!--EMBER_CLI_FASTBOTT_BODY-->');
     }
-  }
+    return '';
+  });
 
-  if (head) {
-    let isHeadReplaced = false;
-    html = html.replace("<!-- EMBER_CLI_FASTBOOT_HEAD -->", function() {
-      isHeadReplaced = true;
-      return head;
-    });
-
-    if (!isHeadReplaced) {
-      return missingTag('<!--EMBER_CLI_FASTBOTT_HEAD-->');
-    }
+  if (head && !isHeadReplaced) {
+    return missingTag('<!--EMBER_CLI_FASTBOOT_HEAD-->');
+  }
+  if (body && !isBodyReplaced) {
+    return missingTag('<!--EMBER_CLI_FASTBOOT_BODY-->');
   }
 
   return Promise.resolve(html);

test/result-test.js

@@ -39,7 +39,7 @@ describe('Result', function() {
         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.");
+            expect(e.message).to.equal("Fastboot was not able to find <!--EMBER_CLI_FASTBOOT_BODY--> in base HTML. It could not replace the contents.");
             done();
           });
       });
@@ -55,7 +55,7 @@ describe('Result', function() {
         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.");
+            expect(e.message).to.equal("Fastboot was not able to find <!--EMBER_CLI_FASTBOOT_HEAD--> in base HTML. It could not replace the contents.");
             done();
           });
       });