Fix toJSON casting of invalid moment (#2886)

Invalid moments were casting as 'null' (the string)
Now they are properly casting as null (the literal)

diff --git a/src/lib/moment/to-type.js b/src/lib/moment/to-type.js
index b6787afe6c41c81984bed4193954425745fdc4cb..3581b5c43542f525a0b86a04f3042d5eece4f63f 100644 (file)
--- a/src/lib/moment/to-type.js
+++ b/src/lib/moment/to-type.js
@@ -29,6 +29,6 @@ export function toObject () {
 }
 
 export function toJSON () {
-    // JSON.stringify(new Date(NaN)) === 'null'
-    return this.isValid() ? this.toISOString() : 'null';
+    // JSON.stringify(new Date(NaN)) === null
+    return this.isValid() ? this.toISOString() : null;
 }

diff --git a/src/test/moment/invalid.js b/src/test/moment/invalid.js
index 7a976269de1c15b9af5a90a7ed422e4b4841f4a8..0d62c75f88d37b4bc2261a25cd04d4cf601c3aa8 100644 (file)
--- a/src/test/moment/invalid.js
+++ b/src/test/moment/invalid.js
@@ -99,7 +99,7 @@ test('invalid operations', function (assert) {
         });
         assert.ok(moment.isDate(invalid.toDate()));
         assert.ok(isNaN(invalid.toDate().valueOf()));
-        assert.equal(invalid.toJSON(), 'null');
+        assert.equal(invalid.toJSON(), null);
         assert.equal(invalid.toString(), 'Invalid date');
         assert.ok(isNaN(invalid.unix()));
         assert.ok(isNaN(invalid.valueOf()));