nock 2.9.1 → 2.13.0

package/lib/recorder.js

@@ -360,7 +360,8 @@ function record(rec_options) {
 
         //  Since we gave client the chance to setup its listeners
         //  before us, we need to remove them and setup our own.
-        _.each(res.listeners('data'), function(listener) {
+        var dataListeners = res.listeners('data');
+        _.each(dataListeners, function(listener) {
           res.removeListener('data', listener);
         });
 
@@ -370,6 +371,10 @@ function record(rec_options) {
             data = new Buffer(data, encoding);
           }
           dataChunks.push(data);
+          //  Manually invoke the user listeners emulating 'data' event.
+          _.each(dataListeners, function(listener) {
+            listener(data);
+          });
         };
         res.on('data', onData);
       }
@@ -383,10 +388,13 @@ function record(rec_options) {
     });
 
     var oldWrite = req.write;
-    req.write = function(data) {
+    req.write = function(data, encoding) {
       if ('undefined' !== typeof(data)) {
         if (data) {
           debug(thisRecordingId, 'new', proto, 'body chunk');
+          if (! Buffer.isBuffer(data)) {
+            data = new Buffer(data, encoding);
+          }
           bodyChunks.push(data);
         }
         oldWrite.call(req, data);

package/lib/request_overrider.js

@@ -133,7 +133,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
     return getHeader(req, name);
   };
 
-  req.socket = response.socket = Socket();
+  req.socket = response.socket = Socket({ proto: options.proto });
 
   req.write = function(buffer, encoding) {
     debug('write', arguments);
@@ -273,6 +273,8 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
     }
     response.statusCode = Number(interceptor.statusCode) || 200;
     response.headers = interceptor.headers || {};
+    response.rawHeaders = interceptor.rawHeaders || [];
+    debug('response.rawHeaders:', response.rawHeaders);
 
     //  We again set request headers, now for our matched interceptor.
     setRequestHeaders(req, options, interceptor);
@@ -406,6 +408,14 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
         }
       });
 
+      for(var rawHeaderIndex = 0 ; rawHeaderIndex < response.rawHeaders.length ; rawHeaderIndex += 2) {
+        var value = response.rawHeaders[rawHeaderIndex + 1];
+        if (typeof value === "function") {
+          response.rawHeaders[rawHeaderIndex + 1] = value(req, response, responseBody);
+        }
+      }
+
+
       process.nextTick(function() {
         var respond = function() {
           debug('emitting response');

package/lib/scope.js

@@ -103,13 +103,17 @@ function startScope(basePath, options) {
 
       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]);
           }
         }
+        debug('reply.rawHeaders:', this.rawHeaders);
       }
 
       //  If the content is not encoded we may need to transform the response body.
@@ -265,16 +269,27 @@ function startScope(basePath, options) {
 
         // Only check for query string matches if this.queries is an object
         if (_.isObject(this.queries)) {
-          for (var i = 0; i < queries.length; i++) {
-            var query = queries[i].split('=');
-
-            if (query[1] === undefined || this.queries[ query[0] ] === undefined) {
-              matchQueries = false;
-              break;
+          // Make sure that you have an equal number of keys. We are
+          // looping through the passed query params and not the expected values
+          // if the user passes fewer query params than expected but all values 
+          // match this will throw a false positive. Testing that the length of the
+          // passed query params is equal to the length of expected keys will prevent
+          // us from doing any value checking BEFORE we know if they have all the proper
+          // params
+          if (Object.keys(this.queries).length !== queries.length) {
+            matchQueries = false;
+          } else {
+            for (var i = 0; i < queries.length; i++) {
+              var query = queries[i].split('=');
+
+              if (query[1] === undefined || this.queries[ query[0] ] === undefined) {
+                matchQueries = false;
+                break;
+              }
+
+              var isMatch = matchStringOrRegexp(query[1], this.queries[ query[0] ]);
+              matchQueries = matchQueries && !!isMatch;
             }
-
-            var isMatch = matchStringOrRegexp(query[1], this.queries[ query[0] ]);
-            matchQueries = matchQueries && !!isMatch;
           }
         }
 
@@ -352,7 +367,7 @@ function startScope(basePath, options) {
 
     function basicAuth(options) {
       var username = options['user'];
-      var password = options['pass'];
+      var password = options['pass'] || '';
       var name = 'authorization';
       var value = 'Basic ' + new Buffer(username + ':' + password).toString('base64');
       interceptorMatchHeaders.push({ name: name, value: value });

package/lib/socket.js

@@ -5,9 +5,15 @@ var EventEmitter = require('events').EventEmitter,
 
 module.exports = Socket;
 
-function Socket() {
+function Socket(options) {
   var socket = new EventEmitter();
 
+  options = options || {};
+
+  if (options.proto === 'https') {
+    socket.authorized = true;
+  }
+
   socket.writable = true;
   socket.readable = true;
 

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "2.9.1",
+  "version": "2.13.0",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "contributors": [
     {
@@ -131,6 +131,11 @@
       "name": "Keith Laban",
       "url": "https://github.com/kelaban",
       "email": "kelaban17@gmail.com"
+    },
+    {
+      "name": "Rui Marinho",
+      "url": "https://github.com/ruimarinho",
+      "email": "ruipmarinho@gmail.com"
     }
   ],
   "repository": {
@@ -145,7 +150,7 @@
   ],
   "main": "./index",
   "dependencies": {
-    "chai": ">=1.9.2 <3.0.0",
+    "chai": ">=1.9.2 <4.0.0",
     "debug": "^1.0.4",
     "deep-equal": "^1.0.0",
     "lodash": "2.4.1",
@@ -160,7 +165,7 @@
     "jshint": "^2.5.6",
     "needle": "^0.7.1",
     "pre-commit": "0.0.9",
-    "request": "2.51.0",
+    "request": "2.61.0",
     "restify": "^2.8.1",
     "restler": "3.2.2",
     "rimraf": "^2.3.2",
@@ -170,7 +175,7 @@
   "scripts": {
     "test": "node tests/test.js",
     "coverage": "istanbul cover tests/test.js && istanbul check-coverage",
-    "coveralls": "istanbul cover tests/test.js && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage",
+    "coveralls": "cat ./coverage/lcov.info | coveralls && rm -rf ./coverage",
     "jshint": "jshint lib/*.js"
   },
   "pre-commit": [

package/tests/test_back.js

@@ -105,7 +105,7 @@ tap.test('nockBack dryrun tests', function (nw) {
 
   //  Manually disable net connectivity to confirm that dryrun enables it.
   nock.disableNetConnect();
-  
+
   nockBack.fixtures = __dirname + '/fixtures';
   nockBack.setMode('dryrun');
 
@@ -116,7 +116,7 @@ tap.test('nockBack dryrun tests', function (nw) {
       , port: 80
       }, function(res) {
 
-        t.equal(res.statusCode, 200);
+        t.ok([200, 302].indexOf(res.statusCode) >= 0);
         t.end();
 
       });
@@ -156,7 +156,7 @@ tap.test('nockBack dryrun tests', function (nw) {
         , port: 80
         }, function(res) {
 
-          t.equal(res.statusCode, 200);
+          t.ok([200, 302].indexOf(res.statusCode) >= 0);
           res.on('end', function() {
             var doneFails = false;
 

package/tests/test_basic_auth.js

@@ -1,10 +1,12 @@
 'use strict';
 
-var test = require('tap').test;
-var mikealRequest = require('request');
 var nock = require('../');
+var request = require('request');
+var test = require('tap').test;
+
+test('basic auth with username and password', function(t) {
+  t.plan(2);
 
-test("basic auth", function(t) {
   nock('http://super-secure.com')
     .get('/test')
     .basicAuth({
@@ -13,8 +15,8 @@ test("basic auth", function(t) {
     })
     .reply(200, 'Here is the content');
 
-  t.test('work when it match', function (t) {
-    mikealRequest({
+  t.test('succeeds when it matches', function (tt) {
+    request({
       url: 'http://super-secure.com/test',
       auth: {
         user: 'foo',
@@ -24,19 +26,54 @@ test("basic auth", function(t) {
       if (err) {
         throw err;
       }
-      t.equal(res.statusCode, 200);
-      t.equal(body, 'Here is the content');
-      t.end();
+      tt.equal(res.statusCode, 200);
+      tt.equal(body, 'Here is the content');
+      tt.end();
+    });
+  });
+
+  t.test('fails when it doesnt match', function (tt) {
+    request({
+      url: 'http://super-secure.com/test',
+    }, function(err, res, body) {
+      tt.type(err, 'Error');
+      tt.end();
     });
   });
+});
+
+test('basic auth with username only', function(t) {
+  t.plan(2);
+
+  nock('http://super-secure.com')
+    .get('/test')
+    .basicAuth({
+      user: 'foo'
+    })
+    .reply(200, 'Here is the content');
 
-  t.test('fail when it doesnt match', function (t) {
-    mikealRequest({
+  t.test('succeeds when it matches', function (tt) {
+    request({
       url: 'http://super-secure.com/test',
+      auth: {
+        user: 'foo'
+      }
     }, function(err, res, body) {
-      t.type(err, 'Error')
-      t.end();
+      if (err) {
+        throw err;
+      }
+      tt.equal(res.statusCode, 200);
+      tt.equal(body, 'Here is the content');
+      tt.end();
     });
   });
 
-});
+  t.test('fails when it doesnt match', function (tt) {
+    request({
+      url: 'http://super-secure.com/test',
+    }, function(err, res, body) {
+      tt.type(err, 'Error');
+      tt.end();
+    });
+  });
+});

package/tests/test_data.js

@@ -1,5 +1,4 @@
 var nock = require('../');
-var assert = require('assert');
 var http = require('http');
 
 var tap = require('tap')
@@ -19,7 +18,7 @@ tap.test('data emits', function(t) {
     });
 
     res.on('end', function() {
-      assert.deepEqual(JSON.parse(body), reqBody);
+      t.same(JSON.parse(body), reqBody);
       t.end();
     });
 

package/tests/test_dynamic_mock.js

@@ -4,8 +4,6 @@ var test = require('tap').test;
 var nock = require('../.');
 var request = require('request');
 
-nock.disableNetConnect();
-
 test('one function returning the body defines a full mock', function(t) {
   var scope = nock('http://acompleteandfullmock.io')
     .get('/abc')

package/tests/test_intercept.js

@@ -625,6 +625,7 @@ test("reply headers as function work", function(t) {
     path: '/'
   }, function (res) {
     t.equivalent(res.headers, { 'x-my-headers': 'boo!' });
+    t.equivalent(res.rawHeaders, ['x-my-headers', 'boo!']);  // 67
     t.end();
   });
 });
@@ -3224,7 +3225,7 @@ test('fix #146 - resume() is automatically invoked when the response is drained'
     t.notOk(err);
     t.ok(res);
     t.ok(buffer);
-    t.equal(buffer, replyBuffer);
+    t.same(buffer, replyBuffer);
     t.end();
   });
 });
@@ -4098,6 +4099,23 @@ test('query() will not match when a query string is malformed', function (t) {
   })
 });
 
+test('query() will not match when a query string has fewer correct values than expected', function (t) {
+  var scope = nock('http://google.com')
+    .get('/')
+    .query({
+      num:1,
+      bool:true,
+      empty:null,
+      str:'fou'
+    })
+    .reply(200);
+
+  mikealRequest('http://google.com/?num=1str=fou', function(err, res) {
+    t.equal(err.message.trim(), 'Nock: No match for request GET http://google.com/?num=1str=fou');
+    t.end();
+  })
+});
+
 
 test("teardown", function(t) {
   var leaks = Object.keys(global)