runner-runtime 1.0.59 → 1.0.60

package/events/index.js

@@ -26,16 +26,6 @@ const events = {
             const exp = variableReplaceForCondition(data?.var, eventRuntimeData?.variables, option),
                 compare = data?.compare, value = variableReplaceForCondition(data?.value, eventRuntimeData?.variables, option);
             const isMatched = returnBoolean(exp, compare, value);
-
-            if (isMatched && _.isArray(finalChildren) && !_.isEmpty(finalChildren)) {
-                const { iterationData } = option, iterationDataArr = [iterationData];
-
-                // if (!_.isEmpty(iterationData) && _.isObject(iterationData)) {
-                //     iterationDataArr = _.flatMap([iterationData], (element) => _.times(_.size(finalChildren), () => element));
-                // }
-                await iterationEvent(finalChildren, _.assign(_.cloneDeep(option), { iterationDataArr }), callback, eventRuntimeData, eventResultList)
-            }
-
             const runtimeState = convertEndRuntimeState(eventRuntimeData, event?.event_id) || {}
             const finalIfData = {
                 action: 'request',
@@ -64,6 +54,16 @@ const events = {
 
             eventResultList.push(finalIfData?.data)
             callback(finalIfData);
+
+            if (isMatched && _.isArray(finalChildren) && !_.isEmpty(finalChildren)) {
+                const { iterationData } = option, iterationDataArr = [iterationData];
+
+                // if (!_.isEmpty(iterationData) && _.isObject(iterationData)) {
+                //     iterationDataArr = _.flatMap([iterationData], (element) => _.times(_.size(finalChildren), () => element));
+                // }
+                await iterationEvent(finalChildren, _.assign(_.cloneDeep(option), { iterationDataArr }), callback, eventRuntimeData, eventResultList)
+            }
+
         } catch (e) {
             throw ({
                 action: 'systemError',

package/libs/utils.js

@@ -292,7 +292,7 @@ const returnBoolean = (exp, compare, value) => {
 const getCaseInsensitive = (object, keyToFind) => {
     try {
         // 先将要查找的键转换成小写
-        const lowerKey = keyToFind.toLowerCase();
+        const lowerKey = _.toLower(keyToFind);
 
         if (!_.isObject(object)) {
             return undefined;
@@ -300,7 +300,7 @@ const getCaseInsensitive = (object, keyToFind) => {
 
         // 在对象的所有键中查找
         for (const key in object) {
-            if (key.toLowerCase() === lowerKey) {
+            if (_.toLower(key) === lowerKey) {
                 return object[key];
             }
         }
@@ -430,19 +430,19 @@ const formatAutotestReport = (startTimeAt, eventResultList) => {
             totalResponseSize = totalResponseSize + _.toInteger(item?.response?.response_size);
             totalResponseTime = totalResponseTime + _.toInteger(item?.response?.response_time);
 
-            if (!_.isEmpty(item?.status?.assert) && _.isArray(item?.status?.assert)) {
-                const assertFailure = _.map(item?.status?.assert, (assertItem) => {
-                    return assertItem?.passed === false
-                })
-
-                report.assert.total = report.assert.total + _.size(item?.status?.assert);
-                report.assert.error = report.assert.error + _.size(assertFailure);
-            }
-
             if (_.toLower(item?.status?.http) != 'ok') {
                 report.http.error++;
             }
         }
+
+        if (_.includes(['api', 'sample', 'assert', 'assert_visual'], item?.type) && !_.isEmpty(item?.status?.assert) && _.isArray(item?.status?.assert)) {
+            const assertFailure = _.map(item?.status?.assert, (assertItem) => {
+                return assertItem?.passed === false
+            })
+
+            report.assert.total = report.assert.total + _.size(item?.status?.assert);
+            report.assert.error = report.assert.error + _.size(assertFailure);
+        }
     })
 
     report.http.success = report.http.total - report.http.error;
@@ -532,7 +532,7 @@ const convertEndRuntimeState = (eventRuntimeData, event_id) => {
             }
             _.set(startAllActedUponVars, [key, 'actedUpon'], startActedUpon);
         })
-        
+
         // 当前变量
         const { environment = {}, variables = {}, _globals = {}, iterationData = {} } = _.get(eventRuntimeData, 'variables', {});
         const endVariables = { environment, variables, iterationData, globals: _globals };

package/package.json

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