Bug fixes and latest version.

2 files changed, 31 insertions, 1 deletions

diff --git a/test/date.unit.js b/test/date.unit.js
index e01f0531..04367383 100644
--- a/test/date.unit.js
+++ b/test/date.unit.js
@@ -31,6 +31,14 @@ describe("date.js", function () {
             assert.ok(Date.parse(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());
+
+            assert.ok(date > refDate); // date should be after the date given, but before the current time
+        });
+
         it("returns a date N years after the date given", 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)
@@ -46,7 +54,7 @@ describe("date.js", function () {
 
             var date = faker.Date.recent(30);
 
-            assert.ok(Date.parse(date) < new Date());
+            assert.ok(Date.parse(date) <= new Date());
         });
 
     });
diff --git a/test/random.unit.js b/test/random.unit.js
new file mode 100644
index 00000000..be180b17
--- /dev/null
+++ b/test/random.unit.js
@@ -0,0 +1,22 @@
+if (typeof module !== 'undefined') {
+    var assert = require('assert');
+    var sinon = require('sinon');
+    var faker = require('../index');
+}
+
+describe("random.js", function () {
+  describe("number", function() {
+    it("returns a random number given a maximum value", function() {
+      var max = 10;
+      assert.ok(faker.random.number(max) < max);
+    });
+    it("returns a random number between a range", function() {
+      var range = [1, 10];
+      var min = range[0];
+      var max = range[1]
+      var randomNumber = faker.random.number(range);
+      assert.ok( randomNumber >= min);
+      assert.ok( randomNumber <= max);
+    });
+  });
+});