From 5fafef81f47ea4143eac6a62a8c69b880a1f82d3 Mon Sep 17 00:00:00 2001
From: Kelly Selden <kellyselden@gmail.com>
Date: Tue, 16 May 2017 11:19:42 -0700
Subject: [PATCH] handle undefined in shoebox

---
 src/ember-app.js                                | 4 +++-
 test/fastboot-shoebox-test.js                   | 9 +++++++++
 test/fixtures/shoebox/fastboot/fastboot-test.js | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ember-app.js b/src/ember-app.js
index 1c6d9d4..5f3cb42 100644
--- 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
index 0783844..e2809b3 100644
--- 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
index d7a497e..17a02ff 100644
--- a/test/fixtures/shoebox/fastboot/fastboot-test.js
+++ b/test/fixtures/shoebox/fastboot/fastboot-test.js
@@ -300,6 +300,7 @@ define('fastboot-test/routes/application', ['exports', 'ember'], function (expor
         shoebox.put('key3', { htmlSpecialCase: 'R&B > Jazz' });
         shoebox.put('key4', { nastyScriptCase: "<script>alert('owned');</script></script></script>" });
         shoebox.put('key5', { otherUnicodeChars: '&&>><<\u2028\u2028\u2029\u2029' });
+        shoebox.put('key6', undefined);
       }
     }
   });