@loadmill/executer 0.1.101 → 0.1.102
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/asserter.d.ts +1 -1
- package/dist/asserter.js +20 -3
- package/dist/asserter.js.map +1 -1
- package/dist/mill-version.js +1 -1
- package/package.json +3 -3
package/dist/asserter.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { Assertion } from '@loadmill/core/dist/request';
|
|
|
3
3
|
export declare class Asserter {
|
|
4
4
|
private parameters;
|
|
5
5
|
constructor(parameters: Parameters);
|
|
6
|
-
assert({ check, equals, notEquals, contains, notContains, matches, falsy, greater, lesser, JSONSchema, JSONContains, }: Assertion): boolean;
|
|
6
|
+
assert({ check, equals, notEquals, contains, notContains, matches, falsy, greater, lesser, JSONSchema, JSONContains, XMLContains, }: Assertion): boolean;
|
|
7
7
|
private resolve;
|
|
8
8
|
private check;
|
|
9
9
|
}
|
package/dist/asserter.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Asserter = void 0;
|
|
7
7
|
var parameters_1 = require("@loadmill/core/dist/parameters");
|
|
8
8
|
var subset_1 = require("@loadmill/core/dist/subset");
|
|
9
|
+
var xml_to_json_1 = require("@loadmill/core/dist/xml/xml-to-json");
|
|
9
10
|
var log_1 = __importDefault(require("@loadmill/universal/dist/log"));
|
|
10
11
|
var Asserter = /** @class */ (function () {
|
|
11
12
|
function Asserter(parameters) {
|
|
@@ -21,7 +22,7 @@ var Asserter = /** @class */ (function () {
|
|
|
21
22
|
configurable: true,
|
|
22
23
|
writable: true,
|
|
23
24
|
value: function (_a) {
|
|
24
|
-
var check = _a.check, equals = _a.equals, notEquals = _a.notEquals, contains = _a.contains, notContains = _a.notContains, matches = _a.matches, falsy = _a.falsy, greater = _a.greater, lesser = _a.lesser, JSONSchema = _a.JSONSchema, JSONContains = _a.JSONContains;
|
|
25
|
+
var check = _a.check, equals = _a.equals, notEquals = _a.notEquals, contains = _a.contains, notContains = _a.notContains, matches = _a.matches, falsy = _a.falsy, greater = _a.greater, lesser = _a.lesser, JSONSchema = _a.JSONSchema, JSONContains = _a.JSONContains, XMLContains = _a.XMLContains;
|
|
25
26
|
var actual = parameters_1.parameterUtils.resolveParameter(check, this.parameters) || '';
|
|
26
27
|
if (contains == null &&
|
|
27
28
|
notContains == null &&
|
|
@@ -31,7 +32,8 @@ var Asserter = /** @class */ (function () {
|
|
|
31
32
|
greater == null &&
|
|
32
33
|
lesser == null &&
|
|
33
34
|
JSONSchema == null &&
|
|
34
|
-
JSONContains == null
|
|
35
|
+
JSONContains == null &&
|
|
36
|
+
XMLContains == null) {
|
|
35
37
|
// only if no other assertions exist, the target expression is to check
|
|
36
38
|
// for "truthfulness" or "falslyness"(in case falsy flag is on).
|
|
37
39
|
// Note that failed/null extractions evaluate to an empty string while
|
|
@@ -56,7 +58,8 @@ var Asserter = /** @class */ (function () {
|
|
|
56
58
|
this.check(actual, checkGreater, greater) ||
|
|
57
59
|
this.check(actual, checkLesser, lesser) ||
|
|
58
60
|
this.check(actual, checkJSONSchema, JSONSchema) ||
|
|
59
|
-
this.check(actual, checkJSONContains, JSONContains)
|
|
61
|
+
this.check(actual, checkJSONContains, JSONContains) ||
|
|
62
|
+
this.check(actual, checkXMLContains, XMLContains));
|
|
60
63
|
}
|
|
61
64
|
});
|
|
62
65
|
Object.defineProperty(Asserter.prototype, "resolve", {
|
|
@@ -138,4 +141,18 @@ function checkJSONContains(actual, expected) {
|
|
|
138
141
|
log_1.default.debug('Assert JSONContains:', { actual: actual, expected: expected, result: result });
|
|
139
142
|
return result;
|
|
140
143
|
}
|
|
144
|
+
function checkXMLContains(actual, expected) {
|
|
145
|
+
var parserOptions = { trim: true, normalize: true, strict: false };
|
|
146
|
+
var onParseError = function (err, result, xml) {
|
|
147
|
+
log_1.default.debug('Failed to convert XML to JSON while asserting', { result: result, xml: xml }, err);
|
|
148
|
+
};
|
|
149
|
+
var actualAsJson = xml_to_json_1.xmlToJson(actual, parserOptions, onParseError);
|
|
150
|
+
var expectedAsJson = xml_to_json_1.xmlToJson(expected, parserOptions, onParseError);
|
|
151
|
+
if (!actualAsJson || !expectedAsJson) {
|
|
152
|
+
return false;
|
|
153
|
+
}
|
|
154
|
+
var result = subset_1.isJSONContains(JSON.stringify(actualAsJson), JSON.stringify(expectedAsJson));
|
|
155
|
+
log_1.default.debug('Assert XMLContains:', { actual: actual, expected: expected, result: result });
|
|
156
|
+
return result;
|
|
157
|
+
}
|
|
141
158
|
//# sourceMappingURL=asserter.js.map
|
package/dist/asserter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asserter.js","sourceRoot":"","sources":["../src/asserter.ts"],"names":[],"mappings":";;;;;;AAEA,6DAA4E;AAC5E,qDAA4D;AAC5D,qEAA+C;AAE/C;IACE,kBAAoB,UAAsB;;;;;mBAAtB;;IAAyB,CAAC;;;;;eAE9C,UAAO,
|
|
1
|
+
{"version":3,"file":"asserter.js","sourceRoot":"","sources":["../src/asserter.ts"],"names":[],"mappings":"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"}
|
package/dist/mill-version.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.millVersionString = exports.millVersion = void 0;
|
|
4
4
|
exports.millVersion = {
|
|
5
5
|
major: 9,
|
|
6
|
-
minor:
|
|
6
|
+
minor: 88,
|
|
7
7
|
patch: 0,
|
|
8
8
|
};
|
|
9
9
|
exports.millVersionString = exports.millVersion.major + "." + exports.millVersion.minor + "." + exports.millVersion.patch;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loadmill/executer",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.102",
|
|
4
4
|
"description": "Loadmill executer library",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@grpc/grpc-js": "^1.9.8",
|
|
18
18
|
"@grpc/proto-loader": "^0.7.10",
|
|
19
|
-
"@loadmill/core": "0.3.
|
|
20
|
-
"@loadmill/universal": "0.3.
|
|
19
|
+
"@loadmill/core": "0.3.101",
|
|
20
|
+
"@loadmill/universal": "0.3.96",
|
|
21
21
|
"@types/estree": "^0.0.50",
|
|
22
22
|
"acorn": "^8.4.1",
|
|
23
23
|
"agentkeepalive": "^4.1.3",
|