nock 11.5.0 → 11.7.2

package/README.md

@@ -58,6 +58,7 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
 - [Expectations](#expectations)
   - [.isDone()](#isdone)
   - [.cleanAll()](#cleanall)
+  - [.abortPendingRequests()](#abortpendingrequests)
   - [.persist()](#persist)
   - [.pendingMocks()](#pendingmocks)
   - [.activeMocks()](#activemocks)
@@ -995,6 +996,14 @@ You can cleanup all the prepared mocks (could be useful to cleanup some state af
 nock.cleanAll()
 ```
 
+### .abortPendingRequests()
+
+You can abort all current pending request like this:
+
+```js
+nock.abortPendingRequests()
+```
+
 ### .persist()
 
 You can make all the interceptors for a scope persist by calling `.persist()` on it:

package/index.js

@@ -12,6 +12,7 @@ const {
   disableNetConnect,
   enableNetConnect,
   removeAll,
+  abortPendingRequests,
 } = require('./lib/intercept')
 const recorder = require('./lib/recorder')
 const { Scope, load, loadDefs, define } = require('./lib/scope')
@@ -28,13 +29,14 @@ Object.assign(module.exports, {
   disableNetConnect,
   enableNetConnect,
   // TODO-12.x Historically `nock.cleanAll()` has returned the nock global.
-  // The other global methods do noto do this, so it's not clear this was
+  // The other global methods do not do this, so it's not clear this was
   // deliberate or is even helpful. This shim is included for backward
   // compatibility and shoulud be replaced with an alias to `removeAll()`.
   cleanAll() {
     removeAll()
     return module.exports
   },
+  abortPendingRequests,
   load,
   loadDefs,
   define,

package/lib/back.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const assert = require('assert')
 const _ = require('lodash')
 const recorder = require('./recorder')
 const {
@@ -12,7 +13,6 @@ const { loadDefs, define } = require('./scope')
 
 const { format } = require('util')
 const path = require('path')
-const { expect } = require('chai')
 const debug = require('debug')('nock.back')
 
 let _mode = null
@@ -61,6 +61,7 @@ function Back(fixtureName, options, nockedFn) {
     )
   }
 
+  // TODO-12.x: Replace with `typeof fixtureName === 'string'`.
   if (!_.isString(fixtureName)) {
     throw new Error('Parameter fixtureName must be a string')
   }
@@ -70,7 +71,7 @@ function Back(fixtureName, options, nockedFn) {
   } else if (arguments.length === 2) {
     // If 2nd parameter is a function then `options` has been omitted
     // otherwise `options` haven't been omitted but `nockedFn` was.
-    if (_.isFunction(options)) {
+    if (typeof options === 'function') {
       nockedFn = options
       options = {}
     }
@@ -88,7 +89,7 @@ function Back(fixtureName, options, nockedFn) {
   debug('context:', context)
 
   // If nockedFn is a function then invoke it, otherwise return a promise resolving to nockDone.
-  if (_.isFunction(nockedFn)) {
+  if (typeof nockedFn === 'function') {
     nockedFn.call(context, nockDone)
   } else {
     return Promise.resolve({ nockDone, context })
@@ -244,16 +245,19 @@ function fixtureExists(fixture) {
 }
 
 function assertScopes(scopes, fixture) {
-  scopes.forEach(function(scope) {
-    expect(scope.isDone()).to.be.equal(
-      true,
+  const pending = scopes
+    .filter(scope => !scope.isDone())
+    .map(scope => scope.pendingMocks())
+
+  if (pending.length) {
+    assert.fail(
       format(
         '%j was not used, consider removing %s to rerecord fixture',
-        scope.pendingMocks(),
+        [].concat(...pending),
         fixture
       )
     )
-  })
+  }
 }
 
 const Modes = {

package/lib/common.js

@@ -3,6 +3,7 @@
 const _ = require('lodash')
 const debug = require('debug')('nock.common')
 const url = require('url')
+const timers = require('timers')
 
 /**
  * Normalizes the request options so that it always has `host` property.
@@ -37,23 +38,16 @@ function normalizeRequestOptions(options) {
 }
 
 /**
- * Returns false if the data contained in buffer can be reconstructed
+ * Returns true if the data contained in buffer can be reconstructed
  * from its utf8 representation.
  *
- * TODO: Reverse the semantics of this method and refactor calling code
- * accordingly. We've inadvertently gotten it flipped.
- *
  * @param  {Object} buffer - a Buffer object
  * @returns {boolean}
  */
 function isUtf8Representable(buffer) {
-  if (!Buffer.isBuffer(buffer)) {
-    return false
-  }
-
   const utfEncodedBuffer = buffer.toString('utf8')
   const reconstructedBuffer = Buffer.from(utfEncodedBuffer, 'utf8')
-  return !reconstructedBuffer.equals(buffer)
+  return reconstructedBuffer.equals(buffer)
 }
 
 //  Array where all information about all the overridden requests are held.
@@ -176,6 +170,7 @@ function stringifyRequest(options, body) {
 
 function isContentEncoded(headers) {
   const contentEncoding = headers['content-encoding']
+  // TODO-12.x: Replace with `typeof contentEncoding === 'string'`.
   return _.isString(contentEncoding) && contentEncoding !== ''
 }
 
@@ -365,6 +360,7 @@ function deleteHeadersField(headers, fieldNameToDelete) {
     throw Error('headers must be an object')
   }
 
+  // TODO-12.x: Replace with `typeof fieldNameToDelete !== 'string'`.
   if (!_.isString(fieldNameToDelete)) {
     throw Error('field name must be a string')
   }
@@ -446,6 +442,7 @@ function formatQueryValue(key, value, stringFormattingFn) {
     case value === undefined:
       value = ''
       break
+    // TODO-12.x: Replace with `typeof value === 'string'`.
     case _.isString(value):
       if (stringFormattingFn) {
         value = stringFormattingFn(value)
@@ -459,7 +456,7 @@ function formatQueryValue(key, value, stringFormattingFn) {
       })
       break
     }
-    case _.isObject(value): {
+    case typeof value === 'object': {
       value = Object.entries(value).reduce(function(acc, [subKey, subVal]) {
         const subPair = formatQueryValue(subKey, subVal, stringFormattingFn)
         acc[subPair[0]] = subPair[1]
@@ -479,7 +476,7 @@ function isStream(obj) {
     obj &&
     typeof obj !== 'string' &&
     !Buffer.isBuffer(obj) &&
-    _.isFunction(obj.setEncoding)
+    typeof obj.setEncoding === 'function'
   )
 }
 
@@ -593,6 +590,32 @@ function deepEqual(expected, actual) {
   return expected === actual
 }
 
+const timeouts = []
+const intervals = []
+const immediates = []
+
+const wrapTimer = (timer, ids) => (...args) => {
+  const id = timer(...args)
+  ids.push(id)
+  return id
+}
+
+const setTimeout = wrapTimer(timers.setTimeout, timeouts)
+const setInterval = wrapTimer(timers.setInterval, intervals)
+const setImmediate = wrapTimer(timers.setImmediate, immediates)
+
+function clearTimer(clear, ids) {
+  while (ids.length) {
+    clear(ids.shift())
+  }
+}
+
+function removeAllTimers() {
+  clearTimer(clearTimeout, timeouts)
+  clearTimer(clearInterval, intervals)
+  clearTimer(clearImmediate, immediates)
+}
+
 exports.normalizeClientRequestArgs = normalizeClientRequestArgs
 exports.normalizeRequestOptions = normalizeRequestOptions
 exports.normalizeOrigin = normalizeOrigin
@@ -615,3 +638,7 @@ exports.matchStringOrRegexp = matchStringOrRegexp
 exports.formatQueryValue = formatQueryValue
 exports.isStream = isStream
 exports.dataEqual = dataEqual
+exports.setTimeout = setTimeout
+exports.setInterval = setInterval
+exports.setImmediate = setImmediate
+exports.removeAllTimers = removeAllTimers

package/lib/delayed_body.js

@@ -34,7 +34,7 @@ module.exports = class DelayedBody extends Transform {
 
     // TODO: This would be more readable if the stream case were moved into
     // the `if` statement above.
-    setTimeout(function() {
+    common.setTimeout(function() {
       if (common.isStream(body) && !ended) {
         body.once('end', function() {
           self.end(data)

package/lib/intercept.js

@@ -11,7 +11,6 @@ const http = require('http')
 const _ = require('lodash')
 const debug = require('debug')('nock.intercept')
 const globalEmitter = require('./global_emitter')
-const timers = require('timers')
 
 /**
  * @name NetConnectNotAllowedError
@@ -53,9 +52,10 @@ let allowNetConnect
  * nock.enableNetConnect(/(google|amazon)/);
  */
 function enableNetConnect(matcher) {
+  // TODO-12.x: Replace with `typeof matcher === 'string'`.
   if (_.isString(matcher)) {
     allowNetConnect = new RegExp(matcher)
-  } else if (_.isObject(matcher) && _.isFunction(matcher.test)) {
+  } else if (matcher instanceof RegExp) {
     allowNetConnect = matcher
   } else {
     allowNetConnect = /.*/
@@ -160,7 +160,9 @@ function interceptorsFor(options) {
 
         // Keep the filtered scope (its key) to signal the rest of the module
         // that this wasn't an exact but filtered match.
-        interceptor.__nock_filteredScope = interceptor.__nock_scopeKey
+        interceptors.forEach(ic => {
+          ic.__nock_filteredScope = ic.__nock_scopeKey
+        })
         return interceptors
       }
     }
@@ -171,7 +173,7 @@ function interceptorsFor(options) {
         return [
           {
             options: { allowUnmocked: true },
-            matchAddress() {
+            matchOrigin() {
               return false
             },
           },
@@ -293,7 +295,7 @@ function overrideClientRequest() {
       if (isOff() || isEnabledForNetConnect(options)) {
         originalClientRequest.apply(this, arguments)
       } else {
-        timers.setImmediate(
+        common.setImmediate(
           function() {
             const error = new NetConnectNotAllowedError(
               options.host,
@@ -390,13 +392,12 @@ function activate() {
     const interceptors = interceptorsFor(options)
 
     if (isOn() && interceptors) {
-      const matches = !!_.find(interceptors, function(interceptor) {
-        return interceptor.matchAddress(options)
-      })
-
-      const allowUnmocked = !!_.find(interceptors, function(interceptor) {
-        return interceptor.options.allowUnmocked
-      })
+      const matches = interceptors.some(interceptor =>
+        interceptor.matchOrigin(options)
+      )
+      const allowUnmocked = interceptors.some(
+        interceptor => interceptor.options.allowUnmocked
+      )
 
       if (!matches && allowUnmocked) {
         let req
@@ -444,4 +445,5 @@ module.exports = {
   disableNetConnect,
   overrideClientRequest,
   restoreOverriddenClientRequest,
+  abortPendingRequests: common.removeAllTimers,
 }

package/lib/intercepted_request_router.js

@@ -8,7 +8,6 @@ const {
 } = require('http')
 const { request: originalHttpsRequest } = require('https')
 const propagate = require('propagate')
-const timers = require('timers')
 const common = require('./common')
 const globalEmitter = require('./global_emitter')
 const Socket = require('./socket')
@@ -31,7 +30,7 @@ class InterceptedRequestRouter {
     }
     this.interceptors = interceptors
 
-    this.socket = new Socket({ proto: options.proto })
+    this.socket = new Socket(options)
     this.response = new IncomingMessage(this.socket)
     this.playbackStarted = false
     this.requestBodyBuffers = []
@@ -74,7 +73,7 @@ class InterceptedRequestRouter {
 
     // https://github.com/nock/nock/issues/256
     if (options.headers.expect === '100-continue') {
-      timers.setImmediate(() => {
+      common.setImmediate(() => {
         debug('continue')
         req.emit('continue')
       })
@@ -114,6 +113,10 @@ class InterceptedRequestRouter {
         }
         this.requestBodyBuffers.push(buffer)
       }
+      // can't use instanceof Function because some test runners
+      // run tests in vm.runInNewContext where Function is not same
+      // as that in the current context
+      // https://github.com/nock/nock/pull/1754#issuecomment-571531407
       if (typeof callback === 'function') {
         callback()
       }
@@ -121,7 +124,7 @@ class InterceptedRequestRouter {
       this.emitError(new Error('Request aborted'))
     }
 
-    timers.setImmediate(function() {
+    common.setImmediate(function() {
       req.emit('drain')
     })
 
@@ -232,8 +235,9 @@ class InterceptedRequestRouter {
       // Re-update `options` with the current value of `req.path` because badly
       // behaving agents like superagent like to change `req.path` mid-flight.
       path: req.path,
-      // similarly, node-http-proxy will modify headers in flight, so we have
+      // Similarly, node-http-proxy will modify headers in flight, so we have
       // to put the headers back into options.
+      // https://github.com/nock/nock/pull/1484
       headers: req.getHeaders(),
       // Fixes https://github.com/nock/nock/issues/976
       protocol: `${options.proto}:`,
@@ -246,11 +250,11 @@ class InterceptedRequestRouter {
     const requestBodyBuffer = Buffer.concat(this.requestBodyBuffers)
     // When request body is a binary buffer we internally use in its hexadecimal
     // representation.
-    const isBinaryRequestBodyBuffer = common.isUtf8Representable(
+    const requestBodyIsUtf8Representable = common.isUtf8Representable(
       requestBodyBuffer
     )
     const requestBodyString = requestBodyBuffer.toString(
-      isBinaryRequestBodyBuffer ? 'hex' : 'utf8'
+      requestBodyIsUtf8Representable ? 'utf8' : 'hex'
     )
 
     const matchedInterceptor = interceptors.find(i =>
@@ -265,7 +269,7 @@ class InterceptedRequestRouter {
         socket,
         options,
         requestBodyString,
-        isBinaryRequestBodyBuffer,
+        requestBodyIsUtf8Representable,
         response,
         interceptor: matchedInterceptor,
       })

package/lib/interceptor.js

@@ -110,7 +110,7 @@ module.exports = class Interceptor {
 
   reply(statusCode, body, rawHeaders) {
     // support the format of only passing in a callback
-    if (_.isFunction(statusCode)) {
+    if (typeof statusCode === 'function') {
       if (arguments.length > 1) {
         // It's not very Javascript-y to throw an error for extra args to a function, but because
         // of legacy behavior, this error was added to reduce confusion for those migrating.
@@ -126,7 +126,7 @@ module.exports = class Interceptor {
       }
 
       this.statusCode = statusCode || 200
-      if (_.isFunction(body)) {
+      if (typeof body === 'function') {
         this.replyFunction = body
         body = null
       }
@@ -200,6 +200,8 @@ module.exports = class Interceptor {
     const reqHeader = this.reqheaders[key]
     let header = options.headers[key]
 
+    // https://github.com/nock/nock/issues/399
+    // https://github.com/nock/nock/issues/822
     if (header && typeof header !== 'string' && header.toString) {
       header = header.toString()
     }
@@ -213,7 +215,7 @@ module.exports = class Interceptor {
     }
 
     if (reqHeader !== undefined && header !== undefined) {
-      if (_.isFunction(reqHeader)) {
+      if (typeof reqHeader === 'function') {
         return reqHeader(header)
       } else if (common.matchStringOrRegexp(header, reqHeader)) {
         return true
@@ -352,9 +354,9 @@ module.exports = class Interceptor {
    * Return true when the interceptor's method, protocol, host, port, and path
    * match the provided options.
    */
-  matchAddress(options) {
-    const isRegex = _.isRegExp(this.path)
-    const isRegexBasePath = _.isRegExp(this.scope.basePath)
+  matchOrigin(options) {
+    const isRegex = this.path instanceof RegExp
+    const isRegexBasePath = this.scope.basePath instanceof RegExp
 
     const method = (options.method || 'GET').toUpperCase()
     let { path } = options
@@ -395,7 +397,7 @@ module.exports = class Interceptor {
     debug('Interceptor queries: %j', this.queries)
     debug('    Request queries: %j', reqQueries)
 
-    if (_.isFunction(this.queries)) {
+    if (typeof this.queries === 'function') {
       return this.queries(reqQueries)
     }
 
@@ -456,7 +458,7 @@ module.exports = class Interceptor {
       return this
     }
 
-    if (_.isFunction(queries)) {
+    if (typeof queries === 'function') {
       this.queries = queries
       return this
     }
@@ -553,7 +555,7 @@ module.exports = class Interceptor {
     if (_.isNumber(opts)) {
       headDelay = opts
       bodyDelay = 0
-    } else if (_.isObject(opts)) {
+    } else if (typeof opts === 'object') {
       headDelay = opts.head || 0
       bodyDelay = opts.body || 0
     } else {

package/lib/match_body.js

@@ -11,11 +11,8 @@ module.exports = function matchBody(options, spec, body) {
   }
 
   if (Buffer.isBuffer(spec)) {
-    if (common.isUtf8Representable(spec)) {
-      spec = spec.toString('hex')
-    } else {
-      spec = spec.toString('utf8')
-    }
+    const encoding = common.isUtf8Representable(spec) ? 'utf8' : 'hex'
+    spec = spec.toString(encoding)
   }
 
   const contentType = (
@@ -59,12 +56,7 @@ module.exports = function matchBody(options, spec, body) {
   // Because the nature of URL encoding, all the values in the body have been cast to strings.
   // dataEqual does strict checking so we we have to cast the non-regexp values in the spec too.
   if (isUrlencoded) {
-    spec = mapValuesDeep(spec, function(val) {
-      if (_.isRegExp(val)) {
-        return val
-      }
-      return `${val}`
-    })
+    spec = mapValuesDeep(spec, val => (val instanceof RegExp ? val : `${val}`))
   }
 
   return common.dataEqual(spec, body)
@@ -76,14 +68,10 @@ module.exports = function matchBody(options, spec, body) {
  */
 function mapValuesDeep(obj, cb) {
   if (Array.isArray(obj)) {
-    return obj.map(function(v) {
-      return mapValuesDeep(v, cb)
-    })
+    return obj.map(v => mapValuesDeep(v, cb))
   }
   if (_.isPlainObject(obj)) {
-    return _.mapValues(obj, function(v) {
-      return mapValuesDeep(v, cb)
-    })
+    return _.mapValues(obj, v => mapValuesDeep(v, cb))
   }
   return cb(obj)
 }

package/lib/playback_interceptor.js

@@ -1,10 +1,8 @@
 'use strict'
 
 const util = require('util')
-const timers = require('timers')
 const zlib = require('zlib')
 const debug = require('debug')('nock.playback_interceptor')
-const _ = require('lodash')
 const common = require('./common')
 const DelayedBody = require('./delayed_body')
 
@@ -81,7 +79,7 @@ function playbackInterceptor({
   socket,
   options,
   requestBodyString,
-  isBinaryRequestBodyBuffer,
+  requestBodyIsUtf8Representable,
   response,
   interceptor,
 }) {
@@ -101,12 +99,12 @@ function playbackInterceptor({
       interceptor.markConsumed()
 
       let error
-      if (_.isObject(interceptor.errorMessage)) {
+      if (typeof interceptor.errorMessage === 'object') {
         error = interceptor.errorMessage
       } else {
         error = new Error(interceptor.errorMessage)
       }
-      timers.setTimeout(() => emitError(error), interceptor.getTotalDelay())
+      common.setTimeout(() => emitError(error), interceptor.getTotalDelay())
       return
     }
 
@@ -179,10 +177,10 @@ function playbackInterceptor({
     // will eventually be JSON stringified.
     let responseBody = interceptor.body
 
-    // If the request was binary then we assume that the response will be binary
-    // as well. In that case we send the response as a Buffer object as that's
-    // what the client will expect.
-    if (isBinaryRequestBodyBuffer && typeof responseBody === 'string') {
+    // If the request was not UTF8-representable then we assume that the
+    // response won't be either. In that case we send the response as a Buffer
+    // object as that's what the client will expect.
+    if (!requestBodyIsUtf8Representable && typeof responseBody === 'string') {
       // Try to create the buffer from the interceptor's body response as hex.
       responseBody = Buffer.from(responseBody, 'hex')
 
@@ -311,13 +309,13 @@ function playbackInterceptor({
         }
 
         // Stream the response chunks one at a time.
-        timers.setImmediate(function emitChunk() {
+        common.setImmediate(function emitChunk() {
           const chunk = responseBuffers.shift()
 
           if (chunk) {
             debug('emitting response chunk')
             response.push(chunk)
-            timers.setImmediate(emitChunk)
+            common.setImmediate(emitChunk)
           } else {
             debug('ending response stream')
             response.push(null)
@@ -338,7 +336,7 @@ function playbackInterceptor({
       interceptor.delayConnectionInMs > 0
     ) {
       socket.applyDelay(interceptor.delayConnectionInMs)
-      setTimeout(respond, interceptor.delayConnectionInMs)
+      common.setTimeout(respond, interceptor.delayConnectionInMs)
     } else {
       respond()
     }

package/lib/recorder.js

@@ -21,9 +21,9 @@ function getMethod(options) {
 }
 
 function getBodyFromChunks(chunks, headers) {
-  //  If we have headers and there is content-encoding it means that
-  //  the body shouldn't be merged but instead persisted as an array
-  //  of hex strings so that the responses can be mocked one by one.
+  // If we have headers and there is content-encoding it means that the body
+  // shouldn't be merged but instead persisted as an array of hex strings so
+  // that the response chunks can be mocked one by one.
   if (headers && common.isContentEncoded(headers)) {
     return {
       body: chunks.map(chunk => chunk.toString('hex')),
@@ -32,30 +32,29 @@ function getBodyFromChunks(chunks, headers) {
 
   const mergedBuffer = Buffer.concat(chunks)
 
-  //  The merged buffer can be one of three things:
-  //    1.  A binary buffer which then has to be recorded as a hex string.
-  //    2.  A string buffer which represents a JSON object.
-  //    3.  A string buffer which doesn't represent a JSON object.
-
-  const isBinary = common.isUtf8Representable(mergedBuffer)
-  if (isBinary) {
-    return {
-      body: mergedBuffer.toString('hex'),
-      isBinary: true,
-    }
-  } else {
+  // The merged buffer can be one of three things:
+  // 1. A UTF-8-representable string buffer which represents a JSON object.
+  // 2. A UTF-8-representable buffer which doesn't represent a JSON object.
+  // 3. A non-UTF-8-representable buffer which then has to be recorded as a hex string.
+  const isUtf8Representable = common.isUtf8Representable(mergedBuffer)
+  if (isUtf8Representable) {
     const maybeStringifiedJson = mergedBuffer.toString('utf8')
     try {
       return {
+        isUtf8Representable,
         body: JSON.parse(maybeStringifiedJson),
-        isBinary: false,
       }
     } catch (err) {
       return {
+        isUtf8Representable,
         body: maybeStringifiedJson,
-        isBinary: false,
       }
     }
+  } else {
+    return {
+      isUtf8Representable,
+      body: mergedBuffer.toString('hex'),
+    }
   }
 }
 
@@ -67,28 +66,26 @@ function generateRequestAndResponseObject({
   dataChunks,
   reqheaders,
 }) {
-  const response = getBodyFromChunks(dataChunks, res.headers)
+  const { body, isUtf8Representable } = getBodyFromChunks(
+    dataChunks,
+    res.headers
+  )
   options.path = req.path
 
-  const nockDef = {
+  return {
     scope: getScope(options),
     method: getMethod(options),
     path: options.path,
+    // Is it deliberate that `getBodyFromChunks()` is called a second time?
     body: getBodyFromChunks(bodyChunks).body,
     status: res.statusCode,
-    response: response.body,
+    response: body,
     rawHeaders: res.rawHeaders,
+    reqheaders: reqheaders || undefined,
+    // When content-encoding is enabled, isUtf8Representable is `undefined`,
+    // so we explicitly check for `false`.
+    responseIsBinary: isUtf8Representable === false,
   }
-
-  if (reqheaders) {
-    nockDef.reqheaders = reqheaders
-  }
-
-  if (response.isBinary) {
-    nockDef.responseIsBinary = true
-  }
-
-  return nockDef
 }
 
 function generateRequestAndResponse({

package/lib/scope.js

@@ -347,11 +347,12 @@ function define(nockDefs) {
       body = undefined
     }
 
-    //  Response is not always JSON as it could be a string or binary data or
-    //  even an array of binary buffers (e.g. when content is encoded)
+    // Response is not always JSON as it could be a string or binary data or
+    // even an array of binary buffers (e.g. when content is encoded).
     let response
     if (!nockDef.response) {
       response = ''
+      // TODO: Rename `responseIsBinary` to `reponseIsUtf8Representable`.
     } else if (nockDef.responseIsBinary) {
       response = Buffer.from(nockDef.response, 'hex')
     } else {

package/lib/socket.js

@@ -12,8 +12,10 @@ module.exports = class Socket extends EventEmitter {
       this.authorized = true
     }
 
+    this.bufferSize = 0
     this.writable = true
     this.readable = true
+    this.pending = false
     this.destroyed = false
     this.connecting = false
 
@@ -23,13 +25,27 @@ module.exports = class Socket extends EventEmitter {
     this.totalDelayMs = 0
     // Maximum allowed delay. Null means unlimited.
     this.timeoutMs = null
+
+    const ipv6 = options.family === 6
+    this.remoteFamily = ipv6 ? 'IPv6' : 'IPv4'
+    this.localAddress = this.remoteAddress = ipv6 ? '::1' : '127.0.0.1'
+    this.localPort = this.remotePort = parseInt(options.port)
   }
 
   setNoDelay() {}
   setKeepAlive() {}
   resume() {}
+  ref() {}
   unref() {}
 
+  address() {
+    return {
+      port: this.remotePort,
+      family: this.remoteFamily,
+      address: this.remoteAddress,
+    }
+  }
+
   setTimeout(timeoutMs, fn) {
     this.timeoutMs = timeoutMs
     if (fn) {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "11.5.0",
+  "version": "11.7.2",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -22,7 +22,6 @@
   "main": "./index.js",
   "types": "types",
   "dependencies": {
-    "chai": "^4.1.2",
     "debug": "^4.1.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.13",
@@ -31,28 +30,29 @@
   },
   "devDependencies": {
     "assert-rejects": "^1.0.0",
-    "dtslint": "^0.9.1",
+    "chai": "^4.1.2",
+    "dirty-chai": "^2.0.1",
+    "dtslint": "^2.0.2",
     "eslint": "^6.0.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-config-standard": "^14.0.0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
     "got": "^9.6.0",
-    "hyperquest": "^2.1.3",
-    "isomorphic-fetch": "^2.2.0",
     "lolex": "^5.0.0",
-    "needle": "^2.3.0",
+    "mocha": "^6.2.2",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.0.0",
-    "prettier": "1.18.2",
+    "nyc": "^15.0.0",
+    "prettier": "1.19.0",
     "proxyquire": "^2.1.0",
     "request": "^2.83.0",
-    "restify-clients": "^2.2.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^16.0.0-beta.22",
-    "sinon": "^7.3.1",
+    "sinon": "^8.0.0",
+    "sinon-chai": "^3.3.0",
     "superagent": "^5.0.2",
     "tap": "^14.0.0"
   },
@@ -62,6 +62,7 @@
     "test": "npm run -s unit",
     "posttest": "npm run -s prettier:check",
     "coverage": "tap --coverage-report=html && open coverage/lcov-report/index.html",
+    "mocha": "nyc mocha $(grep -lr '^\\s*it(' tests)",
     "lint": "eslint \"**/*.js\"",
     "prettier": "prettier --write \"**/*.@(js|json|md|ts|yml)\"",
     "prettier:check": "prettier --check \"**/*.@(js|json|md|ts|yml)\"",

package/types/index.d.ts

@@ -26,6 +26,7 @@ declare namespace nock {
   function loadDefs(path: string): Definition[]
   function define(defs: Definition[]): Scope[]
   function restore(): void
+  function abortPendingRequests(): void
 
   let back: Back
   let emitter: NodeJS.EventEmitter
@@ -243,6 +244,7 @@ declare namespace nock {
   type BackMode = 'wild' | 'dryrun' | 'record' | 'lockdown'
 
   interface Back {
+    currentMode: BackMode
     fixtures: string
     setMode(mode: BackMode): void