Merge pull request #128 from dtetto/escape-for-string-replace

Escape '$' as '$$$' due to `String.replace()` special patterns 💰

Author: tomdale

src/result.js

@@ -112,11 +112,19 @@ 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 insertIntoIndexHTML(html, head, body) {
-  html = html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", body);
+  html = html.replace("<!-- EMBER_CLI_FASTBOOT_BODY -->", escapeForStringReplace(body));
 
   if (head) {
-    html = html.replace("<!-- EMBER_CLI_FASTBOOT_HEAD -->", head);
+    html = html.replace("<!-- EMBER_CLI_FASTBOOT_HEAD -->", escapeForStringReplace(head));
   }
 
   return html;

test/result-test.js

@@ -81,5 +81,23 @@ describe('Result', function() {
         });
       });
     });
+
+    describe('when the document has special-case content', function () {
+      var BODY = '<h1>A special response document: $$</h1>';
+
+      beforeEach(function () {
+        doc.body.appendChild(doc.createRawHTMLSection(BODY));
+
+        result._fastbootInfo.response.statusCode = 418;
+        result._finalize();
+      });
+
+      it('it should handle \'$$\' correctly (due to `String.replace()` gotcha)', function () {
+        return result.html()
+        .then(function (result) {
+          expect(result).to.include(BODY);
+        });
+      });
+    });
   });
 });