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:
fit2-zhao 2021-04-20 19:05:45 +08:00 committed by fit2-zhao
parent b6b649b679
commit 195fd95687
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -404,7 +404,7 @@ public class ApiAutomationService {
env.setFullUrl(false); env.setFullUrl(false);
} }
} }
} else if (StringUtils.equals(tr.getType(), "TCPSampler")) { } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
if (StringUtils.equals(tr.getRefType(), "CASE")) { if (StringUtils.equals(tr.getRefType(), "CASE")) {
ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId()); ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId()); env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());

2
frontend/src/business/components/api/automation/scenario/ApiScenarioEnv.vue
View File

@ -41,7 +41,7 @@
<script> <script>
import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel"; import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
export default { export default {
name: "ApiScenarioEnv", name: "ApiScenarioEnv",

2
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -239,7 +239,7 @@
import {ELEMENT_TYPE, ELEMENTS} from "./Setting"; import {ELEMENT_TYPE, ELEMENTS} from "./Setting";
import MsApiCustomize from "./ApiCustomize"; import MsApiCustomize from "./ApiCustomize";
import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils"; import {getUUID, objToStrMap, strMapToObj, handleCtrlSEvent} from "@/common/js/utils";
import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
import MsInputTag from "./MsInputTag"; import MsInputTag from "./MsInputTag";
import MsRun from "./DebugRun"; import MsRun from "./DebugRun";
import MsApiReportDetail from "../report/ApiReportDetail"; import MsApiReportDetail from "../report/ApiReportDetail";

3
frontend/src/business/components/api/automation/scenario/EnvSelect.vue
View File

@ -32,8 +32,7 @@
<script> <script>
import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel"; import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
import {ELEMENTS} from "./Setting";
export default { export default {
name: "EnvironmentSelect", name: "EnvironmentSelect",

2
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -144,7 +144,7 @@
import {ELEMENT_TYPE, ELEMENTS} from "../Setting"; import {ELEMENT_TYPE, ELEMENTS} from "../Setting";
import MsApiCustomize from "../ApiCustomize"; import MsApiCustomize from "../ApiCustomize";
import {getUUID, strMapToObj} from "@/common/js/utils"; import {getUUID, strMapToObj} from "@/common/js/utils";
import ApiEnvironmentConfig from "../../../definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
import MsInputTag from "../MsInputTag"; import MsInputTag from "../MsInputTag";
import MsRun from "../DebugRun"; import MsRun from "../DebugRun";
import MsApiReportDetail from "../../report/ApiReportDetail"; import MsApiReportDetail from "../../report/ApiReportDetail";

2
frontend/src/business/components/api/definition/components/environment/EnvironmentSelect.vue
View File

@ -25,7 +25,7 @@
<script> <script>
import {parseEnvironment} from "../../model/EnvironmentModel"; import {parseEnvironment} from "../../model/EnvironmentModel";
import ApiEnvironmentConfig from "../../../definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
export default { export default {
name: "EnvironmentSelect", name: "EnvironmentSelect",

6
frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
View File

@ -146,7 +146,11 @@
} }
}, },
created() { created() {
this.getEnvironments(); if(this.isScenario){
this.initDataSource();
}else{
this.getEnvironments();
}
}, },
computed: { computed: {
projectId() { projectId() {

2
frontend/src/business/components/track/common/EnvSelect.vue
View File

@ -30,7 +30,7 @@
<script> <script>
import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel"; import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig"; import ApiEnvironmentConfig from "@/business/components/api/test/components/ApiEnvironmentConfig";
export default { export default {
name: "EnvironmentSelect", name: "EnvironmentSelect",