Use randmly cityname when available

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/address.js b/lib/address.js
index 1ccbfdc9..29a0653a 100644
--- a/lib/address.js
+++ b/lib/address.js
@@ -55,15 +55,12 @@ function Address (faker) {
    * * `{{address.cityPrefix}} {{name.firstName}}`
    * * `{{name.firstName}}{{address.citySuffix}}`
    * * `{{name.lastName}}{{address.citySuffix}}`
+   * * `{{address.cityName}}` when city name is available
    *
    * @method faker.address.city
    * @param {String} format
    */
   this.city = function (format) {
-    if (!format && faker.definitions.address.city_name) {
-      return this.cityName();
-    }
-
     var formats = [
       '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}',
       '{{address.cityPrefix}} {{name.firstName}}',
@@ -71,6 +68,10 @@ function Address (faker) {
       '{{name.lastName}}{{address.citySuffix}}'
     ];
 
+    if (!format && faker.definitions.address.city_name) {
+      formats.push('{{address.cityName}}');
+    }
+
     if (typeof format !== "number") {
       format = faker.random.number(formats.length - 1);
     }