From 45160e59709716801d08dc211cc64435a789b604 Mon Sep 17 00:00:00 2001 From: Anthony van der Hoorn Date: Wed, 23 Jul 2014 01:02:03 +0100 Subject: Updates to switch changes over to using 2 args to support min/max --- lib/random.js | 11 +++++------ test/random.unit.js | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/random.js b/lib/random.js index 63347278..6205dc09 100644 --- a/lib/random.js +++ b/lib/random.js @@ -1,13 +1,12 @@ var definitions = require('./definitions'); var random = { // returns a single random number based on a max number or range - number: function (range) { - if(Array.isArray(range)) { - var min = range[0]; - var max = range[1]; - return Math.floor((Math.random() * max) + min); + number: function (min, max) { + if (max === undefined) { + max = min; + min = 0; } - return Math.floor(Math.random() * range); + return Math.floor((Math.random() * max) + min); }, // takes an array and returns the array randomly sorted diff --git a/test/random.unit.js b/test/random.unit.js index be180b17..89f5b786 100644 --- a/test/random.unit.js +++ b/test/random.unit.js @@ -11,10 +11,9 @@ describe("random.js", function () { 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); + var min = 1; + var max = 10; + var randomNumber = faker.random.number(1, 10); assert.ok( randomNumber >= min); assert.ok( randomNumber <= max); }); -- cgit v1.2.3