[api] [refactor] Replaced Math.Random calls with Random.number. Random ranges are now inclusive of max instead of exclusive. #88 #48

3 files changed, 24 insertions, 20 deletions

diff --git a/test/company.unit.js b/test/company.unit.js
index 6d5ca0a2..e831b841 100644
--- a/test/company.unit.js
+++ b/test/company.unit.js
@@ -6,15 +6,6 @@ if (typeof module !== 'undefined') {
 
 describe("company.js", function () {
     describe("companyName()", function () {
-        it("lets you specify the type of name to return", function () {
-            sinon.spy(faker.random, 'number');
-            var name = faker.Company.companyName(1);
-
-            assert.ok(name.match(/-/));
-
-            assert.ok(!faker.random.number.called);
-            faker.random.number.restore();
-        });
 
         it("sometimes returns three last names", function () {
             sinon.spy(faker.random, 'last_name');
diff --git a/test/phone_number.unit.js b/test/phone_number.unit.js
index a90d27d1..74b1eedd 100644
--- a/test/phone_number.unit.js
+++ b/test/phone_number.unit.js
@@ -22,8 +22,10 @@ describe("phone_number.js", function () {
 
     describe("phoneNumberFormat()", function () {
         it("returns phone number with requested format (Array index)", function () {
-            var phone_number = faker.PhoneNumber.phoneNumberFormat(5);
-            assert.ok(phone_number.match(/\(\d\d\d\)\d\d\d-\d\d\d\d/));
+            for (var i = 0; i < 10; i++) {
+              var phone_number = faker.PhoneNumber.phoneNumberFormat(5);
+              assert.ok(phone_number.match(/\(\d\d\d\)\d\d\d-\d\d\d\d/));
+            }
         });
     });
 
diff --git a/test/random.unit.js b/test/random.unit.js
index c50bfada..2403ab1a 100644
--- a/test/random.unit.js
+++ b/test/random.unit.js
@@ -6,21 +6,32 @@ if (typeof module !== 'undefined') {
 
 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 min = 1;
+
+    it("returns a random number given a maximum value as Number", function() {
       var max = 10;
-      var randomNumber = faker.random.number(1, 10);
-      assert.ok( randomNumber >= min);
-      assert.ok( randomNumber <= max);
+      assert.ok(faker.random.number(max) <= max);
     });
+
     it("returns zero when given a max of zero.", function() {
       var max = 0;
       var randomNumber = faker.random.number(max);
       assert.ok( randomNumber === 0 );
     });
+
+
+    it("returns a random number given a maximum value as Object", function() {
+      var options = { max: 10 };
+      assert.ok(faker.random.number(options) < options.max);
+    });
+
+    it("returns a random number between a range", function() {
+      var options = { min: 1, max: 10 };
+      for(var i = 0; i < 100; i++) {
+        var randomNumber = faker.random.number(options);
+        assert.ok(randomNumber >= options.min);
+        assert.ok(randomNumber <= options.max);
+      }
+    });
   });
+
 });