nock 9.0.5 → 9.0.9

package/CHANGELOG.md

@@ -1,3 +1,54 @@
+9.0.8 / 2017-02-27
+==================
+
+  * 9.0.8: Fix for [#754](https://github.com/node-nock/nock/issues/754)
+  * Merge pull request [#836](https://github.com/node-nock/nock/issues/836) from node-nock/greenkeeper-superagent-3.5.0
+    Update superagent to version 3.5.0 🚀
+  * Merge pull request [#802](https://github.com/node-nock/nock/issues/802) from aleung/fix-754
+    Fix request timeout no working
+
+9.0.7 / 2017-02-23
+==================
+
+  * Changelog
+  * 9.0.7: Fix for [#610](https://github.com/node-nock/nock/issues/610)
+  * Merge pull request [#829](https://github.com/node-nock/nock/issues/829) from yodeyer/fixQs
+    Fix interceptor if query have no query strings
+  * chore(package): update superagent to version 3.5.0
+    https://greenkeeper.io/
+  * Test against request 2.79.0, with which timeout issue occured.
+  * Add Visual Studio Code folder into gitignore
+  * Update the failed test case
+  * Fix https://github.com/node-nock/nock/issues/754
+
+9.0.6 / 2017-02-13
+==================
+
+  * 9.0.6: Fix for [#827](https://github.com/node-nock/nock/issues/827)
+  * Merge pull request [#828](https://github.com/node-nock/nock/issues/828) from node-nock/bug-827-matchStringOrRegexp
+    Bug [#827](https://github.com/node-nock/nock/issues/827) Defensive coding around target
+  * Bug [#827](https://github.com/node-nock/nock/issues/827) Defensive coding around target
+  * Fail if interceptor has query parameters but not the query
+
+9.0.5 / 2017-02-10
+==================
+
+  * 9.0.5: Various bug fixes
+  * Merge pull request [#822](https://github.com/node-nock/nock/issues/822) from KingHenne/fix/isomorphic-fetch-basic-auth
+    Fix isomorphic fetch usage with basicAuth/matchHeader
+  * Merge pull request [#823](https://github.com/node-nock/nock/issues/823) from KingHenne/fix/nyc-config
+    Exclude test files from coverage reports
+  * Merge pull request [#769](https://github.com/node-nock/nock/issues/769) from RubenVerborgh/fix-socket-this
+    Fix this pointer on "socket" event
+  * exclude test files from coverage reports
+  * add text summary coverage reporter
+  * fix basicAuth/matchHeader interceptors with isomorphic-fetch
+  * add failing test for isomorphic-fetch and matchHeader
+  * add failing test for isomorphic-fetch and basicAuth
+  * Merge pull request [#821](https://github.com/node-nock/nock/issues/821) from node-nock/chore-changelog-v9.0.4
+    Update changelog using "npm run changelog"
+  * Update changelog using "npm run changelog"
+
 9.0.4 / 2017-02-07
 ==================
 
@@ -33,6 +84,9 @@
     https://greenkeeper.io/
   * fix typo
     URL begins with a hard u, pronounced "you" and so should be preceded by "a", not "an"
+  * Set `this` to request on socket event.
+    This makes behavior consistent with the Node.js HTTP module
+    (https://github.com/nodejs/node/blob/v6.0.0/lib/_http_client.js#L541).
   * Merge pull request [#757](https://github.com/node-nock/nock/issues/757) from node-nock/greenkeeper-tap-8.0.1
     Update tap to version 8.0.1 🚀
   * Add test for delay/timeout
@@ -122,50 +176,3 @@
   * 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

package/lib/common.js

@@ -308,11 +308,9 @@ function percentEncode(str) {
 }
 
 function matchStringOrRegexp(target, pattern) {
-  if (pattern instanceof RegExp) {
-    return target.toString().match(pattern);
-  } else {
-    return target.toString() === pattern;
-  }
+  var str = target && target.toString ? target.toString() : target;
+
+  return pattern instanceof RegExp  ? str.match(pattern) : str === pattern;
 }
 
 // return [newKey, newValue]

package/lib/interceptor.js

@@ -256,8 +256,9 @@ Interceptor.prototype.match = function match(options, body, hostNameOnly) {
     var queryString;
     var queries;
 
-    if (this.queries && (queryIndex = path.indexOf('?')) !== -1) {
-        queryString = path.slice(queryIndex + 1);
+    if (this.queries) {
+        queryIndex = path.indexOf('?');
+        queryString = (queryIndex !== -1) ? path.slice(queryIndex + 1) : '';
         queries = qs.parse(queryString);
 
         // Only check for query string matches if this.queries is an object
@@ -299,7 +300,9 @@ Interceptor.prototype.match = function match(options, body, hostNameOnly) {
         }
 
         // Remove the query string from the path
-        path = path.substr(0, queryIndex);
+        if(queryIndex !== -1) {
+            path = path.substr(0, queryIndex);
+        }
     }
 
     if (typeof this.uri === 'function') {

package/node_modules/changelog/package.json

@@ -28,7 +28,7 @@
   "_requiredBy": [
     "#DEV:/"
   ],
-  "_resolved": "https://npme.walmart.com/changelog/-/changelog-1.0.7.tgz",
+  "_resolved": "https://registry.npmjs.org/changelog/-/changelog-1.0.7.tgz",
   "_shasum": "e95de6dc14082948bd49618304e9c9e854e821e5",
   "_shrinkwrap": null,
   "_spec": "changelog@^1.0.7",

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "9.0.5",
+  "version": "9.0.9",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "contributors": [
     {
@@ -196,7 +196,7 @@
     "restify": "^4.0.4",
     "restler": "3.4.0",
     "rimraf": "^2.3.2",
-    "superagent": "^1.4.0",
+    "superagent": "^3.5.0",
     "tap": "^10.0.0",
     "zombie": "^5.0.1"
   },

package/tests/browserify-public/browserify-bundle.js

@@ -646,11 +646,9 @@ function percentEncode(str) {
 }
 
 function matchStringOrRegexp(target, pattern) {
-  if (pattern instanceof RegExp) {
-    return target.toString().match(pattern);
-  } else {
-    return target.toString() === pattern;
-  }
+  var str = target && target.toString ? target.toString() : target;
+
+  return pattern instanceof RegExp  ? str.match(pattern) : str === pattern;
 }
 
 // return [newKey, newValue]
@@ -1480,8 +1478,9 @@ Interceptor.prototype.match = function match(options, body, hostNameOnly) {
     var queryString;
     var queries;
 
-    if (this.queries && (queryIndex = path.indexOf('?')) !== -1) {
-        queryString = path.slice(queryIndex + 1);
+    if (this.queries) {
+        queryIndex = path.indexOf('?');
+        queryString = (queryIndex !== -1) ? path.slice(queryIndex + 1) : '';
         queries = qs.parse(queryString);
 
         // Only check for query string matches if this.queries is an object
@@ -1523,7 +1522,9 @@ Interceptor.prototype.match = function match(options, body, hostNameOnly) {
         }
 
         // Remove the query string from the path
-        path = path.substr(0, queryIndex);
+        if(queryIndex !== -1) {
+            path = path.substr(0, queryIndex);
+        }
     }
 
     if (typeof this.uri === 'function') {
@@ -13289,7 +13290,7 @@ function localstorage() {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = createDebug.debug = createDebug.default = createDebug;
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
 exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
@@ -13421,6 +13422,9 @@ function createDebug(namespace) {
 function enable(namespaces) {
   exports.save(namespaces);
 
+  exports.names = [];
+  exports.skips = [];
+
   var split = (namespaces || '').split(/[\s,]+/);
   var len = split.length;
 
@@ -38506,7 +38510,7 @@ var defaults = {
     strictNullHandling: false
 };
 
-var parseValues = function parseValues(str, options) {
+var parseValues = function parseQueryStringValues(str, options) {
     var obj = {};
     var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit);
 
@@ -38532,7 +38536,7 @@ var parseValues = function parseValues(str, options) {
     return obj;
 };
 
-var parseObject = function parseObject(chain, val, options) {
+var parseObject = function parseObjectRecursive(chain, val, options) {
     if (!chain.length) {
         return val;
     }
@@ -38545,7 +38549,7 @@ var parseObject = function parseObject(chain, val, options) {
         obj = obj.concat(parseObject(chain, val, options));
     } else {
         obj = options.plainObjects ? Object.create(null) : {};
-        var cleanRoot = root[0] === '[' && root[root.length - 1] === ']' ? root.slice(1, root.length - 1) : root;
+        var cleanRoot = root.charAt(0) === '[' && root.charAt(root.length - 1) === ']' ? root.slice(1, -1) : root;
         var index = parseInt(cleanRoot, 10);
         if (
             !isNaN(index) &&
@@ -38564,18 +38568,18 @@ var parseObject = function parseObject(chain, val, options) {
     return obj;
 };
 
-var parseKeys = function parseKeys(givenKey, val, options) {
+var parseKeys = function parseQueryStringKeys(givenKey, val, options) {
     if (!givenKey) {
         return;
     }
 
     // Transform dot notation to bracket notation
-    var key = options.allowDots ? givenKey.replace(/\.([^\.\[]+)/g, '[$1]') : givenKey;
+    var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
 
     // The regex chunks
 
-    var parent = /^([^\[\]]*)/;
-    var child = /(\[[^\[\]]*\])/g;
+    var parent = /^([^[]*)/;
+    var child = /(\[[^[\]]*])/g;
 
     // Get the parent
 
@@ -38601,9 +38605,9 @@ var parseKeys = function parseKeys(givenKey, val, options) {
     var i = 0;
     while ((segment = child.exec(key)) !== null && i < options.depth) {
         i += 1;
-        if (!options.plainObjects && has.call(Object.prototype, segment[1].replace(/\[|\]/g, ''))) {
+        if (!options.plainObjects && has.call(Object.prototype, segment[1].slice(1, -1))) {
             if (!options.allowPrototypes) {
-                continue;
+                return;
             }
         }
         keys.push(segment[1]);
@@ -38662,13 +38666,13 @@ var utils = require('./utils');
 var formats = require('./formats');
 
 var arrayPrefixGenerators = {
-    brackets: function brackets(prefix) {
+    brackets: function brackets(prefix) { // eslint-disable-line func-name-matching
         return prefix + '[]';
     },
-    indices: function indices(prefix, key) {
+    indices: function indices(prefix, key) { // eslint-disable-line func-name-matching
         return prefix + '[' + key + ']';
     },
-    repeat: function repeat(prefix) {
+    repeat: function repeat(prefix) { // eslint-disable-line func-name-matching
         return prefix;
     }
 };
@@ -38679,14 +38683,26 @@ var defaults = {
     delimiter: '&',
     encode: true,
     encoder: utils.encode,
-    serializeDate: function serializeDate(date) {
+    serializeDate: function serializeDate(date) { // eslint-disable-line func-name-matching
         return toISO.call(date);
     },
     skipNulls: false,
     strictNullHandling: false
 };
 
-var stringify = function stringify(object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots, serializeDate, formatter) {
+var stringify = function stringify( // eslint-disable-line func-name-matching
+    object,
+    prefix,
+    generateArrayPrefix,
+    strictNullHandling,
+    skipNulls,
+    encoder,
+    filter,
+    sort,
+    allowDots,
+    serializeDate,
+    formatter
+) {
     var obj = object;
     if (typeof filter === 'function') {
         obj = filter(prefix, obj);
@@ -38765,6 +38781,11 @@ var stringify = function stringify(object, prefix, generateArrayPrefix, strictNu
 module.exports = function (object, opts) {
     var obj = object;
     var options = opts || {};
+
+    if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
+        throw new TypeError('Encoder has to be a function.');
+    }
+
     var delimiter = typeof options.delimiter === 'undefined' ? defaults.delimiter : options.delimiter;
     var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
     var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : defaults.skipNulls;
@@ -38782,10 +38803,6 @@ module.exports = function (object, opts) {
     var objKeys;
     var filter;
 
-    if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
-        throw new TypeError('Encoder has to be a function.');
-    }
-
     if (typeof options.filter === 'function') {
         filter = options.filter;
         obj = filter('', obj);
@@ -38973,7 +38990,7 @@ exports.encode = function (str) {
 
         i += 1;
         c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
-        out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)];
+        out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]; // eslint-disable-line max-len
     }
 
     return out;

package/tests/test_intercept.js

@@ -4772,6 +4772,24 @@ test('query() matches query values regardless of their type of declaration', fun
   })
 });
 
+test('query() doesn\'t match query values of requests without query string', function (t) {
+  var scope1 = nock('http://google.com')
+    .get('/')
+    .query({num:1,bool:true,empty:null,str:'fou'})
+    .reply(200, 'scope1');
+
+  var scope2 = nock('http://google.com')
+    .get('/')
+    .reply(200, 'scope2');
+
+  mikealRequest('http://google.com/', function(err, res) {
+    if (err) throw err;
+    t.equal(res.statusCode, 200);
+    t.equal(res.body, 'scope2');
+    t.end();
+  })
+});
+
 test('query() matches a query string using regexp', function (t) {
   var scope = nock('http://google.com')
     .get('/')