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);
 };
 
 /**

package-lock.json

@@ -33,19 +33,19 @@
   },
   "dependencies": {
     "methods": "1.1.2",
-    "superagent": "5.1.0"
+    "superagent": "6.1.0"
   },
   "devDependencies": {
     "body-parser": "1.19.0",
-    "cookie-parser": "1.4.4",
-    "coveralls": "3.0.6",
-    "eslint": "6.5.1",
-    "eslint-config-airbnb-base": "14.0.0",
-    "eslint-plugin-import": "2.18.2",
+    "cookie-parser": "1.4.5",
+    "coveralls": "3.1.0",
+    "eslint": "7.9.0",
+    "eslint-config-airbnb-base": "14.2.0",
+    "eslint-plugin-import": "2.22.0",
     "express": "4.17.1",
-    "mocha": "6.2.1",
-    "nock": "11.3.5",
-    "nyc": "14.1.1",
+    "mocha": "8.1.3",
+    "nock": "13.0.4",
+    "nyc": "15.1.0",
     "should": "13.2.3"
   }
 }

package.json

@@ -521,7 +521,7 @@ describe('request(app)', function () {
         .get('/')
         .expect({ stringValue: 'foo', numberValue: 3, nestedObject: { innerString: 5 } })
         .end(function (err, res) {
-          err.message.should.equal('expected { stringValue: \'foo\',\n  numberValue: 3,\n  nestedObject: { innerString: 5 } } response body, got { stringValue: \'foo\',\n  numberValue: 3,\n  nestedObject: { innerString: \'5\' } }'); // eslint-disable-line max-len
+          err.message.should.equal('expected {\n  stringValue: \'foo\',\n  numberValue: 3,\n  nestedObject: { innerString: 5 }\n} response body, got {\n  stringValue: \'foo\',\n  numberValue: 3,\n  nestedObject: { innerString: \'5\' }\n}'); // eslint-disable-line max-len
 
           request(app)
             .get('/')