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

Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2

This commit is contained in:
chenjianxing 2020-08-31 20:15:04 +08:00
parent 31d7fa36f3 708c3deb1a
commit 05979450fd
9 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/jmeter-master/run-test.sh
View File

@ -1,4 +1,3 @@
export HEAP=$(cat /proc/meminfo | grep MemTotal | awk '{ mem=int($2/1024/1024 * 3/4 + 0.5); metasize=int(mem/4+0.5)"g"; if(mem<1) mem=1; if (metasize == "0g") metasize="256m"; HEAP="-Xms"mem"g -Xmx"mem"g -XX:MaxMetaspaceSize="metasize; print HEAP }')
for file in ${TESTS_DIR}/*.jmx; do for file in ${TESTS_DIR}/*.jmx; do
jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED} jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED}
done done

2
frontend/src/business/components/api/report/ApiReportView.vue
View File

@ -171,7 +171,7 @@ export default {
<style scoped> <style scoped>
.report-container { .report-container {
height: calc(100vh - 150px); height: calc(100vh - 155px);
min-height: 600px; min-height: 600px;
overflow-y: auto; overflow-y: auto;
} }

2
frontend/src/business/components/api/test/ApiTestConfig.vue
View File

@ -344,7 +344,7 @@ export default {
<style scoped> <style scoped>
.test-container { .test-container {
height: calc(100vh - 150px); height: calc(100vh - 155px);
min-height: 600px; min-height: 600px;
} }

28
frontend/src/business/components/settings/organization/IssuesManagement.vue
View File

@ -161,18 +161,26 @@
this.$warning(this.$t('organization.integration.choose_platform')); this.$warning(this.$t('organization.integration.choose_platform'));
return; return;
} }
let param = {};
let auth = {
account: this.form.account,
password: this.form.password,
url: this.form.url,
issuetype: this.form.issuetype
};
param.organizationId = getCurrentUser().lastOrganizationId;
param.platform = this.platform;
param.configuration = JSON.stringify(auth);
this.$refs[form].validate(valid => { this.$refs[form].validate(valid => {
if (valid) { if (valid) {
let formatUrl = this.form.url;
if (!formatUrl.endsWith('/')) {
formatUrl = formatUrl + '/';
}
let param = {};
let auth = {
account: this.form.account,
password: this.form.password,
url: formatUrl,
issuetype: this.form.issuetype
};
param.organizationId = getCurrentUser().lastOrganizationId;
param.platform = this.platform;
param.configuration = JSON.stringify(auth);
this.result = this.$post("service/integration/save", param, () => { this.result = this.$post("service/integration/save", param, () => {
this.show = true; this.show = true;
this.showEdit = true; this.showEdit = true;

4
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -269,8 +269,8 @@ export default {
type: [{required: true, message: this.$t('test_track.case.input_type'), trigger: 'change'}], type: [{required: true, message: this.$t('test_track.case.input_type'), trigger: 'change'}],
testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}], testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}], method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}],
prerequisite: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}], prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}],
remark: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}] remark: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}]
}, },
formLabelWidth: "120px", formLabelWidth: "120px",
operationType: '', operationType: '',

47
frontend/src/business/components/track/home/TrackHome.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<ms-container> <ms-container>
<ms-main-container> <ms-main-container>
<el-row> <el-row :gutter="20">
<el-col :span="15"> <el-col :span="15">
<related-test-plan-list ref="relatedTestPlanList"/> <related-test-plan-list ref="relatedTestPlanList"/>
</el-col> </el-col>
@ -14,33 +14,34 @@
</template> </template>
<script> <script>
import RelatedTestPlanList from "./components/RelatedTestPlanList"; import RelatedTestPlanList from "./components/RelatedTestPlanList";
import TestCaseSideList from "./components/TestCaseSideList"; import TestCaseSideList from "./components/TestCaseSideList";
import MsContainer from "../../common/components/MsContainer"; import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer"; import MsMainContainer from "../../common/components/MsMainContainer";
export default {
name: "TrackHome", export default {
components: {MsMainContainer, MsContainer, TestCaseSideList, RelatedTestPlanList}, name: "TrackHome",
watch: { components: {MsMainContainer, MsContainer, TestCaseSideList, RelatedTestPlanList},
'$route'(to,from) { watch: {
if (to.path.indexOf('/track/home') > -1) { '$route'(to, from) {
this.innitData(); if (to.path.indexOf('/track/home') > -1) {
} this.innitData();
}
},
methods: {
innitData() {
this.$refs.relatedTestPlanList.initTableData();
this.$refs.testCaseRecentList.initTableData();
}
} }
} }
},
methods: {
innitData() {
this.$refs.relatedTestPlanList.initTableData();
this.$refs.testCaseRecentList.initTableData();
}
}
}
</script> </script>
<style scoped> <style scoped>
.ms-main-container >>> .el-table { .ms-main-container >>> .el-table {
cursor:pointer; cursor: pointer;
} }
</style> </style>

30
frontend/src/business/components/track/home/components/HomeBaseComponent.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="track-home-component"> <div>
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
<span class="title">{{title}}</span> <span class="title">{{ title }}</span>
</template> </template>
<slot></slot> <slot></slot>
</el-card> </el-card>
@ -10,27 +10,19 @@
</template> </template>
<script> <script>
export default { export default {
name: "HomeBaseComponent", name: "HomeBaseComponent",
props: { props: {
title: { title: {
type: String, type: String,
default() { default() {
this.$t('commons.title') this.$t('commons.title')
}
}
} }
} }
}
}
</script> </script>
<style scoped> <style scoped>
.el-card {
padding: 15px;
}
.track-home-component {
padding: 0 15px 15px;
}
</style> </style>

32
frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue
View File

@ -23,22 +23,22 @@
</template> </template>
<script> <script>
import {Test} from "../../../../../api/test/model/ScenarioModel" import {Test} from "../../../../../api/test/model/ScenarioModel"
import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig"; import MsApiScenarioConfig from "../../../../../api/test/components/ApiScenarioConfig";
import MsContainer from "../../../../../common/components/MsContainer"; import MsContainer from "../../../../../common/components/MsContainer";
import MsMainContainer from "../../../../../common/components/MsMainContainer"; import MsMainContainer from "../../../../../common/components/MsMainContainer";
export default { export default {
name: "ApiTestDetail", name: "ApiTestDetail",
components: {MsMainContainer, MsContainer, MsApiScenarioConfig}, components: {MsMainContainer, MsContainer, MsApiScenarioConfig},
props: { props: {
id: String, id: String,
isReadOnly: { isReadOnly: {
type: Boolean, type: Boolean,
default: false default: false
} }
}, },
data() { data() {
return { return {
result: {}, result: {},
test: new Test(), test: new Test(),
@ -92,7 +92,7 @@
<style scoped> <style scoped>
.test-container { .test-container {
height: calc(100vh - 150px); height: calc(100vh - 155px);
min-height: 600px; min-height: 600px;
padding: 15px; padding: 15px;
} }

36
frontend/src/business/components/track/plan/view/comonents/test/ApiTestResult.vue
View File

@ -30,24 +30,24 @@
<script> <script>
import MsScenarioResult from "../../../../../api/report/components/ScenarioResult"; import MsScenarioResult from "../../../../../api/report/components/ScenarioResult";
import MsMetricChart from "../../../../../api/report/components/MetricChart"; import MsMetricChart from "../../../../../api/report/components/MetricChart";
import MsScenarioResults from "../../../../../api/report/components/ScenarioResults"; import MsScenarioResults from "../../../../../api/report/components/ScenarioResults";
import MsRequestResult from "../../../../../api/report/components/RequestResult"; import MsRequestResult from "../../../../../api/report/components/RequestResult";
import MsContainer from "../../../../../common/components/MsContainer"; import MsContainer from "../../../../../common/components/MsContainer";
import MsMainContainer from "../../../../../common/components/MsMainContainer"; import MsMainContainer from "../../../../../common/components/MsMainContainer";
export default { export default {
name: "ApiTestResult", name: "ApiTestResult",
components: {MsMainContainer, MsContainer, MsRequestResult, MsScenarioResults, MsMetricChart, MsScenarioResult}, components: {MsMainContainer, MsContainer, MsRequestResult, MsScenarioResults, MsMetricChart, MsScenarioResult},
data() { data() {
return { return {
activeName: "total", activeName: "total",
content: {}, content: {},
report: {}, report: {},
loading: true, loading: true,
fails: [], fails: [],
} }
}, },
props:['reportId'], props:['reportId'],
watch: { watch: {
@ -108,7 +108,7 @@
<style scoped> <style scoped>
.report-container { .report-container {
height: calc(100vh - 150px); height: calc(100vh - 155px);
min-height: 600px; min-height: 600px;
overflow-y: auto; overflow-y: auto;
} }