match request parameters

src/handle_request.js

@@ -15,7 +15,7 @@ function handleRequest(mockAdapter, resolve, reject, config) {
   }
   config.adapter = null;
 
-  var handler = utils.findHandler(mockAdapter.handlers, config.method, config.url, config.data);
+  var handler = utils.findHandler(mockAdapter.handlers, config.method, config.url, config.data, config.params);
 
   if (handler) {
     utils.purgeIfReplyOnce(mockAdapter, handler);

src/utils.js

@@ -18,16 +18,33 @@ function find(array, predicate) {
   }
 }
 
-function findHandler(handlers, method, url, body) {
+function findHandler(handlers, method, url, body, parameters) {
   return find(handlers[method.toLowerCase()], function(handler) {
     if (typeof handler[0] === 'string') {
-      return url === handler[0] && isBodyMatching(body, handler[1]);
+      return url === handler[0] && isBodyOrParametersMatching(method, body, parameters, handler[1]);
     } else if (handler[0] instanceof RegExp) {
-      return handler[0].test(url) && isBodyMatching(body, handler[1]);
+      return handler[0].test(url) && isBodyOrParametersMatching(method, body, parameters, handler[1]);
     }
   });
 }
 
+function isBodyOrParametersMatching(method, body, parameters, required) {
+  if (method === 'get') {
+    var params = required ? required.params : undefined;
+    return isParametersMatching(parameters, params);
+  } else {
+    return isBodyMatching(body, required);
+  }
+}
+
+function isParametersMatching(parameters, required) {
+  if (required === undefined && parameters === undefined) {
+    return true;
+  }
+
+  return isEqual(parameters, required);
+}
+
 function isBodyMatching(body, requiredBody) {
   if (requiredBody === undefined) {
     return true;

test/basics.spec.js

@@ -86,6 +86,39 @@ describe('MockAdapter basics', function() {
       });
   });
 
+  it('can pass query params to match to a handler', function() {
+    mock.onGet('/withParams', { params: { foo: 'bar', bar: 'foo' } }).reply(200);
+
+    return instance.get('/withParams', { params: { bar: 'foo', foo: 'bar' }, in: true })
+      .then(function(response) {
+        expect(response.status).to.equal(200);
+      });
+  });
+
+  it('does not match when parameters are wrong', function() {
+    mock.onGet('/withParams', { params: { foo: 'bar', bar: 'foo' } }).reply(200);
+    return instance.get('/withParams', { params: { foo: 'bar', bar: 'other' }, in: true })
+      .catch(function(error) {
+        expect(error.response.status).to.equal(404);
+      });
+  });
+
+  it('does not match when parameters are missing', function() {
+    mock.onGet('/withParams', { params: { foo: 'bar', bar: 'foo' } }).reply(200);
+    return instance.get('/withParams')
+      .catch(function(error) {
+        expect(error.response.status).to.equal(404);
+      });
+  });
+
+  it('does not match when parameters were not expected', function() {
+    mock.onGet('/withParams').reply(200);
+    return instance.get('/withParams', { params: { foo: 'bar', bar: 'foo' }, in: true })
+      .catch(function(error) {
+        expect(error.response.status).to.equal(404);
+      });
+  });
+
   it('can pass a body to match to a handler', function() {
     mock
       .onPost('/withBody', { body: { is: 'passed' }, in: true })