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

fix(接口自动化): 修复接口测试-场景，引用接口用例数据会消失问题

This commit is contained in:
fit2-zhao 2021-07-01 11:33:29 +08:00 committed by fit2-zhao
parent c98fdc68b8
commit 7414d2bbe6
3 changed files with 117 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/track/service/utils/ParallelExecTask.java
View File

@ -30,6 +30,7 @@ public class ParallelExecTask<T> implements Callable<T> {
TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase();
testPlanLoadCase.setId(request.getTestPlanLoadId());
testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCase.setStatus("run");
testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase);
return (T) reportId;

1
backend/src/main/java/io/metersphere/track/service/utils/SerialExecTask.java
View File

@ -38,6 +38,7 @@ public class SerialExecTask<T> implements Callable<T> {
TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase();
testPlanLoadCase.setId(request.getTestPlanLoadId());
testPlanLoadCase.setLoadReportId(reportId);
testPlanLoadCase.setStatus("run");
testPlanLoadCaseMapper.updateByPrimaryKeySelective(testPlanLoadCase);
LoadTestReportWithBLOBs report = null;
// 轮询查看报告状态，最多200次，防止死循环

38
frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
View File

@ -23,13 +23,13 @@
label="ID"
width="80px"
sortable=true>
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; 判断为只读用户的话不可点击ID进行编辑操作 &ndash;&gt;-->
<!-- <span style="cursor:pointer" v-if="isReadOnly"> {{ scope.row.num }} </span>-->
<!-- <el-tooltip v-else content="编辑">-->
<!-- <a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; 判断为只读用户的话不可点击ID进行编辑操作 &ndash;&gt;-->
<!-- <span style="cursor:pointer" v-if="isReadOnly"> {{ scope.row.num }} </span>-->
<!-- <el-tooltip v-else content="编辑">-->
<!-- <a style="cursor:pointer" @click="editApi(scope.row)"> {{ scope.row.num }} </a>-->
<!-- </el-tooltip>-->
<!-- </template>-->
</ms-table-column>
<ms-table-column prop="name" width="160px" :label="$t('test_track.case.name')"/>
@ -216,6 +216,8 @@ export default {
if (this.isTestPlan) {
url = '/test/plan/api/case/relevance/list/';
this.condition.planId = this.planId;
} else {
this.condition.ids = [];
}
this.result = this.$post(url + this.currentPage + "/" + this.pageSize, this.condition, response => {
@ -288,39 +290,39 @@ export default {
let sampleSelectRows = this.$refs.table.getSelectRows();
let batchParam = buildBatchParam(this);
let param = {};
if(batchParam.condition){
if (batchParam.condition) {
param = batchParam.condition;
param.projectId = batchParam.projectId;
}else{
} else {
param = batchParam;
}
param.ids = Array.from(sampleSelectRows).map(row => row.id);
return param;
}
},
}
}
</script>
<style scoped>
.operate-button > div {
.operate-button > div {
display: inline-block;
margin-left: 10px;
}
}
.request-method {
.request-method {
padding: 0 5px;
color: #1E90FF;
}
}
.api-el-tag {
.api-el-tag {
color: white;
}
}
.search-input {
.search-input {
float: right;
width: 300px;
/*margin-bottom: 20px;*/
margin-right: 20px;
}
}
</style>