runner-runtime 1.0.36 → 1.0.37
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/events/api.js +6 -5
- package/events/index.js +2 -2
- package/libs/utils.js +4 -3
- package/package.json +1 -1
- package/tmp/request.js +251 -983
package/events/api.js
CHANGED
|
@@ -1786,7 +1786,7 @@ const initRequestJson = (event, option) => {
|
|
|
1786
1786
|
} else {
|
|
1787
1787
|
getParentTargetIDs(option?.collection, _.get(event, `data.target_id`), parentIDs);
|
|
1788
1788
|
}
|
|
1789
|
-
|
|
1789
|
+
|
|
1790
1790
|
if (!_.includes(parentIDs, "0")) {
|
|
1791
1791
|
parentIDs.push("0");
|
|
1792
1792
|
}
|
|
@@ -1800,7 +1800,7 @@ const initRequestJson = (event, option) => {
|
|
|
1800
1800
|
// 目录参数
|
|
1801
1801
|
_.assign(request, _.get(getAPIFromCollection(option?.collection, parent_id), "request"));
|
|
1802
1802
|
}
|
|
1803
|
-
|
|
1803
|
+
|
|
1804
1804
|
if (_.isObject(request) && !_.isEmpty(request)) {
|
|
1805
1805
|
["header", "body", "query", "cookie"].forEach((parameter) => {
|
|
1806
1806
|
let arrPara = _.filter(_.get(request, `${parameter}.parameter`), (item) => { return _.toInteger(item.is_system) > 0 || item.is_checked > 0 });
|
|
@@ -2202,7 +2202,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2202
2202
|
})
|
|
2203
2203
|
}
|
|
2204
2204
|
}
|
|
2205
|
-
|
|
2205
|
+
|
|
2206
2206
|
const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
|
|
2207
2207
|
_.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
|
|
2208
2208
|
|
|
@@ -2253,12 +2253,13 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2253
2253
|
},
|
|
2254
2254
|
|
|
2255
2255
|
assertion(cursor, assertions) {
|
|
2256
|
+
// console.log(assertions,`assertionsassertionsassertionsassertionsassertionsassertions`)
|
|
2256
2257
|
if (!_.includes(['get_parsed_request'], scene)) {
|
|
2257
2258
|
if (!_.isEmpty(assertions) && _.isArray(assertions)) {
|
|
2258
2259
|
if (_.isUndefined(_.get(eventRuntimeData, [event?.event_id, "assertions"]))) {
|
|
2259
2260
|
_.set(eventRuntimeData, [event?.event_id, "assertions"], []);
|
|
2260
2261
|
}
|
|
2261
|
-
|
|
2262
|
+
// eventRuntimeData[event?.event_id].assertions = _.cloneDeep(assertions)
|
|
2262
2263
|
eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, [event?.event_id, "assertions"]), assertions), _.isEqual);
|
|
2263
2264
|
|
|
2264
2265
|
// console.log(eventRuntimeData[event?.event_id].assertions,111111)
|
|
@@ -2296,7 +2297,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
|
|
|
2296
2297
|
})
|
|
2297
2298
|
|
|
2298
2299
|
_.set(eventRuntimeData, [event?.event_id, "status"], {
|
|
2299
|
-
assert: [event?.event_id, "assertions"],
|
|
2300
|
+
assert: _.get(eventRuntimeData,[event?.event_id, "assertions"]),
|
|
2300
2301
|
success_assert,
|
|
2301
2302
|
http: _.get(eventRuntimeData, [event?.event_id, 'response', 'status']) || _.get(eventRuntimeData, [event?.event_id, 'error', 'message'])
|
|
2302
2303
|
});
|
package/events/index.js
CHANGED
|
@@ -204,9 +204,9 @@ const events = {
|
|
|
204
204
|
} else if (_.includes([3], loopType)) {
|
|
205
205
|
const condition = _.get(option, 'condition', _.get(data, 'loop_condition', {}));
|
|
206
206
|
const exp = variableReplace(condition?.var, eventRuntimeData?.variables, option), compare = condition?.compare, value = variableReplace(condition?.value, eventRuntimeData?.variables, option);
|
|
207
|
-
console.log(exp, compare, value, `loopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopType`, !returnBoolean(exp, compare, value))
|
|
207
|
+
// console.log(exp, compare, value, `loopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopType`, !returnBoolean(exp, compare, value))
|
|
208
208
|
while (true) {
|
|
209
|
-
if (timeout === 0 || (timeout > 0 && startTime + timeout > Date.now()) && !returnBoolean(exp, compare, value)) {
|
|
209
|
+
if ((timeout === 0 || (timeout > 0 && startTime + timeout > Date.now())) && !returnBoolean(exp, compare, value)) {
|
|
210
210
|
await iterationEvent(_.cloneDeep(children), _.assign(_.cloneDeep(option), { iterationDataArr: iterationData, sleep, condition, startTime, timeout }), callback, eventRuntimeData, eventResultList);
|
|
211
211
|
} else {
|
|
212
212
|
break;
|
package/libs/utils.js
CHANGED
|
@@ -448,7 +448,7 @@ const formatAutotestReportList = (eventResultList) => {
|
|
|
448
448
|
type = 'api';
|
|
449
449
|
}
|
|
450
450
|
|
|
451
|
-
// console.log(item?.
|
|
451
|
+
// console.log(item?.status?.success_assert,3333333333)
|
|
452
452
|
list.push(_.assign(
|
|
453
453
|
_.pick(item?.response, ['timings', 'response_time', 'response_at', 'proxy', 'status', 'code', 'response_size']),
|
|
454
454
|
_.pick(item?.request, ['url', 'method', 'name', 'target_id', 'project_id']),
|
|
@@ -490,12 +490,13 @@ const formatAutotestReport = (startTimeAt, eventResultList) => {
|
|
|
490
490
|
|
|
491
491
|
let totalResponseSize = 0, totalResponseTime = 0
|
|
492
492
|
|
|
493
|
-
_.forEach(eventResultList, (item) => {
|
|
493
|
+
_.forEach(_.cloneDeep(eventResultList), (item) => {
|
|
494
|
+
console.log(_.cloneDeep(item),898989898898989)
|
|
494
495
|
if (_.includes(['api', 'sample'], item?.type)) {
|
|
495
496
|
report.http.total++;
|
|
496
497
|
totalResponseSize = totalResponseSize + _.toInteger(item?.response?.response_size);
|
|
497
498
|
totalResponseTime = totalResponseTime + _.toInteger(item?.response?.response_time);
|
|
498
|
-
|
|
499
|
+
console.log(item?.status?.assert,111111111111)
|
|
499
500
|
if (!_.isEmpty(item?.status?.assert) && _.isArray(item?.status?.assert)) {
|
|
500
501
|
const assertFailure = _.map(item?.status?.assert, (assertItem) => {
|
|
501
502
|
return assertItem?.passed === false
|