runner-runtime 1.0.34 → 1.0.36

package/events/api.js

@@ -1761,7 +1761,7 @@ const preProcessMockExp = (request, requestPara, AllVars, option) => {
 
 // 初始化api请求参数
 const initRequestJson = (event, option) => {
-    
+
     // 获取具体的请求详情
     const requestJson = _.assign(_.pick(event, ['event_id', 'test_id']), _.pick(event?.data, ['target_id', 'project_id']));
 
@@ -1783,10 +1783,10 @@ const initRequestJson = (event, option) => {
             if (_.isString(sampleTargetID) && sampleTargetID) {
                 getParentTargetIDs(option?.collection, requestJson?.sampleTargetID, parentIDs);
             }
-        }else{
+        } else {
             getParentTargetIDs(option?.collection, _.get(event, `data.target_id`), parentIDs);
         }
-console.log(_.get(event, `data.target_id`),parentIDs,6666666666)
+        console.log(_.get(event, `data.target_id`), parentIDs, 6666666666)
         if (!_.includes(parentIDs, "0")) {
             parentIDs.push("0");
         }
@@ -1800,7 +1800,7 @@ console.log(_.get(event, `data.target_id`),parentIDs,6666666666)
                 // 目录参数
                 _.assign(request, _.get(getAPIFromCollection(option?.collection, parent_id), "request"));
             }
-console.log(JSON.stringify(request,null,2),parent_id,7777,111111111111111111111111111111111111111111111111111111111111)
+            console.log(JSON.stringify(request, null, 2), parent_id, 7777, 111111111111111111111111111111111111111111111111111111111111)
             if (_.isObject(request) && !_.isEmpty(request)) {
                 ["header", "body", "query", "cookie"].forEach((parameter) => {
                     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) =>
                                     })
                                 }
                             }
-// console.log(String(request?.url),5555555555555,_.get(eventRuntimeData, ["variables"]))
+                            // console.log(String(request?.url),5555555555555,_.get(eventRuntimeData, ["variables"]))
                             const requestOptions = convert2EchoRequest(request, requestJson, postmanJSON, history);
                             _.set(eventRuntimeData, [event?.event_id, "request"], requestOptions);
 
@@ -2259,7 +2259,9 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                                         _.set(eventRuntimeData, [event?.event_id, "assertions"], []);
                                     }
 
-                                    eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, event?.event_id, "assertions"), assertions), _.isEqual);
+                                    eventRuntimeData[event?.event_id].assertions = _.unionWith(_.concat(_.get(eventRuntimeData, [event?.event_id, "assertions"]), assertions), _.isEqual);
+
+                                    // console.log(eventRuntimeData[event?.event_id].assertions,111111)
                                 }
                             }
                         },
@@ -2319,7 +2321,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
 
 
                                 if (scene === 'auto_test') {
-                                    if(_.includes(['assert', 'assert_visual', 'api', 'sample','script'], event?.type)){
+                                    if (_.includes(['assert', 'assert_visual', 'api', 'sample', 'script'], event?.type)) {
                                         eventResultList.push(_.assign(camelCaseToSnakeCase(_.get(_.cloneDeep(eventRuntimeData), event?.event_id)), _.pick(event, ['type', 'event_id', 'test_id', 'iteration_id'])));
 
                                         resolve({

package/events/index.js

@@ -204,9 +204,9 @@ const events = {
                 } else if (_.includes([3], loopType)) {
                     const condition = _.get(option, 'condition', _.get(data, 'loop_condition', {}));
                     const exp = variableReplace(condition?.var, eventRuntimeData?.variables, option), compare = condition?.compare, value = variableReplace(condition?.value, eventRuntimeData?.variables, option);
-
+                    console.log(exp, compare, value, `loopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopTypeloopType`, !returnBoolean(exp, compare, value))
                     while (true) {
-                        if (startTime + timeout > Date.now() && !returnBoolean(exp, compare, value)) {
+                        if (timeout === 0 || (timeout > 0 && startTime + timeout > Date.now()) && !returnBoolean(exp, compare, value)) {
                             await iterationEvent(_.cloneDeep(children), _.assign(_.cloneDeep(option), { iterationDataArr: iterationData, sleep, condition, startTime, timeout }), callback, eventRuntimeData, eventResultList);
                         } else {
                             break;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "runner-runtime",
-    "version": "1.0.34",
+    "version": "1.0.36",
     "description": "runner-runtime.",
     "main": "index.js",
     "scripts": {