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

refactor(项目管理): 环境参数类型去掉对象

This commit is contained in:
wxg0103 2024-03-25 13:57:27 +08:00 committed by Craftsman
parent 1e71f6439d
commit d3ebbd9f8b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiReportService.java
View File

@ -238,7 +238,7 @@ public class ApiReportService {
apiReportDetailExample.createCriteria().andStepIdEqualTo(stepId).andReportIdEqualTo(reportId);
List<ApiReportDetail> apiReportDetails = apiReportDetailMapper.selectByExampleWithBLOBs(apiReportDetailExample);
if (CollectionUtils.isEmpty(apiReportDetails)) {
throw new MSException(Translator.get("api_case_report_not_exist"));
return new ArrayList<>();
}
return apiReportDetails;
}

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

@ -268,7 +268,7 @@ public class ApiScenarioReportService {
detailExample.createCriteria().andStepIdEqualTo(stepId).andReportIdEqualTo(reportId);
List<ApiScenarioReportDetail> apiReportDetails = apiScenarioReportDetailMapper.selectByExampleWithBLOBs(detailExample);
if (CollectionUtils.isEmpty(apiReportDetails)) {
throw new MSException(Translator.get("api_case_report_not_exist"));
return new ArrayList<>();
}
return apiReportDetails;
}

2
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiReportControllerTests.java
View File

@ -411,7 +411,7 @@ public class ApiReportControllerTests extends BaseTest {
mockMvc.perform(getRequestBuilder(DETAIL + "test" + "/test"))
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(status().is5xxServerError());
.andExpect(status().isOk());
mockMvc.perform(getRequestBuilder(DETAIL + "api-report-id10"))
.andExpect(content().contentType(MediaType.APPLICATION_JSON))

2
backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioReportControllerTests.java
View File

@ -373,7 +373,7 @@ public class ApiScenarioReportControllerTests extends BaseTest {
mockMvc.perform(getRequestBuilder(DETAIL + "test" + "/" + "test"))
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andExpect(status().is5xxServerError());
.andExpect(status().isOk());
mockMvc.perform(getRequestBuilder(DETAIL + "api-report-id10"))
.andExpect(content().contentType(MediaType.APPLICATION_JSON))

4
frontend/src/views/project-management/environmental/components/allParams/index.vue
View File

@ -101,10 +101,10 @@
label: t('common.list'),
value: 'LIST',
},
{
/* {
label: t('common.json'),
value: 'JSON',
},
}, */
],
titleSlotName: 'typeTitle',
typeTitleTooltip: t('project.environmental.paramTypeTooltip'),