nock 13.0.0 → 13.0.4

package/CHANGELOG.md

@@ -3,4 +3,4 @@
 Nock’s changelog can be found directly in the [GitHub release notes](https://github.com/nock/nock/releases).  
 These are automatically created by [semantic-release](https://github.com/semantic-release/semantic-release) based on their [commit message conventions](https://semantic-release.gitbook.io/semantic-release#commit-message-format).
 
-Migration guides are available for major versions in the [migration guides directory](https://github.com/nock/nock/tree/master/migration_guides).
+Migration guides are available for major versions in the [migration guides directory](https://github.com/nock/nock/tree/main/migration_guides).

package/README.md

@@ -574,7 +574,7 @@ const scope = nock('http://www.headdy.com')
 
 #### Including Content-Length Header Automatically
 
-When using `scope.reply()` to set a response body manually, you can have the
+When using `interceptor.reply()` to set a response body manually, you can have the
 `Content-Length` header calculated automatically.
 
 ```js

package/lib/common.js

@@ -180,7 +180,7 @@ function isContentEncoded(headers) {
 
 function contentEncoding(headers, encoder) {
   const contentEncoding = headers['content-encoding']
-  return contentEncoding === encoder
+  return contentEncoding !== undefined && contentEncoding.toString() === encoder
 }
 
 function isJSONContent(headers) {
@@ -548,8 +548,15 @@ function urlToOptions(url) {
  *  - The expected data can use regexp to compare values
  *  - JSON path notation and nested objects are considered equal
  */
-const dataEqual = (expected, actual) =>
-  deepEqual(expand(expected), expand(actual))
+const dataEqual = (expected, actual) => {
+  if (isPlainObject(expected)) {
+    expected = expand(expected)
+  }
+  if (isPlainObject(actual)) {
+    actual = expand(actual)
+  }
+  return deepEqual(expected, actual)
+}
 
 /**
  * Converts flat objects whose keys use JSON path notation to nested objects.
@@ -573,17 +580,20 @@ function deepEqual(expected, actual) {
     return expected.test(actual)
   }
 
-  if (Array.isArray(expected) || isPlainObject(expected)) {
-    if (actual === undefined) {
+  if (Array.isArray(expected) && Array.isArray(actual)) {
+    if (expected.length !== actual.length) {
       return false
     }
 
-    const expKeys = Object.keys(expected)
-    if (expKeys.length !== Object.keys(actual).length) {
-      return false
-    }
+    return expected.every((expVal, idx) => deepEqual(expVal, actual[idx]))
+  }
+
+  if (isPlainObject(expected) && isPlainObject(actual)) {
+    const allKeys = Array.from(
+      new Set(Object.keys(expected).concat(Object.keys(actual)))
+    )
 
-    return expKeys.every(key => deepEqual(expected[key], actual[key]))
+    return allKeys.every(key => deepEqual(expected[key], actual[key]))
   }
 
   return expected === actual

package/lib/intercepted_request_router.js

@@ -146,7 +146,7 @@ class InterceptedRequestRouter {
 
       // It seems odd to return `true` here, not sure why you'd want to have
       // the stream potentially written to more, but it's what Node does.
-      // https://github.com/nodejs/node/blob/master/lib/_http_outgoing.js#L662-L665
+      // https://github.com/nodejs/node/blob/a9270dcbeba4316b1e179b77ecb6c46af5aa8c20/lib/_http_outgoing.js#L662-L665
       return true
     }
 
@@ -295,6 +295,8 @@ class InterceptedRequestRouter {
         'interceptor identified, starting mocking'
       )
 
+      matchedInterceptor.markConsumed()
+
       // wait to emit the finish event until we know for sure an Interceptor is going to playback.
       // otherwise an unmocked request might emit finish twice.
       req.emit('finish')

package/lib/playback_interceptor.js

@@ -124,8 +124,6 @@ function playbackInterceptor({
   const { logger } = interceptor.scope
 
   function start() {
-    interceptor.markConsumed()
-    interceptor.req = req
     req.headers = req.getHeaders()
 
     interceptor.scope.emit('request', req, interceptor, requestBodyString)
@@ -151,6 +149,13 @@ function playbackInterceptor({
     response.rawHeaders = [...interceptor.rawHeaders]
     logger('response.rawHeaders:', response.rawHeaders)
 
+    // TODO: MAJOR: Don't tack the request onto the interceptor.
+    // The only reason we do this is so that it's available inside reply functions.
+    // It would be better to pass the request as an argument to the functions instead.
+    // Not adding the req as a third arg now because it should first be decided if (path, body, req)
+    // is the signature we want to go with going forward.
+    interceptor.req = req
+
     if (interceptor.replyFunction) {
       const parsedRequestBody = parseJSONRequestBody(req, requestBodyString)
 

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.0.0",
+  "version": "13.0.4",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -33,16 +33,17 @@
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "dtslint": "^3.0.0",
-    "eslint": "^6.0.0",
+    "eslint": "^7.3.1",
     "eslint-config-prettier": "^6.0.0",
     "eslint-config-standard": "^14.0.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-mocha": "^7.0.1",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
-    "got": "^10.5.2",
-    "mocha": "^7.0.1",
+    "form-data": "^3.0.0",
+    "got": "^11.3.0",
+    "mocha": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
     "prettier": "2.0.5",
@@ -62,7 +63,6 @@
     "lint:js": "eslint --cache --cache-location './.cache/eslint' '**/*.js'",
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
     "lint:ts": "dtslint types",
-    "semantic-release": "semantic-release",
     "test": "run-s test:mocha test:tap",
     "test:coverage": "tap --coverage-report=html && open coverage/lcov-report/index.html",
     "test:mocha": "nyc mocha $(grep -lr '^\\s*it(' tests)",
@@ -82,5 +82,21 @@
     "index.js",
     "lib",
     "types/index.d.ts"
-  ]
+  ],
+  "release": {
+    "branches": [
+      "+([0-9])?(.{+([0-9]),x}).x",
+      "main",
+      "next",
+      "next-major",
+      {
+        "name": "beta",
+        "prerelease": true
+      },
+      {
+        "name": "alpha",
+        "prerelease": true
+      }
+    ]
+  }
 }