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:
AgAngle 2024-04-07 10:15:58 +08:00 committed by 刘瑞斌
parent 9e1ebd5e2c
commit 84904194f6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
View File

@ -1214,6 +1214,7 @@ public class ApiScenarioService extends MoveNodeService {
example.createCriteria() example.createCriteria()
.andNameEqualTo(apiScenario.getName()) .andNameEqualTo(apiScenario.getName())
.andModuleIdEqualTo(apiScenario.getModuleId()) .andModuleIdEqualTo(apiScenario.getModuleId())
.andDeletedEqualTo(false)
.andProjectIdEqualTo(apiScenario.getProjectId()); .andProjectIdEqualTo(apiScenario.getProjectId());
if (apiScenarioMapper.countByExample(example) > 0) { if (apiScenarioMapper.countByExample(example) > 0) {
throw new MSException(API_SCENARIO_EXIST); throw new MSException(API_SCENARIO_EXIST);
@ -1230,6 +1231,7 @@ public class ApiScenarioService extends MoveNodeService {
.andIdNotEqualTo(request.getId()) .andIdNotEqualTo(request.getId())
.andModuleIdEqualTo(request.getModuleId()) .andModuleIdEqualTo(request.getModuleId())
.andNameEqualTo(request.getName()) .andNameEqualTo(request.getName())
.andDeletedEqualTo(false)
.andProjectIdEqualTo(request.getProjectId()); .andProjectIdEqualTo(request.getProjectId());
if (apiScenarioMapper.countByExample(example) > 0) { if (apiScenarioMapper.countByExample(example) > 0) {
throw new MSException(API_SCENARIO_EXIST); throw new MSException(API_SCENARIO_EXIST);
@ -1310,6 +1312,9 @@ public class ApiScenarioService extends MoveNodeService {
msScenario.setScenarioConfig(getScenarioConfig(request, true)); msScenario.setScenarioConfig(getScenarioConfig(request, true));
msScenario.setProjectId(request.getProjectId()); msScenario.setProjectId(request.getProjectId());
// 处理特殊的步骤详情
addSpecialStepDetails(request.getSteps(), request.getStepDetails());
return executeRun(apiScenario, msScenario, request.getSteps(), request, request.getReportId(), userId); return executeRun(apiScenario, msScenario, request.getSteps(), request, request.getReportId(), userId);
} }