Merge branch 'master' of github.com:hapijs/code

Author: hueniverse

lib/index.js

@@ -259,7 +259,7 @@ internals.addMethod('empty', internals.empty);
 
 internals.length = function (size) {
 
-    internals.assert(this, typeof this._ref === 'object' || typeof this._ref === 'string', 'Can only assert empty on object, array or string');
+    internals.assert(this, (typeof this._ref === 'object' && this._ref !== null) || typeof this._ref === 'string', 'Can only assert length on object, array or string');
 
     const length = this._ref.length !== undefined ? this._ref.length : Object.keys(this._ref).length;
     return this.assert(length === size, 'have a length of ' + size, length);

test/index.js

@@ -1445,6 +1445,20 @@ describe('expect()', () => {
 
                 Hoek.assert(exception.message === 'Expected \'a\' to have a length of 10 but got 1', exception);
             });
+
+            it('throws on length check on objects with no length property', (done) => {
+
+                let exception = false;
+                try {
+                    Code.expect(null).to.have.length(2);
+                }
+                catch (err) {
+                    exception = err;
+                }
+
+                Hoek.assert(exception.message === 'Can only assert length on object, array or string', exception);
+                done();
+            });
         });
 
         describe('equal()', () => {