nock 2.12.0 → 2.13.0

package/lib/scope.js

@@ -269,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;
           }
         }
 

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "2.12.0",
+  "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": {

package/tests/test_intercept.js

@@ -4099,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)