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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2020-12-31 15:02:37 +08:00
parent a9a6c52122 a19e3521e2
commit 199327be75
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/ISSUE_TEMPLATE/v1.6.1-issue.md vendored
View File

@ -1,8 +1,8 @@
--- ---
name: v1.6.1 问题 name: v1.6反馈
about: 提交关于 v1.6.1 的缺陷与建议，赢取Lv同款鼠标垫！马克杯！文化衫！ about: 提交关于 v1.6的缺陷与建议，赢取Lv同款鼠标垫！马克杯！文化衫！
title: "[v1.6.1]" title: "[v1.6]"
labels: v1.6.1 labels: v1.6
assignees: luty2018 assignees: luty2018
--- ---

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

@ -181,11 +181,13 @@ public class MsHTTPSamplerProxy extends MsTestElement {
} }
// 请求体 // 请求体
if (!StringUtils.equals(this.getMethod(), "GET")) { if (!StringUtils.equals(this.getMethod(), "GET")) {
List<KeyValue> bodyParams = this.body.getBodyParams(sampler, this.getId()); if (this.body != null) {
if (this.body.getType().equals("Form Data")) { List<KeyValue> bodyParams = this.body.getBodyParams(sampler, this.getId());
sampler.setDoMultipart(true); if (StringUtils.isNotEmpty(this.body.getType()) && this.body.getType().equals("Form Data")) {
sampler.setDoMultipart(true);
}
sampler.setArguments(httpArguments(bodyParams));
} }
sampler.setArguments(httpArguments(bodyParams));
} }
final HashTree httpSamplerTree = tree.add(sampler); final HashTree httpSamplerTree = tree.add(sampler);

1
backend/src/main/resources/db/migration/V59__test_plan_add_project_id.sql
View File

@ -1,4 +1,5 @@
alter table test_plan add project_id varchar(50) null comment '测试计划所属项目'; alter table test_plan add project_id varchar(50) null comment '测试计划所属项目';
ALTER TABLE api_test_case MODIFY COLUMN name varchar(255) NOT NULL COMMENT 'Test name';
DROP PROCEDURE IF EXISTS test_cursor; DROP PROCEDURE IF EXISTS test_cursor;
DELIMITER // DELIMITER //

2
frontend/src/business/components/api/definition/components/response/RequestMetric.vue
View File

@ -27,7 +27,7 @@
computed: { computed: {
error() { error() {
return this.response.responseCode >= 400; return this.response && this.response.responseCode && this.response.responseCode >= 400;
} }
} }
} }

2
frontend/src/business/components/api/definition/components/response/ResponseResult.vue
View File

@ -41,7 +41,7 @@
</div> </div>
<div class="ms-div"> <div class="ms-div">
Body : Body :
<pre>{{response.body}}</pre> <pre>{{response.body ? response.body:""}}</pre>
</div> </div>
</el-tab-pane> </el-tab-pane>

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

@ -307,7 +307,7 @@ export default {
rules: { rules: {
name: [ name: [
{required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'}, {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
{max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'} {max: 255, message: this.$t('test_track.length_less_than') + '255', trigger: 'blur'}
], ],
module: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}], module: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
maintainer: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}], maintainer: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],