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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
song.tianyang 2021-01-27 18:10:28 +08:00
parent 8e2bd2224e a9f918716a
commit f2b64c9a20
6 changed files with 191 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
View File

@ -158,7 +158,8 @@ public class MsHTTPSamplerProxy extends MsTestElement {
if (!path.startsWith("/")) {
path = "/" + path;
}
path = sampler.getProtocol() + "://" + sampler.getDomain() + ":" + sampler.getPort() + path;
String port = sampler.getPort() != 80 ? ":" + sampler.getPort() : "";
path = sampler.getProtocol() + "://" + sampler.getDomain() + port + path;
}
sampler.setPath(path);
}

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit a641c1331e1813b5294a1d0e380b8682a78754e1
Subproject commit 26d36f3f81e889f58eed7c6903252a129b301d98

4
frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
View File

@ -23,7 +23,7 @@
</div>
</el-row>
<el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px">
<el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px" append-to-body>
<el-row type="flex" justify="space-between" align="middle" class="quick-script-block">
<div class="assertion-item input">
<el-input size="small" v-model="assertion.variable"
@ -57,7 +57,7 @@
<script>
import {AssertionJSR223} from "../../model/ApiTestModel";
import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
import MsJsr233Processor from "../../../automation/scenario/common/Jsr233ProcessorContent";
export default {
name: "MsApiAssertionJsr223",

7
frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue
View File

@ -3,13 +3,13 @@
<el-dialog
:title="$t('api_test.environment.select_environment')"
:visible.sync="dialogVisible"
width="25%"
width="20%"
:destroy-on-close="true"
@close="handleClose"
>
<el-form label-position="right" label-width="150px" size="medium" ref="form">
<el-form ref="form">
<el-form-item prop="type">
<el-select v-model="environmentId" value-key="id" size="small" class="ms-htt-width"
<el-select v-model="environmentId" value-key="id" class="ms-htt-width"
:placeholder="$t('api_test.definition.request.run_env')"
clearable>
<el-option v-for="(environment, index) in environments" :key="index"
@ -22,6 +22,7 @@
</el-select>
</el-form-item>
</el-form>
<template v-slot:footer>
<!-- <el-button onclick="this.handleClose">{{ $t('commons.cancel') }}</el-button>-->
<el-button type="primary" @click="createPerformance" @keydown.enter.native.prevent>

2
frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
View File

@ -213,7 +213,7 @@
},
copyCase(data) {
let uuid = getUUID();
let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request, uuid: uuid};
let obj = {name: "copy_" + data.name, priority: data.priority, active: true, tags: data.tags, request: data.request, uuid: uuid};
this.$emit('copyCase', obj);
},
selectTestCase(item, $event) {

1
frontend/src/business/components/api/definition/components/module/ApiModule.vue
View File

@ -197,7 +197,6 @@
},
refresh() {
this.list();
this.$emit("refreshTable");
},
}
}