Revert "chore: added warning for message comparison and added handling when interactions array in null or undefined (#422)"

This reverts commit 1d35775.

Author: vwong

src/__tests__/fixtures/pact-formats/results.json

@@ -1,17 +1 @@
-[
-  {
-    "code": "interaction.type.unsupported",
-    "message": "Non-HTTP Interaction is not supported, OPC can only compare HTTP interactions.",
-    "type": "warning"
-  },
-  {
-    "code": "interaction.type.unsupported",
-    "message": "Non-HTTP Interaction is not supported, OPC can only compare HTTP interactions.",
-    "type": "warning"
-  },
-  {
-    "code": "interaction.type.unsupported",
-    "message": "Non-HTTP Interaction is not supported, OPC can only compare HTTP interactions.",
-    "type": "warning"
-  }
-]
+[]

src/__tests__/fixtures/pact-non-http-interactions-v3/oas.yaml

@@ -1,9 +1,4 @@
 [
-  {
-    "code": "interaction.type.unsupported",
-    "message": "Non-HTTP Interaction is not supported, OPC can only compare HTTP interactions.",
-    "type": "warning"
-  },
   {
     "code": "request.body.incompatible",
     "message": "Request body is incompatible with the request body schema in the spec file: must be object",

src/__tests__/fixtures/pact-non-http-interactions-v3/pact.json

@@ -63,17 +63,9 @@ export class Comparator {
 
     const parsedPact = parsePact(pact);
 
-    const parsedInteractions = parsedPact.interactions || [];
-
-    const UNSUPPORTED_INTERACTION_WARNING = {
-      code: "interaction.type.unsupported",
-      message: `Non-HTTP Interaction is not supported, OPC can only compare HTTP interactions.`,
-      type: "warning",
-    } as Result;
-
-    for (const [index, interaction] of parsedInteractions.entries()) {
+    for (const [index, interaction] of parsedPact.interactions.entries()) {
       if (interaction._skip) {
-        yield UNSUPPORTED_INTERACTION_WARNING;
+        // non http/synchronous have been zero-ed out
         continue;
       }
 
@@ -180,11 +172,5 @@ export class Comparator {
         this.#config,
       );
     }
-
-    if (parsedPact.messages) {
-      for (const [_message] of parsedPact.messages.entries()) {
-        yield UNSUPPORTED_INTERACTION_WARNING;
-      }
-    }
   }
 }

src/__tests__/fixtures/pact-non-http-interactions-v3/results.json

@@ -25,15 +25,15 @@ describe("#parser", () => {
       ],
     } as Pact;
 
-    const { request, response } = parse(json).interactions![0];
+    const { request, response } = parse(json).interactions[0];
     expect(request.headers!["Content-Type"]).toEqual("text/json");
     expect(request.headers!["Accept"]).toEqual(
       "text/plain,application/json,text/json",
     );
     expect(response.headers!["Content-Type"]).toEqual("application/json");
   });
 
-  it("marks out non-HTTP interactions from v4 pact as skip `true`", () => {
+  it("filters out non-HTTP interactions", () => {
     const request = {
       method: "GET",
       path: "/path",
@@ -66,35 +66,11 @@ describe("#parser", () => {
     };
 
     const pact = parse(json as Pact);
-    expect(pact.interactions!.length).toBe(4);
-    expect(pact.interactions![0].description).toBe("no-type");
-    expect(pact.interactions![1].description).toBe("http");
-    expect(pact.interactions![2]._skip).toBe(true);
-    expect(pact.interactions![3]._skip).toBe(true);
-  });
-
-  it("if messages are present it parses it to be dealt with later", () => {
-    const request = {
-      method: "GET",
-      path: "/path",
-    };
-    const response = {
-      status: 200,
-    };
-    const json = {
-      interactions: [{ description: "no-type", request, response }],
-      messages: [
-        {
-          content: "some-message-content",
-        },
-      ],
-    };
-
-    const pact = parse(json as Pact);
-    expect(pact.interactions!.length).toBe(1);
-    expect(pact.interactions![0].description).toBe("no-type");
-    expect(pact.messages!.length).toBe(1);
-    expect(pact.messages![0]).toEqual({ content: "some-message-content" });
+    expect(pact.interactions.length).toBe(4);
+    expect(pact.interactions[0].description).toBe("no-type");
+    expect(pact.interactions[1].description).toBe("http");
+    expect(pact.interactions[2]._skip).toBe(true);
+    expect(pact.interactions[3]._skip).toBe(true);
   });
 
   it("should parse V4 body types", () => {
@@ -163,13 +139,13 @@ describe("#parser", () => {
 
     const pact = parse(json as Pact);
 
-    expect(pact.interactions![0].response.body).toEqual({ hello: "world" });
-    expect(pact.interactions![1].response.body).toEqual({ hello: "world" });
-    expect(pact.interactions![2].response.body).toEqual("hello world");
-    expect(pact.interactions![3].request.body).toEqual({ hello: "world" });
-    expect(pact.interactions![4].request.body).toEqual({ hello: "world" });
-    expect(pact.interactions![5].request.body).toEqual("hello world");
-    expect(pact.interactions![6].request.body).toEqual("{ not: json }");
-    expect(pact.interactions![7].request.body).toEqual("abcdef");
+    expect(pact.interactions[0].response.body).toEqual({ hello: "world" });
+    expect(pact.interactions[1].response.body).toEqual({ hello: "world" });
+    expect(pact.interactions[2].response.body).toEqual("hello world");
+    expect(pact.interactions[3].request.body).toEqual({ hello: "world" });
+    expect(pact.interactions[4].request.body).toEqual({ hello: "world" });
+    expect(pact.interactions[5].request.body).toEqual("hello world");
+    expect(pact.interactions[6].request.body).toEqual("{ not: json }");
+    expect(pact.interactions[7].request.body).toEqual("abcdef");
   });
 });

src/__tests__/fixtures/pact-non-http-interactions/results.json

@@ -59,8 +59,7 @@ export const Pact = Type.Object({
       ),
     }),
   ),
-  interactions: Type.Optional(Type.Array(Interaction)),
-  messages: Type.Optional(Type.Array(Type.Unknown())),
+  interactions: Type.Array(Interaction),
 });
 
 export type Pact = Static<typeof Pact>;
@@ -155,12 +154,11 @@ const ajv = new Ajv();
 const validate = ajv.compile(Pact);
 
 export const parse = (pact: Pact): Pact => {
-  const { metadata, interactions, messages } = pact;
+  const { metadata, interactions } = pact;
 
   const isValid = validate({
     metadata,
-    interactions: interactions?.filter(supportedInteractions),
-    messages,
+    interactions: interactions.filter(supportedInteractions),
   });
   if (!isValid) {
     throw new ParserError(validate.errors!);
@@ -177,12 +175,11 @@ export const parse = (pact: Pact): Pact => {
 
   return {
     metadata,
-    interactions: interactions?.map((i: Interaction) =>
+    interactions: interactions.map((i: Interaction) =>
       supportedInteractions(i)
         ? interactionParser(i)
         : ({ _skip: true } as Interaction),
     ),
-    messages,
   };
 };
 

src/compare/index.ts

@@ -26,8 +26,7 @@ type WarningCode =
   | "request.query.unknown"
   | "response.content-type.unknown"
   | "response.header.undefined"
-  | "response.status.default"
-  | "interaction.type.unsupported";
+  | "response.status.default";
 
 export interface Result {
   code: ErrorCode | WarningCode;