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

fix(接口测试): 修复全部匹配文案错误的缺陷 

--bug=1038824 --user=王孝刚 【场景】-后置参数提取，jsonpath快捷提取界面，结果匹配规则，全部匹配的提示信息有误
https://www.tapd.cn/55049933/s/1491327
This commit is contained in:
wxg0103 2024-04-09 11:26:16 +08:00 committed by 刘瑞斌
parent 0501d1b9df
commit af6689835f
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/MsLoopControllerConverter.java
View File

@ -109,9 +109,6 @@ public class MsLoopControllerConverter extends AbstractJmeterElementConverter<Ms
loopController.setProperty(TestElement.TEST_CLASS, LoopController.class.getName()); loopController.setProperty(TestElement.TEST_CLASS, LoopController.class.getName());
loopController.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("LoopControlPanel")); loopController.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("LoopControlPanel"));
loopController.setLoops(element.getMsCountController().getLoops()); loopController.setLoops(element.getMsCountController().getLoops());
if (StringUtils.isNotEmpty(element.getMsCountController().getLoops())) {
loopController.setContinueForever(true);
}
return loopController; return loopController;
} }

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

@ -172,7 +172,7 @@ public class ApiScenarioLogService {
apiScenario.getId(), apiScenario.getId(),
null, null,
OperationLogType.DELETE.name(), OperationLogType.DELETE.name(),
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO, OperationLogModule.API_TEST_SCENARIO_RECYCLE,
apiScenario.getName()); apiScenario.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiScenario)); dto.setOriginalValue(JSON.toJSONBytes(apiScenario));
return dto; return dto;
@ -186,7 +186,7 @@ public class ApiScenarioLogService {
apiScenario.getId(), apiScenario.getId(),
null, null,
OperationLogType.DELETE.name(), OperationLogType.DELETE.name(),
OperationLogModule.API_TEST_SCENARIO_RECYCLE, OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
apiScenario.getName()); apiScenario.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiScenario)); dto.setOriginalValue(JSON.toJSONBytes(apiScenario));
return dto; return dto;

2
frontend/src/views/api-test/debug/locale/en-US.ts
View File

@ -158,7 +158,7 @@ export default {
'apiTestDebug.specifyMatchTip': 'apiTestDebug.specifyMatchTip':
'The Nth matching result needs to be specified. If it exceeds the specified number, it will return empty.', 'The Nth matching result needs to be specified. If it exceeds the specified number, it will return empty.',
'apiTestDebug.allMatch': 'Match all', 'apiTestDebug.allMatch': 'Match all',
'apiTestDebug.allMatchTip': 'The regular return is an array of matching results.', 'apiTestDebug.allMatchTip': 'The return is an array of matching results.',
'apiTestDebug.contentType': 'Response content format', 'apiTestDebug.contentType': 'Response content format',
'apiTestDebug.responseTime': 'Response time', 'apiTestDebug.responseTime': 'Response time',
'apiTestDebug.responseStage': 'Stage', 'apiTestDebug.responseStage': 'Stage',

2
frontend/src/views/api-test/debug/locale/zh-CN.ts
View File

@ -147,7 +147,7 @@ export default {
'apiTestDebug.unit': '条', 'apiTestDebug.unit': '条',
'apiTestDebug.specifyMatchTip': '需要指定匹配的第N条结果，如果超出指定则返回为空', 'apiTestDebug.specifyMatchTip': '需要指定匹配的第N条结果，如果超出指定则返回为空',
'apiTestDebug.allMatch': '全部匹配', 'apiTestDebug.allMatch': '全部匹配',
'apiTestDebug.allMatchTip': '正则返回的是一个匹配结果数组', 'apiTestDebug.allMatchTip': '返回的是一个匹配结果数组',
'apiTestDebug.contentType': '响应内容格式', 'apiTestDebug.contentType': '响应内容格式',
'apiTestDebug.responseTime': '响应时间', 'apiTestDebug.responseTime': '响应时间',
'apiTestDebug.responseStage': '阶段', 'apiTestDebug.responseStage': '阶段',