Merge pull request #1101 from mhawila/ohm1100

Issue #1100: Request matching should include HTTP methods

src/middleware/requestMatching.js

@@ -74,6 +74,12 @@ function matchUrlPattern (channel, ctx) {
   return pat.test(ctx.request.path)
 }
 
+function matchMethod(channel, ctx) {
+    let found = channel.methods.find(method => ctx.request.method.toUpperCase() === method);
+    if(found) return true;
+    return false;
+}
+
 function matchContentTypes (channel, ctx) {
   if ((channel.matchContentTypes != null ? channel.matchContentTypes.length : undefined) > 0) {
     if (ctx.request.header && ctx.request.header['content-type']) {
@@ -98,6 +104,8 @@ function matchContentTypes (channel, ctx) {
 // TODO: OHM-695 uncomment line below when working on ticket
 const matchFunctions = [
   matchUrlPattern,
+  matchMethod,
+  matchContent,
   matchContentTypes
 ]
 

test/unit/requestMatchingTest.js

@@ -115,6 +115,22 @@ describe('Request Matching middleware', () => {
     })
   })
 
+  describe('.matchMethod', () => {
+      let matchMethod = requestMatching.__get__('matchMethod')
+      let channel = { methods: ['GET', 'POST', 'DELETE'] }
+
+      it('should match a request http method', () => {
+          let actual = matchMethod(channel, { request: { method: 'GET'}})
+          return actual.should.be.true()
+      })
+
+      it('should reject request with excluded method', () => {
+          // PUT is not included in the channel definition
+          let actual = matchMethod(channel, { request: { method: 'PUT'}})
+          return actual.should.be.false()
+      })
+  })
+
   describe('.matchContentTypes', () => {
     it('should match correct content types', () => {
       const matchContentTypes = requestMatching.__get__('matchContentTypes')