cleanup per outmoded/hapi-contrib#31

Author: cjihrig

index.js

@@ -80,9 +80,10 @@ internals.Assertion.prototype.assert = function (result, verb, actual, expected)
 
 [].concat(internals.flags, internals.grammar).forEach(function (word) {
 
+    /* eslint-disable hapi/hapi-scope-start */
     var method = internals.flags.indexOf(word) !== -1 ? function () { this._flags[word] = !this._flags[word]; return this; }
                                                       : function () { return this; };
-
+    /* eslint-enable hapi/hapi-scope-start */
     Object.defineProperty(internals.Assertion.prototype, word, { get: method, configurable: true });
 });
 
@@ -166,8 +167,17 @@ internals.addMethod('length', function (size) {
 
 internals.addMethod(['equal', 'equals'], function (value, options) {
 
-    var compare = this._flags.deep ? function (a, b) { return Hoek.deepEqual(a, b, options); } :
-                                     function (a, b) { return a === b; };
+    var deepCompare = function (a, b) {
+
+        return Hoek.deepEqual(a, b, options);
+    };
+
+    var shallowCompare = function (a, b) {
+
+        return a === b;
+    };
+
+    var compare = this._flags.deep ? deepCompare : shallowCompare;
 
     return this.assert(compare(this._ref, value), 'equal specified value', this._ref, value);
 });

lib/index.js

@@ -3,7 +3,7 @@
   "description": "assertion library",
   "version": "1.4.0",
   "repository": "git://github.com/hapijs/code",
-  "main": "index",
+  "main": "lib/index",
   "keywords": [
     "test",
     "expect",
@@ -22,10 +22,5 @@
     "test": "lab -v -t 100 -L",
     "test-cov-html": "lab -L -r html -o coverage.html"
   },
-  "licenses": [
-    {
-      "type": "BSD",
-      "url": "http://github.com/hapijs/code/raw/master/LICENSE"
-    }
-  ]
+  "license": "BSD-3-Clause"
 }

package.json

@@ -1561,7 +1561,7 @@ describe('expect()', function () {
 
             it('invalidates assertion (anonymous)', function (done) {
 
-                function Custom() { }           /* eslint func-style:0 */
+                function Custom () { }           /* eslint func-style:0 */
 
                 var exception = false;
                 try {
@@ -1785,7 +1785,10 @@ describe('expect()', function () {
 
                 var exception = false;
                 try {
-                    Code.expect(function () { throw new Custom(); }).to.throw('kaboom');
+                    Code.expect(function () {
+
+                        throw new Custom();
+                    }).to.throw('kaboom');
                 }
                 catch (err) {
                     exception = err;
@@ -1813,7 +1816,10 @@ describe('expect()', function () {
 
                 var exception = false;
                 try {
-                    Code.expect(function () { throw new Error('kaboom'); }).to.throw('');
+                    Code.expect(function () {
+
+                        throw new Error('kaboom');
+                    }).to.throw('');
                 }
                 catch (err) {
                     exception = err;
@@ -1843,7 +1849,10 @@ describe('expect()', function () {
 
                 var exception = false;
                 try {
-                    Code.expect(function () { throw new Custom(); }).to.throw(Error);
+                    Code.expect(function () {
+
+                        throw new Custom();
+                    }).to.throw(Error);
                 }
                 catch (err) {
                     exception = err;