handle undefined in shoebox

ember-fastboot · May 16, 2017 · 5fafef8 · 5fafef8
1 parent acbb306
commit 5fafef8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/ember-app.js b/src/ember-app.js
@@ -450,7 +450,9 @@ function createShoebox(doc, fastbootInfo) {
 
     let value = shoebox[key];
     let textValue = JSON.stringify(value);
-    textValue = escapeJSONString(textValue);
+    if (textValue !== undefined) {
+      textValue = escapeJSONString(textValue);
+    }
 
     let scriptText = doc.createRawHTMLSection(textValue);
     let scriptEl = doc.createElement('script');

diff --git a/test/fastboot-shoebox-test.js b/test/fastboot-shoebox-test.js
@@ -23,6 +23,9 @@ describe("FastBootShoebox", function() {
         expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key4">{"nastyScriptCase":"\\u003cscript\\u003ealert(\'owned\');\\u003c/script\\u003e\\u003c/script\\u003e\\u003c/script\\u003e"}</script>');
 
         expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key5">{"otherUnicodeChars":"\\u0026\\u0026\\u003e\\u003e\\u003c\\u003c\\u2028\\u2028\\u2029\\u2029"}</script>');
+
+        // handles undefined
+        expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key6">undefined</script>');
       });
   });
 
@@ -43,6 +46,9 @@ describe("FastBootShoebox", function() {
         expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key4">{"nastyScriptCase":"\\u003cscript\\u003ealert(\'owned\');\\u003c/script\\u003e\\u003c/script\\u003e\\u003c/script\\u003e"}</script>');
 
         expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key5">{"otherUnicodeChars":"\\u0026\\u0026\\u003e\\u003e\\u003c\\u003c\\u2028\\u2028\\u2029\\u2029"}</script>');
+
+        // handles undefined
+        expect(html).to.include('<script type="fastboot/shoebox" id="shoebox-key6">undefined</script>');
       });
   });
 
@@ -63,6 +69,9 @@ describe("FastBootShoebox", function() {
         expect(html).to.not.include('<script type="fastboot/shoebox" id="shoebox-key4">{"nastyScriptCase":"\\u003cscript\\u003ealert(\'owned\');\\u003c/script\\u003e\\u003c/script\\u003e\\u003c/script\\u003e"}</script>');
 
         expect(html).to.not.include('<script type="fastboot/shoebox" id="shoebox-key5">{"otherUnicodeChars":"\\u0026\\u0026\\u003e\\u003e\\u003c\\u003c\\u2028\\u2028\\u2029\\u2029"}</script>');
+
+        // handles undefined
+        expect(html).to.not.include('<script type="fastboot/shoebox" id="shoebox-key6">undefined</script>');
       });
   });
 });
diff --git a/test/fixtures/shoebox/fastboot/fastboot-test.js b/test/fixtures/shoebox/fastboot/fastboot-test.js