@pactflow/openapi-pact-comparator 1.5.0 → 1.6.0

package/dist/index.cjs

@@ -3671,6 +3671,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 = [];
@@ -3678,10 +3687,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) {
@@ -3700,6 +3705,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);
@@ -3707,7 +3713,7 @@ const minimumSchema = (originalSchema, oas) => {
         const ref = refToAdd.shift();
         const path = splitPath(ref);
         refAdded.push(ref);
-        const subschema = cloneDeep(get$1(oas, path));
+        const subschema = cloneDeep(get$1(oas, path, {}));
         delete subschema.description;
         delete subschema.example;
         traverse(subschema, collectReferences);
@@ -7621,9 +7627,9 @@ function* compareReqSecurity(ajv, route, interaction, index, config) {
             }
             for (const schemeName of Object.keys(scheme)) {
                 const scheme = securitySchemes[schemeName];
-                switch (scheme?.type) {
-                    case "apiKey":
-                        switch (scheme.in) {
+                switch (scheme?.type?.toLowerCase()) {
+                    case "apikey":
+                        switch (scheme.in.toLowerCase()) {
                             case "header":
                                 if (requestHeaders.has(scheme.name)) {
                                     isSecured = true;
@@ -7718,7 +7724,7 @@ function* compareReqSecurity(ajv, route, interaction, index, config) {
                             isValidSchema = requestHeaders.get("authorization") !== null;
                         }
                         else {
-                            switch (scheme.scheme) {
+                            switch (scheme.scheme.toLowerCase()) {
                                 case "basic":
                                     isValidSchema = auth.toLowerCase().startsWith("basic ");
                                     break;
@@ -7750,9 +7756,9 @@ function* compareReqSecurity(ajv, route, interaction, index, config) {
                         }
                         break;
                     }
-                    case "mutualTLS":
+                    case "mutualtls":
                     case "oauth2":
-                    case "openIdConnect":
+                    case "openidconnect":
                         // nothing can be validated, assume meets security requirements
                         isSecured = true;
                         break;
@@ -7765,6 +7771,8 @@ function* compareReqSecurity(ajv, route, interaction, index, config) {
     }
 }
 
+const patternedStatus = (status) => `${Math.floor(status / 100)}XX`;
+
 const canValidate = (contentType = "") => {
     return !!findMatchingType(contentType, ["application/json"]);
 };
@@ -7774,9 +7782,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",
@@ -7804,7 +7812,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}`,
@@ -7871,7 +7879,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
     // -----------------