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

fix(接口测试): 修复mock服务不支持接受get请求内body参数的问题 

--bug=1024452 --user=宋天阳
[接口测试]github#22682在MOCK里设置mock请求参数和请求内容，点击执行，输入mock参数进行发送，响应的不是设置好的mock请求，而是该接口的响应内容
https://www.tapd.cn/55049933/s/1350225
This commit is contained in:
song-tianyang 2023-03-15 10:13:57 +08:00 committed by 建国
parent e486b518ef
commit 5eb6d4af04
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api-test/backend/src/main/java/io/metersphere/api/dto/mock/RequestMockParams.java
View File

@ -3,6 +3,7 @@ package io.metersphere.api.dto.mock;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
/**
@ -29,12 +30,21 @@ public class RequestMockParams {
public boolean isEmpty() {
boolean isJsonParamEmpty = false;
if (jsonParam instanceof JSONObject) {
isJsonParamEmpty = ((JSONObject) jsonParam).isEmpty();
} else if (jsonParam instanceof JSONArray) {
isJsonParamEmpty = ((JSONArray) jsonParam).isEmpty();
} else {
isJsonParamEmpty = jsonParam == null;
}
if (isPost) {
return (restParamsObj == null || restParamsObj.isEmpty()) &&
isJsonParamEmpty &&
(queryParamsObj == null || queryParamsObj.isEmpty())
&& StringUtils.isBlank(raw);
} else {
return (restParamsObj == null || restParamsObj.isEmpty()) &&
return (restParamsObj == null || restParamsObj.isEmpty()) && isJsonParamEmpty &&
(queryParamsObj == null || queryParamsObj.isEmpty());
}

33
test-track/frontend/src/business/plan/view/comonents/report/detail/ui/RequestResult.vue
View File

@ -45,13 +45,20 @@
:open-delay="800"
>
<div
v-if="totalStatus === 'Success' || totalStatus === 'success'"
v-if="
totalStatus === 'Success' ||
totalStatus === 'SUCCESS' ||
totalStatus === 'success'
"
style="color: #5daf34"
>
{{ baseErrorCode }}
</div>
<div
v-else-if="totalStatus === 'errorReportResult'"
v-else-if="
totalStatus === 'errorReportResult' ||
totalStatus === 'FAKE_ERROR'
"
style="color: #f6972a"
>
{{ baseErrorCode }}
@ -97,13 +104,20 @@
:open-delay="800"
>
<div
v-if="totalStatus === 'Success' || totalStatus === 'success'"
v-if="
totalStatus === 'Success' ||
totalStatus === 'SUCCESS' ||
totalStatus === 'success'
"
style="color: #5daf34"
>
{{ request.responseResult.responseCode }}
</div>
<div
v-else-if="totalStatus === 'errorReportResult'"
v-else-if="
totalStatus === 'errorReportResult' ||
totalStatus === 'FAKE_ERROR'
"
style="color: #f6972a"
>
{{ request.responseResult.responseCode }}
@ -145,13 +159,20 @@
<el-col :span="3">
<div v-if="totalStatus">
<div
v-if="totalStatus === 'Success' || totalStatus === 'success'"
v-if="
totalStatus === 'Success' ||
totalStatus === 'SUCCESS' ||
totalStatus === 'success'
"
style="color: #5daf34"
>
{{ request.responseResult.responseTime }}
</div>
<div
v-else-if="totalStatus === 'errorReportResult'"
v-else-if="
totalStatus === 'errorReportResult' ||
totalStatus === 'FAKE_ERROR'
"
style="color: #f6972a"
>
{{ request.responseResult.responseTime }}