aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Donovan <[email protected]>2013-01-07 12:46:13 -0800
committerBryan Donovan <[email protected]>2013-01-07 12:46:13 -0800
commite483b72d3f1cb805fede585a71fa1e48ec568f12 (patch)
tree1dfac8f774b7cff57826e2acacace147d8a3c2ff
parentf19d2ab11c5c4884f71119a26828f9aaa3474b3f (diff)
downloadfaker-e483b72d3f1cb805fede585a71fa1e48ec568f12.tar.xz
faker-e483b72d3f1cb805fede585a71fa1e48ec568f12.zip
renaming array_rand to array_element
-rw-r--r--lib/address.js4
-rw-r--r--lib/company.js2
-rw-r--r--lib/internet.js2
-rw-r--r--lib/random.js44
-rw-r--r--test/address.unit.js6
-rw-r--r--test/company.unit.js12
-rw-r--r--test/internet.unit.js4
7 files changed, 37 insertions, 37 deletions
diff --git a/lib/address.js b/lib/address.js
index 936cbd47..2869eeea 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -4,7 +4,7 @@ var definitions = require('../lib/definitions');
var address = {
zipCode: function () {
- return Helpers.replaceSymbolWithNumber(Faker.random.array_rand(["#####", '#####-####']));
+ return Helpers.replaceSymbolWithNumber(Faker.random.array_element(["#####", '#####-####']));
},
zipCodeFormat: function (format) {
@@ -54,7 +54,7 @@ var address = {
},
secondaryAddress: function () {
- return Helpers.replaceSymbolWithNumber(Faker.random.array_rand(
+ return Helpers.replaceSymbolWithNumber(Faker.random.array_element(
[
'Apt. ###',
'Suite ###'
diff --git a/lib/company.js b/lib/company.js
index 4bf11db5..2298f607 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -17,7 +17,7 @@ var company = {
},
companySuffix: function () {
- return Faker.random.array_rand(this.suffixes());
+ return Faker.random.array_element(this.suffixes());
},
catchPhrase: function () {
diff --git a/lib/internet.js b/lib/internet.js
index 022095e9..e08308d0 100644
--- a/lib/internet.js
+++ b/lib/internet.js
@@ -10,7 +10,7 @@ var internet = {
case 0:
return Faker.random.first_name();
case 1:
- return Faker.random.first_name() + Faker.random.array_rand([".", "_"]) + Faker.random.last_name();
+ return Faker.random.first_name() + Faker.random.array_element([".", "_"]) + Faker.random.last_name();
}
},
diff --git a/lib/random.js b/lib/random.js
index 6857240f..2a149ee0 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -7,93 +7,93 @@ var random = {
},
// takes an array and returns the array randomly sorted
- array_rand: function (array) {
+ array_element: function (array) {
var r = Math.floor(Math.random() * array.length);
return array[r];
},
city_prefix: function () {
- return this.array_rand(definitions.city_prefix());
+ return this.array_element(definitions.city_prefix());
},
city_suffix: function () {
- return this.array_rand(definitions.city_suffix());
+ return this.array_element(definitions.city_suffix());
},
street_suffix: function () {
- return this.array_rand(definitions.street_suffix());
+ return this.array_element(definitions.street_suffix());
},
br_state: function () {
- return this.array_rand(definitions.br_state());
+ return this.array_element(definitions.br_state());
},
br_state_abbr: function () {
- return this.array_rand(definitions.br_state_abbr());
+ return this.array_element(definitions.br_state_abbr());
},
us_state: function () {
- return this.array_rand(definitions.us_state());
+ return this.array_element(definitions.us_state());
},
us_state_abbr: function () {
- return this.array_rand(definitions.us_state_abbr());
+ return this.array_element(definitions.us_state_abbr());
},
uk_county: function () {
- return this.array_rand(definitions.uk_county());
+ return this.array_element(definitions.uk_county());
},
uk_country: function () {
- return this.array_rand(definitions.uk_country());
+ return this.array_element(definitions.uk_country());
},
first_name: function () {
- return this.array_rand(definitions.first_name());
+ return this.array_element(definitions.first_name());
},
last_name: function () {
- return this.array_rand(definitions.last_name());
+ return this.array_element(definitions.last_name());
},
name_prefix: function () {
- return this.array_rand(definitions.name_prefix());
+ return this.array_element(definitions.name_prefix());
},
name_suffix: function () {
- return this.array_rand(definitions.name_suffix());
+ return this.array_element(definitions.name_suffix());
},
catch_phrase_adjective: function () {
- return this.array_rand(definitions.catch_phrase_adjective());
+ return this.array_element(definitions.catch_phrase_adjective());
},
catch_phrase_descriptor: function () {
- return this.array_rand(definitions.catch_phrase_descriptor());
+ return this.array_element(definitions.catch_phrase_descriptor());
},
catch_phrase_noun: function () {
- return this.array_rand(definitions.catch_phrase_noun());
+ return this.array_element(definitions.catch_phrase_noun());
},
bs_adjective: function () {
- return this.array_rand(definitions.bs_adjective());
+ return this.array_element(definitions.bs_adjective());
},
bs_buzz: function () {
- return this.array_rand(definitions.bs_buzz());
+ return this.array_element(definitions.bs_buzz());
},
bs_noun: function () {
- return this.array_rand(definitions.bs_noun());
+ return this.array_element(definitions.bs_noun());
},
phone_formats: function () {
- return this.array_rand(definitions.phone_formats());
+ return this.array_element(definitions.phone_formats());
},
domain_suffix: function () {
- return this.array_rand(definitions.domain_suffix());
+ return this.array_element(definitions.domain_suffix());
}
};
diff --git a/test/address.unit.js b/test/address.unit.js
index 16824c3f..c6c91235 100644
--- a/test/address.unit.js
+++ b/test/address.unit.js
@@ -160,7 +160,7 @@ describe("address.js", function () {
describe("secondaryAddress()", function () {
it("randomly chooses an Apt or Suite number", function () {
- sinon.spy(Faker.random, 'array_rand');
+ sinon.spy(Faker.random, 'array_element');
var address = Faker.Address.secondaryAddress();
@@ -170,8 +170,8 @@ describe("address.js", function () {
];
assert.ok(address);
- assert.ok(Faker.random.array_rand.calledWith(expected_array));
- Faker.random.array_rand.restore();
+ assert.ok(Faker.random.array_element.calledWith(expected_array));
+ Faker.random.array_element.restore();
});
});
diff --git a/test/company.unit.js b/test/company.unit.js
index acfbe601..88d9d199 100644
--- a/test/company.unit.js
+++ b/test/company.unit.js
@@ -67,19 +67,19 @@ describe("company.js", function () {
describe("catchPhrase()", function () {
it("returns phrase comprising of a catch phrase adjective, descriptor, and noun", function () {
- sinon.spy(Faker.random, 'array_rand');
+ sinon.spy(Faker.random, 'array_element');
sinon.spy(Faker.random, 'catch_phrase_adjective');
sinon.spy(Faker.random, 'catch_phrase_descriptor');
sinon.spy(Faker.random, 'catch_phrase_noun');
var phrase = Faker.Company.catchPhrase();
assert.ok(phrase.split(' ').length >= 3);
- assert.ok(Faker.random.array_rand.calledThrice);
+ assert.ok(Faker.random.array_element.calledThrice);
assert.ok(Faker.random.catch_phrase_adjective.calledOnce);
assert.ok(Faker.random.catch_phrase_descriptor.calledOnce);
assert.ok(Faker.random.catch_phrase_noun.calledOnce);
- Faker.random.array_rand.restore();
+ Faker.random.array_element.restore();
Faker.random.catch_phrase_adjective.restore();
Faker.random.catch_phrase_descriptor.restore();
Faker.random.catch_phrase_noun.restore();
@@ -88,19 +88,19 @@ describe("company.js", function () {
describe("bs()", function () {
it("returns phrase comprising of a BS adjective, buzz, and noun", function () {
- sinon.spy(Faker.random, 'array_rand');
+ sinon.spy(Faker.random, 'array_element');
sinon.spy(Faker.random, 'bs_adjective');
sinon.spy(Faker.random, 'bs_buzz');
sinon.spy(Faker.random, 'bs_noun');
var bs = Faker.Company.bs();
assert.ok(typeof bs === 'string');
- assert.ok(Faker.random.array_rand.calledThrice);
+ assert.ok(Faker.random.array_element.calledThrice);
assert.ok(Faker.random.bs_adjective.calledOnce);
assert.ok(Faker.random.bs_buzz.calledOnce);
assert.ok(Faker.random.bs_noun.calledOnce);
- Faker.random.array_rand.restore();
+ Faker.random.array_element.restore();
Faker.random.bs_adjective.restore();
Faker.random.bs_buzz.restore();
Faker.random.bs_noun.restore();
diff --git a/test/internet.unit.js b/test/internet.unit.js
index 8653641c..fffcb244 100644
--- a/test/internet.unit.js
+++ b/test/internet.unit.js
@@ -33,13 +33,13 @@ describe("internet.js", function () {
sinon.stub(Faker.random, 'number').returns(1);
sinon.spy(Faker.random, 'first_name');
sinon.spy(Faker.random, 'last_name');
- sinon.spy(Faker.random, 'array_rand');
+ sinon.spy(Faker.random, 'array_element');
var username = Faker.Internet.userName();
assert.ok(username);
assert.ok(Faker.random.first_name.called);
assert.ok(Faker.random.last_name.called);
- assert.ok(Faker.random.array_rand.calledWith(['.', '_']));
+ assert.ok(Faker.random.array_element.calledWith(['.', '_']));
Faker.random.number.restore();
Faker.random.first_name.restore();