@mablhq/mabl-cli 2.51.4 → 2.51.12

package/core/execution/ApiTestUtils.js

@@ -69,6 +69,7 @@ const EXPECT_FUNCTIONS = {
     EndsWith: `satisfy(value => value.endsWith(${EXPECTED_VALUE_TOKEN}))`,
     MatchesRegExp: `match(${EXPECTED_VALUE_TOKEN})`,
 };
+const MEDIA_TYPE_TOKEN = "[0-9A-Za-z!#$%&'*+.^_`|~-]+";
 function compareStringsCaseInsensitive(a, b) {
     a = a === null || a === void 0 ? void 0 : a.toUpperCase().toLowerCase();
     b = b === null || b === void 0 ? void 0 : b.toUpperCase().toLowerCase();
@@ -99,17 +100,6 @@ function getAssertionTypesForTarget(target) {
             ].includes(assertType.value));
         case newman_types_1.AssertionTarget.Header:
         case newman_types_1.AssertionTarget.JSONBody:
-            return exports.ASSERT_TYPES.filter((assertType) => [
-                newman_types_1.AssertionType.Contains,
-                newman_types_1.AssertionType.DoesNotContain,
-                newman_types_1.AssertionType.EndsWith,
-                newman_types_1.AssertionType.Equals,
-                newman_types_1.AssertionType.MatchesRegExp,
-                newman_types_1.AssertionType.NotEquals,
-                newman_types_1.AssertionType.NotPresent,
-                newman_types_1.AssertionType.Present,
-                newman_types_1.AssertionType.StartsWith,
-            ].includes(assertType.value));
         default:
             return exports.ASSERT_TYPES;
     }
@@ -447,6 +437,27 @@ function generateJsonBodyAssertion(description, assertType, requiresValues, path
     if (requiresValues) {
         propertyAccessor = valueToUnquotedString(propertyAccessor);
     }
+    switch (assertType) {
+        case 'Present':
+        case 'NotPresent':
+        case 'Equals':
+        case 'NotEquals':
+        case 'Contains':
+        case 'DoesNotContain':
+        case 'StartsWith':
+        case 'EndsWith':
+        case 'MatchesRegExp':
+            break;
+        case 'GreaterThan':
+        case 'GreaterThanOrEqualTo':
+        case 'LessThan':
+        case 'LessThanOrEqualTo':
+            propertyAccessor = `parseFloat(${propertyAccessor})`;
+            expectedValue = `parseFloat(${expectedValue})`;
+            break;
+        default:
+            throw new Error(`Unexpected header assert type: ${assertType}`);
+    }
     return generatePostmanAssertion(description, propertyAccessor, assertType, expectedValue, caseSensitive);
 }
 function generateJsonBodyVariableAssignment(variableName, path) {
@@ -504,6 +515,7 @@ function generateHeaderAssertion(description, assertType, headerName, expectedVa
     }
     const normalizedHeaderName = JSON.stringify(headerName);
     let test;
+    let target = `pm.response.headers.get(${normalizedHeaderName})`;
     switch (assertType) {
         case 'Present':
             test = `pm.response.to.have.header(${normalizedHeaderName})`;
@@ -523,11 +535,13 @@ function generateHeaderAssertion(description, assertType, headerName, expectedVa
         case 'GreaterThanOrEqualTo':
         case 'LessThan':
         case 'LessThanOrEqualTo':
-            return;
+            target = `parseFloat(${target})`;
+            expectedValue = `parseFloat(${expectedValue})`;
+            break;
         default:
             throw new Error(`Unexpected header assert type: ${assertType}`);
     }
-    return generatePostmanTest(description, test !== null && test !== void 0 ? test : generatePostmanExpect(`pm.response.headers.get(${normalizedHeaderName})`, assertType, expectedValue, caseSensitive));
+    return generatePostmanTest(description, test !== null && test !== void 0 ? test : generatePostmanExpect(target, assertType, expectedValue, caseSensitive));
 }
 function generateSizeAssertion(description, target, type, expectedValue) {
     if (!(expectedValue === null || expectedValue === void 0 ? void 0 : expectedValue.length)) {
@@ -797,21 +811,23 @@ function isSupportedAuthType(authDefinition) {
 }
 exports.isSupportedAuthType = isSupportedAuthType;
 function isJson(contentType) {
-    return (!!contentType &&
-        (contentType.startsWith('application/json') ||
-            contentType.startsWith('application/vnd.api+json')));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('application/json'), (ct) => ct.match(new RegExp(`${MEDIA_TYPE_TOKEN}\/${MEDIA_TYPE_TOKEN}\\+json.*`, 'i')));
 }
 exports.isJson = isJson;
 function isXML(contentType) {
-    return (!!contentType &&
-        (contentType.startsWith('application/xml') ||
-            contentType.startsWith('text/xml')));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('application/xml'), (ct) => ct.startsWith('text/xml'), (ct) => ct.match(new RegExp(`${MEDIA_TYPE_TOKEN}\/${MEDIA_TYPE_TOKEN}\\+xml.*`, 'i')));
 }
 exports.isXML = isXML;
 function isText(contentType) {
-    return !!contentType && (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('text/'));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('text/'));
 }
 exports.isText = isText;
+function contentTypeMatches(contentType, ...predicates) {
+    if (!contentType) {
+        return false;
+    }
+    return predicates.some((predicate) => predicate(contentType));
+}
 function getFormDataArray(item) {
     var _a, _b, _c;
     if (getRequestMode(item) === 'formdata') {