Merge pull request #145 from arigesher/master

[fix] Fixed male/female split check on findName()

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/name.js b/lib/name.js
index e61e0c41..cb43e596 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -3,7 +3,7 @@ var faker = require('../index');
 var _name = {
 
     firstName: function () {
-      if (typeof faker.locales[faker.locale].name.male_first_name !== "undefined" && typeof faker.locales[faker.locale].name.female_first_name !== "undefined") {
+      if (typeof faker.definitions.name.male_first_name !== "undefined" && typeof faker.definitions.name.female_first_name !== "undefined") {
         // some locale datasets ( like ru ) have first_name split by gender. since the name.first_name field does not exist in these datasets,
         // we must randomly pick a name from either gender array so faker.name.firstName will return the correct locale data ( and not fallback )
         var rand = faker.random.number(1);
@@ -17,7 +17,7 @@ var _name = {
     },
 
     lastName: function () {
-      if (typeof faker.locales[faker.locale].name.male_last_name !== "undefined" && typeof faker.locales[faker.locale].name.female_last_name !== "undefined") {
+      if (typeof faker.definitions.name.male_last_name !== "undefined" && typeof faker.defintions.name.female_last_name !== "undefined") {
         // some locale datasets ( like ru ) have last_name split by gender. i have no idea how last names can have genders, but also i do not speak russian
         // see above comment of firstName method
         var rand = faker.random.number(1);
diff --git a/test/name.unit.js b/test/name.unit.js
index 32bdef48..b34cbd1b 100644
--- a/test/name.unit.js
+++ b/test/name.unit.js
@@ -60,5 +60,11 @@ describe("name.js", function () {
 
             faker.random.number.restore();
         });
+
+        it("needs to work with specific locales and respect the fallbacks", function () {
+            faker.locale = 'en_US';
+            // this will throw if this is broken
+            var name = faker.name.findName();
+        });
     });
 });