test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(接口测试): 修复多层事物控制器执行结果显示问题 

--bug=1014984 --user=赵勇 [接口测试]github#15873]事务控制器下添加事务控制器，场景调试内层事务控制器下步骤调试一直测试中，测试报告显示未执行 https://www.tapd.cn/55049933/s/1207610
This commit is contained in:
fit2-zhao 2022-07-22 17:03:21 +08:00 committed by f2c-ci-robot[bot]
parent f045a061c4
commit fe1f78918d
2 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/business/components/api/automation/report/SysnApiReportDetail.vue
View File

@ -184,6 +184,18 @@ export default {
} }
return type; return type;
}, },
margeTransaction(item, arr) {
arr.forEach(subItem => {
if (item.resId === subItem.resourceId) {
item.value = subItem;
item.testing = false;
item.debug = true;
}
if (subItem.subRequestResults && subItem.subRequestResults.length > 0) {
this.margeTransaction(item, subItem.subRequestResults);
}
})
},
formatContent(hashTree, tree, fullPath, pid) { formatContent(hashTree, tree, fullPath, pid) {
if (hashTree) { if (hashTree) {
hashTree.forEach(item => { hashTree.forEach(item => {
@ -408,13 +420,7 @@ export default {
} else if (resourceId && resourceId.startsWith("result_")) { } else if (resourceId && resourceId.startsWith("result_")) {
let data = JSON.parse(resourceId.substring(7)); let data = JSON.parse(resourceId.substring(7));
if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) { if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
data.subRequestResults.forEach(subItem => { this.margeTransaction(item, data.subRequestResults);
if (item.resId === subItem.resourceId) {
item.value = subItem;
item.testing = false;
item.debug = true;
}
})
} else if (item.resId === data.resourceId) { } else if (item.resId === data.resourceId) {
if (item.value && item.value.id && !item.mark) { if (item.value && item.value.id && !item.mark) {
let newItem = JSON.parse(JSON.stringify(item)); let newItem = JSON.parse(JSON.stringify(item));

36
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -932,21 +932,27 @@ export default {
this.runningEditParent(node.parent); this.runningEditParent(node.parent);
} }
}, },
margeTransaction(item, console, arr) {
arr.forEach(sub => {
if (item.data && item.data.id + "_" + item.data.parentIndex === sub.resourceId) {
sub.responseResult.console = console;
item.data.requestResult.push(sub);
// 更新父节点状态
this.resultEvaluation(sub.resourceId, sub.success);
item.data.testing = false;
item.data.debug = true;
}
if (sub.subRequestResults && sub.subRequestResults.length > 0) {
this.margeTransaction(item, console, sub.subRequestResults);
}
})
},
runningNodeChild(arr, resultData) { runningNodeChild(arr, resultData) {
arr.forEach(item => { arr.forEach(item => {
if (resultData && resultData.startsWith("result_")) { if (resultData && resultData.startsWith("result_")) {
let data = JSON.parse(resultData.substring(7)); let data = JSON.parse(resultData.substring(7));
if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) { if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
data.subRequestResults.forEach(subItem => { this.margeTransaction(item, data.responseResult.console, data.subRequestResults);
if (item.data && item.data.id + "_" + item.data.parentIndex === subItem.resourceId) {
subItem.responseResult.console = data.responseResult.console;
item.data.requestResult.push(subItem);
// 更新父节点状态
this.resultEvaluation(subItem.resourceId, subItem.success);
item.data.testing = false;
item.data.debug = true;
}
})
} else if ((item.data && item.data.id + "_" + item.data.parentIndex === data.resourceId) } else if ((item.data && item.data.id + "_" + item.data.parentIndex === data.resourceId)
|| (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId)) { || (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId)) {
if (item.data.requestResult) { if (item.data.requestResult) {
@ -976,15 +982,7 @@ export default {
} else if (resultData && resultData.startsWith("result_")) { } else if (resultData && resultData.startsWith("result_")) {
let data = JSON.parse(resultData.substring(7)); let data = JSON.parse(resultData.substring(7));
if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) { if (data.method === 'Request' && data.subRequestResults && data.subRequestResults.length > 0) {
data.subRequestResults.forEach(subItem => { this.margeTransaction(item, data.responseResult.console, data.subRequestResults);
if (item.data && item.data.id + "_" + item.data.parentIndex === subItem.resourceId) {
item.data.requestResult.push(subItem);
// 更新父节点状态
this.resultEvaluation(subItem.resourceId, subItem.success);
item.data.testing = false;
item.data.debug = true;
}
})
} else if (item.data && item.data.id + "_" + item.data.parentIndex === data.resourceId } else if (item.data && item.data.id + "_" + item.data.parentIndex === data.resourceId
|| (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId)) { || (item.data && item.data.resourceId + "_" + item.data.parentIndex === data.resourceId)) {
item.data.requestResult.push(data); item.data.requestResult.push(data);