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

fix(接口测试): 修复引用的场景执行的时候未执行的缺陷 

--bug=1019923 --user=王孝刚 【接口测试】场景引用带控制器的场景，控制器里的步骤没执行，并且再次打开场景后，控制器是禁用的
{#_orginal_url#}
This commit is contained in:
wxg0103 2022-12-06 10:49:59 +08:00 committed by wxg0103
parent 3c6d3aca5d
commit c9708dec81
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -230,7 +230,7 @@ public class MsScenario extends MsTestElement {
orgJSONArray.forEach(obj -> { orgJSONArray.forEach(obj -> {
JSONObject orgJsonObject = (JSONObject) obj; JSONObject orgJsonObject = (JSONObject) obj;
hashTree.forEach(targetObj -> { hashTree.forEach(targetObj -> {
if (StringUtils.equals(orgJsonObject.optString(MsHashTreeService.ID), targetObj.getId())) { if (StringUtils.equals(orgJsonObject.optString(MsHashTreeService.RESOURCE_ID), targetObj.getResourceId())) {
setRefEnable(targetObj, orgJsonObject); setRefEnable(targetObj, orgJsonObject);
} }
}); });

2
api-test/frontend/src/business/automation/scenario/component/LoopController.vue
View File

@ -328,7 +328,7 @@ export default {
debugCode(data) { debugCode(data) {
if (data && this.node && this.node.data) { if (data && this.node && this.node.data) {
if (data.error > 0) { if (data.error > 0) {
this.node.data.code = 'error'; this.node.data.code = 'Error';
} else { } else {
this.node.data.code = this.node.data.code !== 'ERROR' ? 'Success' : 'Error'; this.node.data.code = this.node.data.code !== 'ERROR' ? 'Success' : 'Error';
} }

4
api-test/frontend/src/business/automation/scenario/component/TransactionController.vue
View File

@ -133,9 +133,9 @@ export default {
getCode() { getCode() {
if (this.node && this.node.data.code && this.node.data.debug) { if (this.node && this.node.data.code && this.node.data.debug) {
if (this.node.data.code && this.node.data.code === 'ERROR') { if (this.node.data.code && this.node.data.code === 'ERROR') {
return 'error'; return 'Error';
} else { } else {
return 'success'; return 'Success';
} }
} }
return ''; return '';