[fix] Do not serialize Dates from Date.random APIs. Dates are now returned as Date objects. #93

2 files changed, 12 insertions, 12 deletions

diff --git a/lib/date.js b/lib/date.js
index c58a9af5..7b85143d 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -9,7 +9,7 @@ var date = {
         past -= faker.random.number(years) * 365 * 3600 * 1000; // some time from now to N years ago, in milliseconds
         date.setTime(past);
 
-        return date.toJSON();
+        return date;
     },
 
     future: function (years, refDate) {
@@ -18,16 +18,16 @@ var date = {
         future += faker.random.number(years) * 365 * 3600 * 1000 + 1000; // some time from now to N years later, in milliseconds
         date.setTime(future);
 
-        return date.toJSON();
+        return date;
     },
 
-    between: function(from, to) {
+    between: function (from, to) {
         var fromMilli = Date.parse(from);
         var dateOffset = faker.random.number(Date.parse(to) - fromMilli);
 
         var newDate = new Date(fromMilli + dateOffset);
 
-        return newDate.toJSON();
+        return newDate;
     },
 
     recent: function (days) {
@@ -36,7 +36,7 @@ var date = {
         future -= faker.random.number(days) * 24 * 60 * 60 * 1000; // some time from now to N days ago, in milliseconds
         date.setTime(future);
 
-        return date.toJSON();
+        return date;
     }
 };
 module.exports = date;
diff --git a/test/date.unit.js b/test/date.unit.js
index 04367383..26707ed1 100644
--- a/test/date.unit.js
+++ b/test/date.unit.js
@@ -9,14 +9,14 @@ describe("date.js", function () {
         it("returns a date N years into the past", function () {
 
             var date = faker.Date.past(75);
-            assert.ok(Date.parse(date) < new Date());
+            assert.ok(date < new Date());
         });
 
         it("returns a date N years before the date given", function () {
 
             var refDate = new Date(2120, 11, 9, 10, 0, 0, 0); // set the date beyond the usual calculation (to make sure this is working correctly)
 
-            var date = Date.parse(faker.Date.past(75, refDate.toJSON()));
+            var date = faker.Date.past(75, refDate.toJSON());
 
             assert.ok(date < refDate && date > new Date()); // date should be before date given but after the current time
         });
@@ -28,13 +28,13 @@ describe("date.js", function () {
 
             var date = faker.Date.future(75);
 
-            assert.ok(Date.parse(date) > new Date());
+            assert.ok(date > new Date());
         });
 
         it("returns a future date when N = 0", function () {
 
             var refDate = new Date();
-            var date = Date.parse(faker.Date.future(0), refDate.toJSON());
+            var date = faker.Date.future(0, refDate.toJSON());
 
             assert.ok(date > refDate); // date should be after the date given, but before the current time
         });
@@ -43,7 +43,7 @@ describe("date.js", function () {
 
             var refDate = new Date(1880, 11, 9, 10, 0, 0, 0); // set the date beyond the usual calculation (to make sure this is working correctly)
 
-            var date = Date.parse(faker.Date.future(75, refDate.toJSON()));
+            var date = faker.Date.future(75, refDate.toJSON());
 
             assert.ok(date > refDate && date < new Date()); // date should be after the date given, but before the current time
         });
@@ -54,7 +54,7 @@ describe("date.js", function () {
 
             var date = faker.Date.recent(30);
 
-            assert.ok(Date.parse(date) <= new Date());
+            assert.ok(date <= new Date());
         });
 
     });
@@ -65,7 +65,7 @@ describe("date.js", function () {
             var from = new Date(1990, 5, 7, 9, 11, 0, 0);
             var to = new Date(2000, 6, 8, 10, 12, 0, 0);
 
-            var date = Date.parse(faker.Date.between(from, to));
+            var date = faker.Date.between(from, to);
 
             assert.ok(date > from && date < to);
         });