nock 8.0.0 → 8.2.2

package/.travis.yml

@@ -5,6 +5,7 @@ node_js:
   - "0.12"
   - 4
   - 5
+  - 6
 script: "npm run coverage"
 sudo: false
 after_success: "npm run coveralls"

package/CHANGELOG.md

@@ -1,3 +1,110 @@
+8.2.2 / 2017-10-15
+==================
+
+  * Set `this` to request on socket event. [#993](https://github.com/node-nock/nock/pull/993)
+
+8.2.0 / 2016-10-23
+==================
+
+  * 8.2.0
+  * Add changelog to the dev dependencies
+  * Ignore browserify-bundle.js
+  * Update browserify-bundle.js
+  * Merge pull request [#723](https://github.com/node-nock/nock/issues/723) from pimterry/optional-mocks
+    Add optionally() and make isDone and pendingMocks consistent.
+  * Include all review markup changes in browserify-bundle
+  * Add .activeMocks() to recreate previous .pendingMocks() behaviour
+  * Add times+optional and persist+optional tests
+  * Document assumption in pendingMocks()
+  * Clarify optional mock behaviour a little in README
+  * Merge pull request [#721](https://github.com/node-nock/nock/issues/721) from pimterry/removeInterceptor-from-pending
+    Update PendingMocks when an interceptor is removed
+  * Merge pull request [#722](https://github.com/node-nock/nock/issues/722) from Ginden/no-garbage-in-npm
+    Removed coverage folder from npm
+  * Merge pull request [#668](https://github.com/node-nock/nock/issues/668) from abdulito/master
+    Support http OPTIONS method
+  * Merge pull request [#725](https://github.com/node-nock/nock/issues/725) from node-nock/greenkeeper-async-2.1.1
+    Update async to version 2.1.1 🚀
+  * Merge pull request [#719](https://github.com/node-nock/nock/issues/719) from ltegman/fix/body-spec-regex-in-array
+    Handle arrays like objects in match_body
+  * Handle arrays like objects in match_body
+  * chore(package): update async to version 2.1.1
+    https://greenkeeper.io/
+  * Ad documentation for optionally()
+  * Add optionally(), to replace and improve the undocumented 'requireDone'
+  * Make pendingMocks and isDone behave consistently
+  * Removed coverage folder from npm
+  * Update PendingMocks when an interceptor is removed
+  * Update CHANGELOG
+
+8.1.0 / 2016-10-10
+==================
+
+  * 8.1.0
+  * Enable harmony mode when running tests
+  * Remove duplicated Interceptor.replyWithFile function
+  * Merge pull request [#710](https://github.com/node-nock/nock/issues/710) from hugoduraes/master
+    Leave rawHeaders case untouched on nock's replies
+  * Leave rawHeaders case untouched on nock's replies
+  * Re-enable previously skipped tests
+  * Merge pull request [#586](https://github.com/node-nock/nock/issues/586) from Elergy/master
+    Fix some broken tests
+  * Add nodejs v6 to travis config
+  * use public TravisCI badge icon, which shows failing tests.
+  * Skip a couple of failing specs (until we get them fixed)
+  * Remove tests/test.js
+    Also:
+    - Use nyc as the CLI of istanbul
+    - Use tap binary directly for running tests
+  * Support http OPTIONS method
+  * Fix some issues to run library with Node v0.10:
+    1. Set lodash version to ~4.9.0
+    2. Add data-event listener for http's res message
+  * Tests that depends on amazon.com's statusCode are fixed
+    Symbol with charCode 160 is replaced to space
+  * Merge pull request [#531](https://github.com/node-nock/nock/issues/531) from node-nock/greenkeeper-request-2.71.0
+    Update request to version 2.71.0 🚀
+  * Merge branch 'master' of github.com:node-nock/nock
+  * added snyk vulerabilities badge
+  * chore(package): update request to version 2.71.0
+    http://greenkeeper.io/
+  * Merge pull request [#528](https://github.com/node-nock/nock/issues/528) from mooyoul/improve-readme-toc
+    Improved Table of Contents section of README
+  * Changed `About Interceptors` title of TOC
+    ... just to clarify
+  * Lint README.md
+  * Added some missing TOC entries
+  * Fixed broken TOC link
+  * changelog update
+
+8.0.0 / 2016-04-06
+==================
+
+  * v8.0.0
+  * added missing dep
+  * Merge branch 'greenkeeper-request-2.70.0'
+  * Merge branch 'master' into greenkeeper-request-2.70.0
+  * making the latest version of lodash work
+  * Merge pull request [#521](https://github.com/node-nock/nock/issues/521) from node-nock/greenkeeper-update-all
+    Update all dependencies 🌴
+  * fixes for latest tap version
+  * chore(package): update request to version 2.70.0
+    http://greenkeeper.io/
+  * chore(package): update dependencies
+    http://greenkeeper.io/
+
+7.7.3 / 2016-04-04
+==================
+
+  * v7.7.3
+  * Merge pull request [#520](https://github.com/node-nock/nock/issues/520) from ericsaboia/master
+    properly remove interceptor with regex domain from the list after used
+  * properly remove interceptor with regex domain from the list after used
+  * Merge pull request [#519](https://github.com/node-nock/nock/issues/519) from Byron-TW/patch-1
+    Fix typo
+  * Fix typo
+  * changelog update
+
 7.7.2 / 2016-03-25
 ==================
 
@@ -73,117 +180,3 @@
   * Add support for full callback `reply()`.
     This addresses a bug with the `reply()` function where a request without
     a body caused full callbacks to error. (See pgte/nock[#489](https://github.com/node-nock/nock/issues/489))
-  * changelog update
-
-7.3.0 / 2016-02-24
-==================
-
-  * v7.3.0
-  * browserify bundle update
-  * Merge branch 'Limess-remove-interceptor-by-instance'
-  * Call removeInterceptor() with instance
-    Previously removeInterceptor() only took an options object. This was
-    inconvenient if the client didn't wish to expose urls directly in their
-    tests.
-    removeInterceptor now also takes an instance of `Interceptor` and uses
-    the instance variables `baseUrl` and `_key` to filter for removal.
-    Added 3 test cases to cover http, https and regex path matching.
-  * Use lodash size function
-    You cannot effectively compare anything to an empty object declaration. {} === {} will always equal false. This is to address the attended purpose by the comment provided.
-  * changelog update
-
-7.2.2 / 2016-02-19
-==================
-
-  * v7.2.2
-  * browserify bundle update
-  * Merge branch 'mdlavin-v7-performance-improvement'
-  * Increase test coverage of allowUnmocked when only mismatch is the body
-  * Reuse _.defaults where possible to reduce code
-  * Do not stringify request options unless they will be logged
-  * Optimize for large number of interceptors
-  * changelog update
-
-7.2.1 / 2016-02-15
-==================
-
-  * v7.2.1
-  * Merge branch 'owiber-oliver-callbackfix'
-  * Merge branch 'oliver-callbackfix' of git://github.com/owiber/nock into owiber-oliver-callbackfix
-
-7.2.0 / 2016-02-15
-==================
-
-  * v7.2.0
-  * Merge branch 'master' of github.com:pgte/nock
-  * mkdirp is optional because browsers. addresses [#475](https://github.com/node-nock/nock/issues/475)
-  * fix key when interceptor path is specified with callback
-  * Merge pull request [#465](https://github.com/node-nock/nock/issues/465) from JemiloII/patch-1
-  * Fixing typos
-  * added @BinChang as contributor
-  * changelog update
-
-7.1.0 / 2016-01-29
-==================
-
-  * v7.1.0
-  * Merge branch 'BinChang-delayBody'
-  * add a new api delayBody() and update the syntax of delay().
-  * Merge pull request [#462](https://github.com/node-nock/nock/issues/462) from four43/patch-2
-    Add clean all to example about being done with the test
-  * Add clean all to example about being done with the test
-
-7.0.2 / 2016-01-27
-==================
-
-  * v7.0.2
-  * isStream test fixed for null objects
-
-7.0.1 / 2016-01-27
-==================
-
-  * v7.0.1
-  * for when content type header is an array. should fix [#460](https://github.com/node-nock/nock/issues/460)
-  * Merge branch 'BinChang-common_is_stream'
-  * remove isStream to the common lib.
-
-7.0.0 / 2016-01-25
-==================
-
-  * v7.0.0
-  * Merge branch 'wprater-patch-1'
-  * Merge branch 'patch-1' of git://github.com/wprater/nock into wprater-patch-1
-  * Merge branch 'BinChang-scope_interceptor'
-  * updated broswerify bundle
-  * Merge branch 'scope_interceptor' of git://github.com/BinChang/nock into BinChang-scope_interceptor
-  * changelog update
-
-6.0.1 / 2016-01-25
-==================
-
-  * v6.0.1
-  * Merge branch 'alekbarszczewski-reply-headers-fix'
-  * browserify bundle update
-  * dont execute `replace` on a non-string 
-    recorded bodies can be an object (json).  dont try to use a string function on them.
-  * rebase with master
-  * move interceptor to its own file.
-  * split scope and intercept
-  * Fixed issue with header function evaluation + added 2 tests
-  * changelog update
-
-6.0.0 / 2016-01-21
-==================
-
-  * v6.0.0
-  * Merge branch 'BinChang-complex_query_string'
-  * add qs into package dependency block.
-  * add test_complex_querystring into test list
-  * minor update
-  * support complex GET query based the behavior of request module.
-  * changelog update
-
-5.5.0 / 2016-01-19
-==================
-
-  * v5.5.0

package/README.md

@@ -1,65 +1,86 @@
 # Nock
 
-[![Build Status](https://secure.travis-ci.org/node-nock/nock.svg?branch=master)](http://travis-ci.org/node-nock/nock?branch=master)
+[![Build Status](https://travis-ci.org/node-nock/nock.svg?branch=master)](https://travis-ci.org/node-nock/nock)
 [![Coverage Status](https://coveralls.io/repos/github/node-nock/nock/badge.svg?branch=master)](https://coveralls.io/github/node-nock/nock?branch=master)
+[![Known Vulnerabilities](https://snyk.io/test/npm/nock/badge.svg)](https://snyk.io/test/npm/nock)
 [![Chat](https://img.shields.io/badge/help-gitter-eb9348.svg?style=flat)](https://gitter.im/node-nock/nock)
 
+
 Nock is an HTTP mocking and expectations library for Node.js
 
 Nock can be used to test modules that perform HTTP requests in isolation.
 
 For instance, if a module performs HTTP requests to a CouchDB server or makes HTTP requests to the Amazon API, you can test that module in isolation.
 
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc/generate-toc again -->
 **Table of Contents**
 
+<!-- toc -->
+
 - [Install](#install)
+  * [Node version support](#node-version-support)
 - [Use](#use)
-    - [READ THIS](#read-this---about-interceptors)
-    - [Specifying domain](#specifying-domain)
-    - [Specifying path](#specifying-path)
-    - [Specifying request body](#specifying-request-body)
-    - [Specifying replies](#specifying-replies)
-    - [Specifying headers](#specifying-headers)
-        - [Header field names are case-insensitive](#header-field-names-are-case-insensitive)
-        - [Specifying Request Headers](#specifying-request-headers)
-        - [Specifying Reply Headers](#specifying-reply-headers)
-        - [Default Reply Headers](#default-reply-headers)
-    - [HTTP Verbs](#http-verbs)
-    - [Support for HTTP and HTTPS](#support-for-http-and-https)
-    - [Non-standard ports](#non-standard-ports)
-    - [Repeat response n times](#repeat-response-n-times)
-    - [Delay the response body](#delay-the-response-body)
-    - [Delay the response](#delay-the-response)
-    - [Delay the connection](#delay-the-connection)
-    - [Socket timeout](#socket-timeout)
-    - [Chaining](#chaining)
-    - [Scope filtering](#scope-filtering)
-    - [Path filtering](#path-filtering)
-    - [Request Body filtering](#request-body-filtering)
-    - [Request Headers Matching](#request-headers-matching)
-    - [Allow __unmocked__ requests on a mocked hostname](#allow-unmocked-requests-on-a-mocked-hostname)
+  * [READ THIS! - About interceptors](#read-this---about-interceptors)
+  * [Specifying hostname](#specifying-hostname)
+  * [Specifying path](#specifying-path)
+  * [Specifying request body](#specifying-request-body)
+  * [Specifying request query string](#specifying-request-query-string)
+  * [Specifying replies](#specifying-replies)
+      - [Access original request and headers](#access-original-request-and-headers)
+    + [Replying with errors](#replying-with-errors)
+  * [Specifying headers](#specifying-headers)
+    + [Header field names are case-insensitive](#header-field-names-are-case-insensitive)
+    + [Specifying Request Headers](#specifying-request-headers)
+    + [Specifying Reply Headers](#specifying-reply-headers)
+    + [Default Reply Headers](#default-reply-headers)
+    + [Including Content-Length Header Automatically](#including-content-length-header-automatically)
+    + [Including Date Header Automatically](#including-date-header-automatically)
+  * [HTTP Verbs](#http-verbs)
+  * [Support for HTTP and HTTPS](#support-for-http-and-https)
+  * [Non-standard ports](#non-standard-ports)
+  * [Repeat response n times](#repeat-response-n-times)
+  * [Delay the response body](#delay-the-response-body)
+  * [Delay the response](#delay-the-response)
+  * [Delay the connection](#delay-the-connection)
+  * [Socket timeout](#socket-timeout)
+  * [Chaining](#chaining)
+  * [Scope filtering](#scope-filtering)
+  * [Path filtering](#path-filtering)
+  * [Request Body filtering](#request-body-filtering)
+  * [Request Headers Matching](#request-headers-matching)
+  * [Optional Requests](#optional-requests)
+  * [Allow __unmocked__ requests on a mocked hostname](#allow-__unmocked__-requests-on-a-mocked-hostname)
 - [Expectations](#expectations)
-    - [.isDone()](#isdone)
-    - [.cleanAll()](#cleanall)
-    - [.persist()](#persist)
-    - [.pendingMocks()](#pendingmocks)
+  * [.isDone()](#isdone)
+  * [.cleanAll()](#cleanall)
+  * [.persist()](#persist)
+  * [.pendingMocks()](#pendingmocks)
+  * [.activeMocks()](#activemocks)
 - [Logging](#logging)
 - [Restoring](#restoring)
 - [Turning Nock Off (experimental!)](#turning-nock-off-experimental)
 - [Enable/Disable real HTTP request](#enabledisable-real-http-request)
 - [Recording](#recording)
-    - [`dont_print` option](#dontprint-option)
-    - [`output_objects` option](#outputobjects-option)
-    - [`enable_reqheaders_recording` option](#enablereqheadersrecording-option)
-    - [.removeInterceptor()](#removeinterceptor)
+  * [`dont_print` option](#dont_print-option)
+  * [`output_objects` option](#output_objects-option)
+  * [`enable_reqheaders_recording` option](#enable_reqheaders_recording-option)
+  * [`logging` option](#logging-option)
+  * [`use_separator` option](#use_separator-option)
+  * [.removeInterceptor()](#removeinterceptor)
+- [Events](#events)
+  * [Global no match event](#global-no-match-event)
+- [Nock Back](#nock-back)
+  * [Setup](#setup)
+    + [Options](#options)
+  * [Usage](#usage)
+    + [Options](#options-1)
+    + [Modes](#modes)
 - [How does it work?](#how-does-it-work)
 - [Debugging](#debugging)
 - [PROTIP](#protip)
+- [Generate Changelog](#generate-changelog)
 - [License](#license)
 
-<!-- markdown-toc end -->
-
+<!-- tocstop -->
 
 # Install
 
@@ -67,6 +88,17 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
 $ npm install nock
 ```
 
+## Node version support
+
+| node | nock |
+|---|---|
+| 0.10 | up to 8.x |
+| 0.11 | up to 8.x |
+| 0.12 | up to 8.x |
+| 4 | 8.x |
+| 5 | up to 8.x |
+| 6 | 8.x |
+
 # Use
 
 On your test, you can setup your mocking object like this:
@@ -793,6 +825,23 @@ var scope = nock('http://api.myservice.com')
                 })
 ```
 
+## Optional Requests
+
+By default every mocked request is expected to be made exactly once, and until it is it'll appear in `scope.pendingMocks()`, and `scope.isDone()` will return false (see [expectations](#expectations)). In many cases this is fine, but in some (especially cross-test setup code) it's useful to be able to mock a request that may or may not happen. You can do this with `optionally()`. Optional requests are consumed just like normal ones once matched, but they do not appear in `pendingMocks()`, and `isDone()` will return true for scopes with only optional requests pending.
+
+```js
+var example = nock("http://example.com");
+example.pendingMocks() // []
+example.get("/pathA").reply(200);
+example.pendingMocks() // ["GET http://example.com:80/path"]
+
+// ...After a request to example.com/pathA:
+example.pendingMocks() // []
+
+example.get("/pathB").optionally().reply(200);
+example.pendingMocks() // []
+```
+
 ## Allow __unmocked__ requests on a mocked hostname
 
 If you need some request on the same host name to be mocked and some others to **really** go through the HTTP stack, you can use the `allowUnmocked` option like this:
@@ -883,6 +932,22 @@ It is also available in the global scope:
 console.error('pending mocks: %j', nock.pendingMocks());
 ```
 
+## .activeMocks()
+
+You can see every mock that is currently active (i.e. might potentially reply to requests) in a scope using `scope.activeMocks()`. A mock is active if it is pending, optional but not yet completed, or persisted. Mocks that have intercepted their requests and are no longer doing anything are the only mocks which won't appear here.
+
+You probably don't need to use this - it mainly exists as a mechanism to recreate the previous (now-changed) behavior of `pendingMocks()`.
+
+```js
+console.error('active mocks: %j', scope.activeMocks());
+```
+
+It is also available in the global scope:
+
+```js
+console.error('active mocks: %j', nock.activeMocks());
+```
+
 # Logging
 
 Nock can log matches if you pass in a log function like this:
@@ -1151,7 +1216,7 @@ You can also listen for no match events like this:
 
 ```js
 nock.emitter.on('no match', function(req) {
-  
+
 });
 ```
 
@@ -1256,7 +1321,7 @@ to set the mode call `nockBack.setMode(mode)` or run the tests with the `NOCK_BA
 
 Nock works by overriding Node's `http.request` function. Also, it overrides `http.ClientRequest` too to cover for modules that use it directly.
 
-#Debugging
+# Debugging
 Nock uses debug, so just run with environmental variable DEBUG set to nock.*
 
 ```js
@@ -1279,10 +1344,6 @@ var scope = nock('http://api.myservice.com')
 
 # Generate Changelog
 
-```
-$ npm install changelog -g
-```
-
 ```
 $ npm run changelog
 ```

package/lib/common.js

@@ -221,6 +221,20 @@ var headersFieldsArrayToLowerCase = function (headers) {
   }));
 };
 
+var headersArrayToObject = function (rawHeaders) {
+  if(!_.isArray(rawHeaders)) {
+    return rawHeaders;
+  }
+
+  var headers = {};
+
+  for (var i=0, len=rawHeaders.length; i<len; i=i+2) {
+    headers[rawHeaders[i]] = rawHeaders[i+1];
+  }
+
+  return headers;
+};
+
 /**
  * Deletes the given `fieldName` property from `headers` object by performing
  * case-insensitive search through keys.
@@ -326,10 +340,10 @@ exports.isContentEncoded = isContentEncoded;
 exports.isJSONContent = isJSONContent;
 exports.headersFieldNamesToLowerCase = headersFieldNamesToLowerCase;
 exports.headersFieldsArrayToLowerCase = headersFieldsArrayToLowerCase;
+exports.headersArrayToObject = headersArrayToObject;
 exports.deleteHeadersField = deleteHeadersField;
 exports.percentEncode = percentEncode;
 exports.percentDecode = percentDecode;
 exports.matchStringOrRegexp = matchStringOrRegexp;
 exports.formatQueryValue = formatQueryValue;
 exports.isStream = isStream;
-

package/lib/intercept.js

@@ -188,8 +188,10 @@ function removeInterceptor(options) {
   if (allInterceptors[baseUrl] && allInterceptors[baseUrl].scopes.length > 0) {
     if (key) {
       for (var i = 0; i < allInterceptors[baseUrl].scopes.length; i++) {
-        if (allInterceptors[baseUrl].scopes[i]._key === key) {
+        var interceptor = allInterceptors[baseUrl].scopes[i];
+        if (interceptor._key === key) {
           allInterceptors[baseUrl].scopes.splice(i, 1);
+          interceptor.scope.remove(key, interceptor);
           break;
         }
       }
@@ -293,24 +295,34 @@ function isActive() {
 
 }
 
-function isDone() {
-  return _.every(allInterceptors, function(interceptors) {
-    return _.every(interceptors.scopes, function(interceptor) {
-      return interceptor.__nock_scope.isDone();
-    });
-  });
-}
-
-function pendingMocks() {
+function interceptorScopes() {
   return _.reduce(allInterceptors, function(result, interceptors) {
     for (var interceptor in interceptors.scopes) {
-      result = result.concat(interceptors.scopes[interceptor].__nock_scope.pendingMocks());
+      result = result.concat(interceptors.scopes[interceptor].__nock_scope);
     }
 
     return result;
   }, []);
 }
 
+function isDone() {
+  return _.every(interceptorScopes(), function(scope) {
+    return scope.isDone();
+  });
+}
+
+function pendingMocks() {
+  return _.flatten(_.map(interceptorScopes(), function(scope) {
+    return scope.pendingMocks();
+  }));
+}
+
+function activeMocks() {
+  return _.flatten(_.map(interceptorScopes(), function(scope) {
+    return scope.activeMocks();
+  }));
+}
+
 function activate() {
 
   if(originalClientRequest) {
@@ -390,6 +402,7 @@ module.exports.activate = activate;
 module.exports.isActive = isActive;
 module.exports.isDone = isDone;
 module.exports.pendingMocks = pendingMocks;
+module.exports.activeMocks = activeMocks;
 module.exports.enableNetConnect = enableNetConnect;
 module.exports.disableNetConnect = disableNetConnect;
 module.exports.overrideClientRequest = overrideClientRequest;

package/lib/interceptor.js

@@ -40,6 +40,13 @@ function Interceptor(scope, uri, method, requestBody, interceptorOptions) {
 
     this.delayInMs = 0;
     this.delayConnectionInMs = 0;
+
+    this.optional = false;
+}
+
+Interceptor.prototype.optionally = function optionally() {
+    this.optional = true;
+    return this;
 }
 
 Interceptor.prototype.replyWithError = function replyWithError(errorMessage) {
@@ -51,7 +58,7 @@ Interceptor.prototype.replyWithError = function replyWithError(errorMessage) {
     return this.scope;
 };
 
-Interceptor.prototype.reply = function reply(statusCode, body, headers) {
+Interceptor.prototype.reply = function reply(statusCode, body, rawHeaders) {
     if (arguments.length <= 2 && _.isFunction(statusCode)) {
         body = statusCode;
         statusCode = 200;
@@ -59,11 +66,11 @@ Interceptor.prototype.reply = function reply(statusCode, body, headers) {
 
     this.statusCode = statusCode;
 
-    //  We use lower-case headers throughout Nock.
-    headers = common.headersFieldNamesToLowerCase(headers);
-
     _.defaults(this.options, this.scope.scopeOptions);
 
+    // convert rawHeaders from Array to Object
+    var headers = common.headersArrayToObject(rawHeaders);
+
     if (this.scope._defaultReplyHeaders) {
         headers = headers || {};
         headers = mixin(this.scope._defaultReplyHeaders, headers);
@@ -75,23 +82,26 @@ Interceptor.prototype.reply = function reply(statusCode, body, headers) {
     }
 
     if (headers !== undefined) {
-        this.headers = {};
         this.rawHeaders = [];
 
         // makes sure all keys in headers are in lower case
-        for (var key2 in headers) {
-            if (headers.hasOwnProperty(key2)) {
-                this.headers[key2.toLowerCase()] = headers[key2];
-                this.rawHeaders.push(key2);
-                this.rawHeaders.push(headers[key2]);
+        for (var key in headers) {
+            if (headers.hasOwnProperty(key)) {
+                this.rawHeaders.push(key);
+                this.rawHeaders.push(headers[key]);
             }
         }
+
+        //  We use lower-case headers throughout Nock.
+        this.headers = common.headersFieldNamesToLowerCase(headers);
+
+        debug('reply.headers:', this.headers);
         debug('reply.rawHeaders:', this.rawHeaders);
     }
 
     //  If the content is not encoded we may need to transform the response body.
     //  Otherwise we leave it as it is.
-    if (!common.isContentEncoded(headers)) {
+    if (!common.isContentEncoded(this.headers)) {
         if (body && typeof(body) !== 'string' &&
             typeof(body) !== 'function' &&
             !Buffer.isBuffer(body) &&
@@ -129,17 +139,6 @@ Interceptor.prototype.replyWithFile = function replyWithFile(statusCode, filePat
     return this.reply(statusCode, readStream, headers);
 };
 
-Interceptor.prototype.replyWithFile = function replyWithFile(statusCode, filePath, headers) {
-    if (! fs) {
-        throw new Error('No fs');
-    }
-    var readStream = fs.createReadStream(filePath);
-    readStream.pause();
-    this.filePath = filePath;
-    return this.reply(statusCode, readStream, headers);
-};
-
-
 // Also match request headers
 // https://github.com/pgte/nock/issues/163
 Interceptor.prototype.reqheaderMatches = function reqheaderMatches(options, key) {

package/lib/match_body.js

@@ -57,7 +57,7 @@ function deepEqualExtended(spec, body) {
   if (spec && spec.constructor === RegExp) {
     return spec.test(body);
   }
-  if (spec && spec.constructor === Object && body) {
+  if (spec && (spec.constructor === Object || spec.constructor === Array) && body) {
     var keys = Object.keys(spec);
     for (var i = 0; i < keys.length; i++) {
       if (!deepEqualExtended(spec[keys[i]], body[keys[i]])) {

package/lib/recorder.js

@@ -94,8 +94,8 @@ function generateRequestAndResponseObject(req, bodyChunks, options, res, dataChu
     body:     getBodyFromChunks(bodyChunks),
     status:   res.statusCode,
     response: getBodyFromChunks(dataChunks, res.headers),
-    headers:  res.headers,
-    reqheaders:   req._headers
+    rawHeaders: res.rawHeaders || res.headers,
+    reqheaders: req._headers
   };
 
 }
@@ -153,7 +153,10 @@ function generateRequestAndResponse(req, bodyChunks, options, res, dataChunks) {
   ret.push(res.statusCode.toString());
   ret.push(', ');
   ret.push(JSON.stringify(responseBody));
-  if (res.headers) {
+  if (res.rawHeaders) {
+    ret.push(', ');
+    ret.push(inspect(res.rawHeaders));
+  } else if (res.headers) {
     ret.push(', ');
     ret.push(inspect(res.headers));
   }