Merge pull request #11 from pactflow/PACT-3690-fix-raise-request-content-type-error-only-when-request-body-is-not-undefined

fix: raise request content-type error only when req body is undefiend

Author: vwong

src/__tests__/fixtures/request-body/baseline.json

@@ -1,11 +1,27 @@
 [
+  {
+    "code": "request.body.incompatible",
+    "message": "Request body is incompatible with the request body schema in the spec file: must be object",
+    "mockDetails": {
+      "interactionDescription": "should pass when json body matches spec",
+      "interactionState": "[none]",
+      "location": "[root].interactions[0].request.body"
+    },
+    "specDetails": {
+      "location": "[root].paths./login.post.requestBody.content.application/json.schema.type",
+      "pathMethod": "post",
+      "pathName": "/login",
+      "value": "object"
+    },
+    "type": "error"
+  },
   {
     "code": "request.body.incompatible",
     "message": "Request body is incompatible with the request body schema in the spec file: must be object",
     "mockDetails": {
       "interactionDescription": "should error on empty body",
       "interactionState": "[none]",
-      "location": "[root].interactions[4].request.body",
+      "location": "[root].interactions[5].request.body",
       "value": ""
     },
     "specDetails": {
@@ -22,7 +38,7 @@
     "mockDetails": {
       "interactionDescription": "should error on schema mismatch for json body",
       "interactionState": "[none]",
-      "location": "[root].interactions[5].request.body",
+      "location": "[root].interactions[6].request.body",
       "value": {
         "email": "[email protected]"
       }
@@ -44,7 +60,7 @@
     "mockDetails": {
       "interactionDescription": "should error on schema mismatch for form body",
       "interactionState": "[none]",
-      "location": "[root].interactions[6].request.body",
+      "location": "[root].interactions[7].request.body",
       "value": "[email protected]"
     },
     "specDetails": {

src/__tests__/fixtures/request-body/pact.json

@@ -2,6 +2,18 @@
   "consumer": { "name": "consumer" },
   "provider": { "name": "provider" },
   "interactions": [
+    {
+      "description": "should pass when json body matches spec",
+      "providerState": "",
+      "request": {
+        "method": "POST",
+        "path": "/login"
+      },
+      "response": {
+        "status": 201,
+        "body": {}
+      }
+    },
     {
       "description": "should pass when json body matches spec",
       "providerState": "",

src/__tests__/fixtures/request-body/results.json

@@ -5,7 +5,7 @@
     "mockDetails": {
       "interactionDescription": "should error on empty body",
       "interactionState": "[none]",
-      "location": "[root].interactions[4].request.body.",
+      "location": "[root].interactions[5].request.body.",
       "value": ""
     },
     "specDetails": {
@@ -22,7 +22,7 @@
     "mockDetails": {
       "interactionDescription": "should error on schema mismatch for json body",
       "interactionState": "[none]",
-      "location": "[root].interactions[5].request.body.",
+      "location": "[root].interactions[6].request.body.",
       "value": {
         "email": "[email protected]"
       }
@@ -44,7 +44,7 @@
     "mockDetails": {
       "interactionDescription": "should error on schema mismatch for form body",
       "interactionState": "[none]",
-      "location": "[root].interactions[6].request.body.",
+      "location": "[root].interactions[7].request.body.",
       "value": {
         "email": "[email protected]"
       }

src/compare/requestHeader.ts

@@ -26,7 +26,7 @@ export function* compareReqHeader(
   index: number,
 ): Iterable<Result> {
   const { method, oas, operation, path, securitySchemes } = route.store;
-
+  const { body } = interaction.request;
   const availableRequestContentType =
     operation.consumes ||
     Object.keys(
@@ -104,6 +104,9 @@ export function* compareReqHeader(
     };
   }
 
+  // req body
+  const hasBody = !!(body || body === "");
+
   // request content-type
   // --------------------
   const requestContentType: string =
@@ -157,7 +160,7 @@ export function* compareReqHeader(
     };
   }
 
-  if (!requestContentType && availableRequestContentType.length) {
+  if (!requestContentType && availableRequestContentType.length && hasBody) {
     yield {
       code: "request.content-type.missing",
       message: