linting and getting address.js to 100% test coverage

6 files changed, 73 insertions, 9 deletions

diff --git a/Faker.js b/Faker.js
index b8f7ad33..a9a55793 100644
--- a/Faker.js
+++ b/Faker.js
@@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-/*************** AUTOGENERATED @ 1357580683487 ***************
+/*************** AUTOGENERATED @ 1357580960993 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!
diff --git a/Readme.md b/Readme.md
index 19309e1f..06ec1e44 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,6 @@
        npm install .
        make test
 You can view a code coverage report generated in coverage/lcov-report/index.html.
-Running `make` by itself will run JShint as well.
 ## Authors
 ####Matthew Bergman & Marak Squires
 Heavily inspired by Benjamin Curtis's Ruby Gem [Faker](http://faker.rubyforge.org/) and Perl's [Data::Faker](http://search.cpan.org/~jasonk/Data-Faker-0.07/lib/Data/Faker.pm)
diff --git a/examples/js/Faker.js b/examples/js/Faker.js
index b8f7ad33..a9a55793 100644
--- a/examples/js/Faker.js
+++ b/examples/js/Faker.js
@@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-/*************** AUTOGENERATED @ 1357580683487 ***************
+/*************** AUTOGENERATED @ 1357580960993 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!
diff --git a/lib/company.js b/lib/company.js
index 0b635e73..4bf11db5 100644
--- a/lib/company.js
+++ b/lib/company.js
@@ -1,7 +1,7 @@
 var Faker = require('../index');
 
 var company = {
-    suffixes: function() {
+    suffixes: function () {
         return ["Inc", "and Sons", "LLC", "Group", "and Daughters"];
     },
 
diff --git a/test/address.unit.js b/test/address.unit.js
index 1782a099..16824c3f 100644
--- a/test/address.unit.js
+++ b/test/address.unit.js
@@ -158,11 +158,24 @@ describe("address.js", function () {
         });
     });
 
-    describe("secondaryAddress()", function() {
-        // TODO
+    describe("secondaryAddress()", function () {
+        it("randomly chooses an Apt or Suite number", function () {
+            sinon.spy(Faker.random, 'array_rand');
+
+            var address = Faker.Address.secondaryAddress();
+            
+            var expected_array = [
+                'Apt. ###',
+                'Suite ###'
+            ];
+            
+            assert.ok(address);
+            assert.ok(Faker.random.array_rand.calledWith(expected_array));
+            Faker.random.array_rand.restore();
+        });
     });
 
-    describe("brState()", function() {
+    describe("brState()", function () {
         beforeEach(function () {
             sinon.spy(Faker.random, 'br_state_abbr');
             sinon.spy(Faker.random, 'br_state');
@@ -193,4 +206,56 @@ describe("address.js", function () {
             });
         });
     });
+
+    describe("ukCounty()", function () {
+        it("returns random uk_county", function () {
+            sinon.spy(Faker.random, 'uk_county');
+            var county = Faker.Address.ukCounty();
+            assert.ok(county);
+            assert.ok(Faker.random.uk_county.called);
+            Faker.random.uk_county.restore();
+        });
+    });
+
+    describe("ukCountry()", function () {
+        it("returns random uk_country", function () {
+            sinon.spy(Faker.random, 'uk_country');
+            var country = Faker.Address.ukCountry();
+            assert.ok(country);
+            assert.ok(Faker.random.uk_country.called);
+            Faker.random.uk_country.restore();
+        });
+    });
+
+    describe("usState()", function () {
+        beforeEach(function () {
+            sinon.spy(Faker.random, 'us_state_abbr');
+            sinon.spy(Faker.random, 'us_state');
+        });
+
+        afterEach(function () {
+            Faker.random.us_state_abbr.restore();
+            Faker.random.us_state.restore();
+        });
+
+        context("when useAbus is true", function () {
+            it("returns a us_state_abbr", function () {
+                var state = Faker.Address.usState(true);
+
+                assert.ok(state);
+                assert.ok(Faker.random.us_state_abbr.called);
+                assert.ok(!Faker.random.us_state.called);
+            });
+        });
+
+        context("when useAbus is not set", function () {
+            it("returns a us_state", function () {
+                var state = Faker.Address.usState();
+
+                assert.ok(state);
+                assert.ok(!Faker.random.us_state_abbr.called);
+                assert.ok(Faker.random.us_state.called);
+            });
+        });
+    });
 });
diff --git a/test/all.functional.js b/test/all.functional.js
index 7f9af6ec..174cc38f 100644
--- a/test/all.functional.js
+++ b/test/all.functional.js
@@ -34,8 +34,8 @@ describe("functional tests", function () {
         });
     });
 
-    describe("Address", function() {
-        it("zipCodeFormat()", function() {
+    describe("Address", function () {
+        it("zipCodeFormat()", function () {
             var result = Faker.Address.zipCodeFormat(0);
             assert.ok(!result.match(/-/));