@pactflow/openapi-pact-comparator 1.5.1 → 1.6.0

package/dist/index.mjs

@@ -3669,6 +3669,15 @@ const convertExclusiveMinMax = (s) => {
         delete s.exclusiveMinimum;
     }
 };
+const cleanupDiscriminators = (s) => {
+    // no-op from a validation perspective
+    if (s.discriminator?.mapping) {
+        delete s.discriminator.mapping;
+    }
+    if (s.discriminator && !s.oneOf) {
+        delete s.discriminator;
+    }
+};
 const minimumSchema = (originalSchema, oas) => {
     const refToAdd = [];
     const refAdded = [];
@@ -3676,10 +3685,6 @@ const minimumSchema = (originalSchema, oas) => {
         if (s.$ref && !refToAdd.includes(s.$ref) && !refAdded.includes(s.$ref)) {
             refToAdd.push(s.$ref);
         }
-        // no-op from a validation perspective
-        if (s.discriminator?.mapping) {
-            delete s.discriminator.mapping;
-        }
     };
     const handleNullableSchema = (s) => {
         if (s.$ref) {
@@ -3698,6 +3703,7 @@ const minimumSchema = (originalSchema, oas) => {
     const schema = cloneDeep(originalSchema);
     delete schema.description;
     delete schema.example;
+    traverse(schema, cleanupDiscriminators);
     traverse(schema, collectReferences);
     traverse(schema, handleNullableSchema);
     traverse(schema, convertExclusiveMinMax);
@@ -7763,6 +7769,8 @@ function* compareReqSecurity(ajv, route, interaction, index, config) {
     }
 }
 
+const patternedStatus = (status) => `${Math.floor(status / 100)}XX`;
+
 const canValidate = (contentType = "") => {
     return !!findMatchingType(contentType, ["application/json"]);
 };
@@ -7772,9 +7780,9 @@ function* compareResBody(ajv, route, interaction, index, config) {
     const { body, status } = interaction.response;
     const requestHeaders = new Headers(interaction.request.headers);
     const statusResponse = operation.responses?.[status];
-    const defaultResponse = operation.responses
-        ?.default;
-    const response = statusResponse || defaultResponse;
+    const patternedResponse = operation.responses?.[patternedStatus(status)];
+    const defaultResponse = operation.responses?.["default"];
+    const response = statusResponse || patternedResponse || defaultResponse;
     if (!response) {
         yield {
             code: "response.status.unknown",
@@ -7802,7 +7810,7 @@ function* compareResBody(ajv, route, interaction, index, config) {
         const schema = dereferencedResponse?.schema ||
             getByContentType(dereferencedResponse.content || {}, contentType)?.schema;
         const value = body;
-        if (!statusResponse) {
+        if (!statusResponse && !patternedResponse) {
             yield {
                 code: "response.status.default",
                 message: `Response status code matched default response in spec file: ${status}`,
@@ -7869,7 +7877,9 @@ function* compareResBody(ajv, route, interaction, index, config) {
 
 function* compareResHeader(ajv, route, interaction, index, _config) {
     const { method, oas, operation, path } = route.store;
-    const response = operation.responses[interaction.response.status] ||
+    const { status } = interaction.response;
+    const response = operation.responses[status] ||
+        operation.responses[patternedStatus(status)] ||
         operation.responses["default"];
     // no response found
     // -----------------