runner-runtime 1.0.41 → 1.0.43

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.
Files changed (5) hide show
  1. package/events/api.js +21 -17
  2. package/events/index.js +4 -0
  3. package/package.json +1 -1
  4. package/test.js +1 -1
  5. package/tmp/request.js +7 -20
package/events/api.js CHANGED
@@ -2291,29 +2291,33 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
2291
2291
  })
2292
2292
 
2293
2293
  _.set(eventRuntimeData, [event?.event_id, "status"], {
2294
- assert: _.get(eventRuntimeData, [event?.event_id, "assertions"]),
2294
+ assert: _.get(eventRuntimeData, [event?.event_id, "assertions"], []),
2295
2295
  success_assert,
2296
2296
  http: _.get(eventRuntimeData, [event?.event_id, 'response', 'status']) || _.get(eventRuntimeData, [event?.event_id, 'error', 'message'])
2297
2297
  });
2298
2298
  }
2299
2299
 
2300
- // 写入到自动化测试结果
2300
+ // 返回结果
2301
2301
  const tempVars = _.pick(_.get(eventRuntimeData, 'variables'), ['environment', '_globals']);
2302
- const finalRequestResult = _.assign({
2303
- action: 'request',
2304
- data: _.assign(
2305
- {
2306
- variables: {
2307
- global: _.get(tempVars, '_globals', {}),
2308
- environment: _.get(tempVars, 'environment', {})
2309
- }
2310
- },
2311
- camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id))),
2312
- error: _.get(eventRuntimeData, [event?.event_id, 'error']) || null,
2313
- event_id: event?.event_id,
2314
- iteration_id: _.get(eventRuntimeData, [event?.event_id, 'iteration_id'])
2315
- }, _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id']));
2316
-
2302
+ const toLowerResponseJson = camelCaseToSnakeCase(_.get(eventRuntimeData, event?.event_id));
2303
+ const finalRequestResult = _.assign(
2304
+ {
2305
+ action: 'request',
2306
+ type: 'request',
2307
+ data: _.assign(
2308
+ {
2309
+ variables: {
2310
+ global: _.get(tempVars, '_globals', {}),
2311
+ environment: _.get(tempVars, 'environment', {})
2312
+ }
2313
+ },
2314
+ toLowerResponseJson
2315
+ ),
2316
+ event_id: event?.event_id,
2317
+ },
2318
+ _.pick(toLowerResponseJson, ['error', 'iteration_id']),
2319
+ _.pick(requestJson, ['parent_id', 'project_id', 'test_id', 'target_id'])
2320
+ );
2317
2321
 
2318
2322
  if (scene === 'auto_test') {
2319
2323
  if (_.includes(['assert', 'assert_visual', 'api', 'sample', 'script'], event?.type)) {
package/events/index.js CHANGED
@@ -231,6 +231,10 @@ const events = {
231
231
  // 调度器核心函数，用于递归执行具体场景步骤
232
232
  const executeEvent = (event, option, callback, eventRuntimeData, eventResultList) => {
233
233
  return new Promise((resolve, reject) => {
234
+ if (_.isUndefined(event.event_id) && option?.scene === 'http_request') {
235
+ _.set(event, 'event_id', _.get(event, 'data.target_id'))
236
+ }
237
+ // console.log(option?.scene)
234
238
  _.assign(eventRuntimeData?.variables?.iterationData, _.get(option, 'iterationData'))
235
239
  _.set(eventRuntimeData, [event.event_id, 'iteration_id'], aTools.snowflakeId());
236
240
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "runner-runtime",
3
- "version": "1.0.41",
3
+ "version": "1.0.43",
4
4
  "description": "runner-runtime.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/test.js CHANGED
@@ -121,4 +121,4 @@ const callback = (res) => {
121
121
  })();
122
122
  //pip end
123
123
  const { option, test_events } = require('./tmp/request'); // tmp todo...
124
- request2HAR(test_events, option, callback);
124
+ run(test_events, option, callback);
package/tmp/request.js CHANGED
@@ -117,21 +117,19 @@ module.exports ={
117
117
  },
118
118
  "env": {
119
119
  "env_id": "1",
120
- "env_name": "默认环境",
120
+ "env_name": "本地环境",
121
121
  "env_pre_url": "",
122
122
  "env_pre_urls": {
123
123
  "1": {
124
- "sort": 200,
125
- "name": "默认服务",
126
124
  "server_id": "1",
127
- "server_type": 1,
125
+ "name": "默认服务",
126
+ "sort": 1000,
128
127
  "uri": ""
129
128
  },
130
129
  "default": {
131
- "sort": 200,
132
- "name": "默认服务",
133
130
  "server_id": "1",
134
- "server_type": 1,
131
+ "name": "默认服务",
132
+ "sort": 1000,
135
133
  "uri": ""
136
134
  }
137
135
  },
@@ -187,18 +185,7 @@ module.exports ={
187
185
  "parameter": []
188
186
  },
189
187
  "restful": {
190
- "parameter": [
191
- {
192
- "param_id": "34b7e24e39617d",
193
- "key": "codes",
194
- "value": "301",
195
- "field_type": "String",
196
- "not_null": 1,
197
- "description": "",
198
- "is_checked": 1,
199
- "content_type": "String"
200
- }
201
- ]
188
+ "parameter": []
202
189
  },
203
190
  "cookie": {
204
191
  "cookie_encode": 1,
@@ -225,7 +212,7 @@ module.exports ={
225
212
  ],
226
213
  "method": "POST",
227
214
  "protocol": "http/1.1",
228
- "url": "https:/httpbin.org/status/{codes}",
215
+ "url": "",
229
216
  "pre_url": ""
230
217
  },
231
218
  {