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

fix (测试计划): 计划场景串行按照顺序执行 

--bug=1008129 --user=赵勇 【测试计划】批量执行场景用例，没有按列表顺序执行 https://www.tapd.cn/55049933/s/1072114
This commit is contained in:
fit2-zhao 2021-11-22 17:56:00 +08:00 committed by fit2-zhao
parent 321e1462e1
commit 933f53505f
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -582,8 +582,10 @@ public class ApiDefinitionService {
} else {
test.setTags("");
}
apiDefinitionMapper.insert(test);
saveFollows(test.getId(), request.getFollows());
if (apiDefinitionMapper.selectByPrimaryKey(test.getId()) == null) {
apiDefinitionMapper.insert(test);
saveFollows(test.getId(), request.getFollows());
}
return test;
}

8
backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
View File

@ -188,18 +188,18 @@ public class TestPlanScenarioCaseService {
});
List<TestPlanApiScenario> testPlanApiScenarioList = extTestPlanScenarioCaseMapper.selectByIds(idStr.toString().substring(0, idStr.toString().length() - 1), "\"" + org.apache.commons.lang3.StringUtils.join(testPlanScenarioRequest.getPlanCaseIds(), ",") + "\"");
List<String> scenarioIds = new ArrayList<>();
Map<String, String> scenarioIdApiScarionMap = new HashMap<>();
Map<String, String> scenarioPlanIdMap = new LinkedHashMap<>();
for (TestPlanApiScenario apiScenario : testPlanApiScenarioList) {
scenarioIds.add(apiScenario.getApiScenarioId());
scenarioIdApiScarionMap.put(apiScenario.getId(), apiScenario.getApiScenarioId());
scenarioPlanIdMap.put(apiScenario.getId(), apiScenario.getApiScenarioId());
}
if (scenarioIdApiScarionMap.isEmpty()) {
if (scenarioPlanIdMap.isEmpty()) {
MSException.throwException("未找到执行场景！");
}
RunScenarioRequest request = new RunScenarioRequest();
request.setIds(scenarioIds);
request.setReportId(testPlanScenarioRequest.getId());
request.setScenarioTestPlanIdMap(scenarioIdApiScarionMap);
request.setScenarioTestPlanIdMap(scenarioPlanIdMap);
request.setRunMode(ApiRunMode.SCENARIO_PLAN.name());
request.setId(testPlanScenarioRequest.getId());
request.setExecuteType(ExecuteType.Saved.name());

44
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
View File

@ -50,10 +50,10 @@
</el-col>
<el-col :span="16">
<div class="tag-item" @click.stop>
<el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
<el-tooltip :content="$t('commons.follow')" placement="bottom" effect="dark" v-if="!showFollow">
<i class="el-icon-star-off" style="color: #783987; font-size: 25px; margin-top: 2px; margin-right: 15px;cursor: pointer " @click="saveFollow"/>
</el-tooltip>
<el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
<el-tooltip :content="$t('commons.cancel')" placement="bottom" effect="dark" v-if="showFollow">
<i class="el-icon-star-on" style="color: #783987; font-size: 28px; margin-top: 2px; margin-right: 15px;cursor: pointer " @click="saveFollow" v-if="showFollow"/>
</el-tooltip>
</div>
@ -128,6 +128,7 @@
<!-- 保存操作 -->
<el-button type="primary" size="small" style="margin: 20px; float: right" @click="saveTestCase(apiCase)"
v-if="type!=='detail'"
v-prevent-re-click
v-permission="['PROJECT_API_DEFINITION:READ+EDIT_CASE']">
{{ $t('commons.save') }}
</el-button>
@ -218,8 +219,9 @@ export default {
isShowInput: false,
methodColorMap: new Map(API_METHOD_COLOUR),
saveLoading: false,
showFollow:false,
showFollow: false,
beforeRequest: {},
compare: [],
}
},
props: {
@ -267,7 +269,7 @@ export default {
this.$get('/api/testcase/follow/' + this.apiCase.id, response => {
this.apiCase.follows = response.data;
for (let i = 0; i < response.data.length; i++) {
if(response.data[i]===this.currentUser().id){
if (response.data[i] === this.currentUser().id) {
this.showFollow = true;
break;
}
@ -449,6 +451,7 @@ export default {
row.id = data.id;
row.createTime = data.createTime;
row.updateTime = data.updateTime;
this.compare = [];
if (!row.message) {
this.$success(this.$t('commons.save_success'));
this.reload();
@ -463,11 +466,14 @@ export default {
});
},
saveTestCase(row, hideAlert) {
if (this.api.saved) {
this.addModule(row);
} else {
this.api.source = "editCase";
this.saveCase(row, hideAlert);
if (this.compare.indexOf(row.id) === -1) {
this.compare.push(row.id);
if (this.api.saved) {
this.addModule(row);
} else {
this.api.source = "editCase";
this.saveCase(row, hideAlert);
}
}
},
showInput(row) {
@ -508,28 +514,28 @@ export default {
showHistory(id) {
this.$emit("showHistory", id);
},
saveFollow(){
if(this.showFollow){
saveFollow() {
if (this.showFollow) {
this.showFollow = false;
for (let i = 0; i < this.apiCase.follows.length; i++) {
if(this.apiCase.follows[i]===this.currentUser().id){
this.apiCase.follows.splice(i,1)
if (this.apiCase.follows[i] === this.currentUser().id) {
this.apiCase.follows.splice(i, 1)
break;
}
}
if( this.apiCase.id){
this.$post("/api/testcase/update/follows/"+this.apiCase.id, this.apiCase.follows,() => {
if (this.apiCase.id) {
this.$post("/api/testcase/update/follows/" + this.apiCase.id, this.apiCase.follows, () => {
this.$success(this.$t('commons.cancel_follow_success'));
});
}
}else {
} else {
this.showFollow = true;
if(!this.apiCase.follows){
if (!this.apiCase.follows) {
this.apiCase.follows = [];
}
this.apiCase.follows.push(this.currentUser().id)
if( this.apiCase.id){
this.$post("/api/testcase/update/follows/"+this.apiCase.id, this.apiCase.follows,() => {
if (this.apiCase.id) {
this.$post("/api/testcase/update/follows/" + this.apiCase.id, this.apiCase.follows, () => {
this.$success(this.$t('commons.follow_success'));
});
}