Allow wildcards for query string parameters

mockserver.js

@@ -247,6 +247,10 @@ function getDirectoriesRecursive(srcpath) {
  * GET--query=string&hello=hella.mock
  */
 function getBodyOrQueryString(body, query) {
+  if (body && query) {
+    return '_'+ body + '--' + query;
+  }
+
   if (query) {
     return '--' + query;
   }
@@ -288,12 +292,12 @@ function getMockedContent(path, prefix, body, query) {
   let content = handleMatch(path, exactName, fs.existsSync);
 
   // Compare params without regard to order
-  if (!content && query && !body) {
-    content = testForQuery(path, prefix, query, false);
+  if (!content && query) {
+    content = testForQuery(path, prefix, body, query, false);
 
     // Compare params without regard to order and allow wildcards
     if (!content) {
-      content = testForQuery(path, prefix, query, true);
+      content = testForQuery(path, prefix, body, query, true);
     }
   }
 
@@ -306,11 +310,17 @@ function getMockedContent(path, prefix, body, query) {
   return content;
 }
 
-function testForQuery(path, prefix, query, allowWildcards) {
+function testForQuery(path, prefix, body, query, allowWildcards) {
   // Find all files in the directory
   return fs
     .readdirSync(join(mockserver.directory, path))
-    .filter(possibleFile => possibleFile.startsWith(prefix) && possibleFile.endsWith('.mock'))
+    .filter(possibleFile => {
+      if (body) {
+        return possibleFile.startsWith(prefix + '_' + body) && possibleFile.endsWith('.mock');
+      }
+
+      return possibleFile.startsWith(prefix) && possibleFile.endsWith('.mock');
+    })
     .filter(possibleFile => possibleFile.match(/--[\s\S]*__/))
     .reduce((prev, possibleFile) => {
       if (prev) {

test/mocks/return-200/POST_Hello=123--a=b.mock

@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: text/xml; charset=utf-8
+
+Hella

test/mocks/return-200/POST_Hello=456--c=__.mock

@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: text/xml; charset=utf-8
+
+Hello!!!

test/mockserver.js

@@ -420,30 +420,76 @@ describe('mockserver', function() {
       });
     });
 
-    describe("query string parameters", function() {
+    describe('query string parameters', function() {
       it('should be able to handle GET parameters', function() {
         processRequest('/test?a=b', 'GET');
 
         assert.equal(res.status, 200);
       });
 
-      it("should handle a file with wildcards as query params", function() {
-        processRequest("/wildcard-params?foo=bar&buz=baz", "GET");
+      it('should handle a file with wildcards as query params', function() {
+        processRequest('/wildcard-params?foo=bar&buz=baz', 'GET');
 
         assert.equal(res.status, 200);
       });
 
-      it("should handle a request regardless of the order of the params in the query string", function() {
-        processRequest("/wildcard-params?buz=baz&foo=bar", "GET");
+      it('should handle a request regardless of the order of the params in the query string', function() {
+        processRequest('/wildcard-params?buz=baz&foo=bar', 'GET');
 
         assert.equal(res.status, 200);
       });
 
+      it('should not handle requests with extra params in the query string', function() {
+        processRequest('/wildcard-params?buz=baz&foo=bar&biz=bak', 'GET');
+
+        assert.equal(res.status, 404);
+      });
+
       it('should default to GET.mock if no matching parameter file is found', function() {
         processRequest('/test?a=c', 'GET');
 
         assert.equal(res.status, 200);
       });
+
+      it('should be able to include POST bodies and query params', function(done) {
+        const req = new MockReq({
+          method: 'POST',
+          url: '/return-200?a=b',
+          headers: {
+            Accept: 'text/plain'
+          }
+        });
+        req.write('Hello=123');
+        req.end();
+
+        mockserver(mocksDirectory, verbose)(req, res);
+
+        req.on('end', function() {
+          assert.equal(res.body, 'Hella');
+          assert.equal(res.status, 200);
+          done();
+        });
+      });
+
+      it('should be able to include POST bodies and query params with wildcards', function(done) {
+        const req = new MockReq({
+          method: 'POST',
+          url: '/return-200?c=d',
+          headers: {
+            Accept: 'text/plain'
+          }
+        });
+        req.write('Hello=456');
+        req.end();
+
+        mockserver(mocksDirectory, verbose)(req, res);
+
+        req.on('end', function() {
+          assert.equal(res.body, 'Hello!!!');
+          assert.equal(res.status, 200);
+          done();
+        });
+      });
     });
 
     describe('.getResponseDelay', function() {