Merge pull request #673 from visionmedia/v5.0.0-1

feat(v5.0.0): next release

Author: rimiti

.eslintrc

@@ -14,7 +14,6 @@
     "consistent-return": [0],
 
     // Disabled but may want to refactor code eventually
-    "no-shadow": [1],
     "no-use-before-define": [2, "nofunc"],
     "no-underscore-dangle": [0],
 

lib/test.js

@@ -147,7 +147,7 @@ Test.prototype.end = function(fn) {
  */
 
 Test.prototype.assert = function(resError, res, fn) {
-  var error;
+  var errorObj;
   var i;
 
   // check for unexpected network errors or server not running/reachable errors
@@ -164,23 +164,23 @@ Test.prototype.assert = function(resError, res, fn) {
   if (!res && resError) {
     if (resError instanceof Error && resError.syscall === 'connect'
         && Object.getOwnPropertyNames(sysErrors).indexOf(resError.code) >= 0) {
-      error = new Error(resError.code + ': ' + sysErrors[resError.code]);
+      errorObj = new Error(resError.code + ': ' + sysErrors[resError.code]);
     } else {
-      error = resError;
+      errorObj = resError;
     }
   }
 
   // asserts
-  for (i = 0; i < this._asserts.length && !error; i += 1) {
-    error = this._assertFunction(this._asserts[i], res);
+  for (i = 0; i < this._asserts.length && !errorObj; i += 1) {
+    errorObj = this._assertFunction(this._asserts[i], res);
   }
 
   // set unexpected superagent error if no other error has occurred.
-  if (!error && resError instanceof Error && (!res || resError.status !== res.status)) {
-    error = resError;
+  if (!errorObj && resError instanceof Error && (!res || resError.status !== res.status)) {
+    errorObj = resError;
   }
 
-  fn.call(this, error || null, res);
+  fn.call(this, errorObj || null, res);
 };
 
 /**