From d2a70d71817e2b4e1062a0bc777933705bf1c626 Mon Sep 17 00:00:00 2001 From: Ben Southgate Date: Wed, 2 Dec 2015 23:02:18 -0800 Subject: remove Math.random() calls to utilize faker.seed() Conflicts: lib/internet.js lib/random.js --- lib/commerce.js | 23 ++++------------------- lib/finance.js | 5 +++-- lib/helpers.js | 8 ++++---- lib/internet.js | 2 +- 4 files changed, 12 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/commerce.js b/lib/commerce.js index 2c41455c..e5a35ee7 100644 --- a/lib/commerce.js +++ b/lib/commerce.js @@ -22,24 +22,7 @@ var Commerce = function (faker) { * @param {number} fixedAmount */ self.department = function(max, fixedAmount) { - return faker.random.arrayElement(faker.definitions.commerce.department); - /* - max = max || 3; - - var num = Math.floor((Math.random() * max) + 1); - if (fixedAmount) { - num = max; - } - - var categories = faker.commerce.categories(num); - - if(num > 1) { - return faker.commerce.mergeCategories(categories); - } - - return categories[0]; - */ }; /** @@ -72,7 +55,9 @@ var Commerce = function (faker) { return symbol + 0.00; } - return symbol + (Math.round((Math.random() * (max - min) + min) * Math.pow(10, dec)) / Math.pow(10, dec)).toFixed(dec); + var randValue = faker.random.number({ max: max, min: min }); + + return symbol + (Math.round(randValue * Math.pow(10, dec)) / Math.pow(10, dec)).toFixed(dec); }; /* @@ -131,4 +116,4 @@ var Commerce = function (faker) { return self; }; -module['exports'] = Commerce; \ No newline at end of file +module['exports'] = Commerce; diff --git a/lib/finance.js b/lib/finance.js index 4c6d92a6..9b478573 100644 --- a/lib/finance.js +++ b/lib/finance.js @@ -88,8 +88,9 @@ var Finance = function (faker) { max = max || 1000; dec = dec || 2; symbol = symbol || ''; + var randValue = faker.random.number({ max: max, min: min }); - return symbol + (Math.round((Math.random() * (max - min) + min) * Math.pow(10, dec)) / Math.pow(10, dec)).toFixed(dec); + return symbol + (Math.round(randValue * Math.pow(10, dec)) / Math.pow(10, dec)).toFixed(dec); } @@ -135,4 +136,4 @@ var Finance = function (faker) { } } -module['exports'] = Finance; \ No newline at end of file +module['exports'] = Finance; diff --git a/lib/helpers.js b/lib/helpers.js index 6434baa3..ac3398d7 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -68,7 +68,7 @@ var Helpers = function (faker) { if (string.charAt(i) == "#") { str += faker.random.number(9); } else if (string.charAt(i) == "?") { - str += alpha[Math.floor(Math.random() * alpha.length)]; + str += faker.random.arrayElement(alpha); } else { str += string.charAt(i); } @@ -241,9 +241,9 @@ var Helpers = function (faker) { "account" : faker.finance.account() }; }; - + return self; - + }; @@ -255,4 +255,4 @@ String.prototype.capitalize = function () { //v1.0 }; */ -module['exports'] = Helpers; \ No newline at end of file +module['exports'] = Helpers; diff --git a/lib/internet.js b/lib/internet.js index 3b166de7..2d7ff530 100644 --- a/lib/internet.js +++ b/lib/internet.js @@ -284,7 +284,7 @@ var Internet = function (faker) { self.mac = function(){ var i, mac = ""; for (i=0; i < 12; i++) { - mac+= parseInt(Math.random()*16).toString(16); + mac+= faker.random.number(15).toString(16); if (i%2==1 && i != 11) { mac+=":"; } -- cgit v1.2.3