test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,770 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

3445 Commits

Author SHA1 Message Date
fit2-zhao a555ddd334 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 12:03:54 +08:00
fit2-zhao eed1a5e167 fix(接口自动化): 修复导入jmx 超时时间丢失问题 2021-03-31 12:03:26 +08:00
fit2-zhao b20a870581 fix(接口自动化): 修复jsonPathAssrtion 5.2 版本升级后问题 2021-03-31 11:25:17 +08:00
chenjianxing e0461fda3b fix: 解决冲突 2021-03-31 10:55:27 +08:00
chenjianxing e04d82d117 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 10:53:14 +08:00
Ambitiousliga b2d3b81bc5 fix(测试跟踪):Excel导入用例时标签有内容会报错 (#1747) 
* fix(测试跟踪):Excel导入用例时标签有内容报错

* fix(测试跟踪):excel导入只有新增用例且和错误用例时，关闭窗口会自动刷新。

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-31 10:49:39 +08:00
Ambitiousliga 5ea0cde526 fix: 解决冲突 2021-03-31 10:49:12 +08:00
fit2-zhao 6313a66662 refactor(接口定义): 默认模块校验公共方法提取 2021-03-30 18:44:44 +08:00
fit2-zhao cc13993abc fix(接口定义): 默认模块校验问题修改 2021-03-30 18:41:22 +08:00
fit2-zhao 5ed35abe59 fix(接口定义): 修复环境地址不是标准域名问题 2021-03-30 18:31:33 +08:00
fit2-zhao 52ce3f288b Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 16:45:58 +08:00
fit2-zhao 0a7ce73e6a fix(测试用例): 导入xmind 模版 模块名称长度修改 2021-03-30 16:45:26 +08:00
chenjianxing 01480fc6f2 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:42:06 +08:00
chenjianxing 32b26efc73 refactor: 导入用例重复提示优化 2021-03-30 16:41:44 +08:00
fit2-zhao c5362840fc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 16:38:47 +08:00
fit2-zhao 9abc90150d fix(接口自动化): 修复重定向接口内容重复问题 2021-03-30 16:38:30 +08:00
song.tianyang 60136a3e02 fix: ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列 
ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列
 2021-03-30 16:33:45 +08:00
Ambitiousliga 2534eafcf0 fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-30 16:20:22 +08:00
chenjianxing 5c70925360 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:08:34 +08:00
chenjianxing 87221dfda2 groovy脚本无法使用jar包 2021-03-30 16:08:17 +08:00
fit2-zhao 6db8a133de fix(接口自动化): 修复端口是变量的问题 2021-03-30 15:52:25 +08:00
Captain.B 1847fbbf5d fix: 修复文件名过短导致场景无法引入 2021-03-30 15:31:02 +08:00
Captain.B 02af3f1fe9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 15:29:45 +08:00
Captain.B d556c722ad fix(性能测试): 修复预热时间没有适配单位的bug 2021-03-30 15:28:16 +08:00
fit2-zhao 2a70396bf8 fix: 恢复被覆盖的sql 2021-03-30 15:25:23 +08:00
fit2-zhao 015c665bcf Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:03:46 +08:00
fit2-zhao cff32b828c fix(测试用例，接口定义，接口自动化): 增加默认模块，默认创建用例都放到默认模块下 2021-03-30 15:03:31 +08:00
Captain.B 0f1676166c fix: 修复文件名过短导致场景无法引入，文件重复弹框提示优化 2021-03-30 14:52:34 +08:00
Coooder-X 3e97f8da6c fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
 2021-03-30 13:08:29 +08:00
chenjianxing fc9d040579 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 12:06:18 +08:00
chenjianxing 378c31e3ca fix: swagger2 导入响应体 2021-03-30 12:05:52 +08:00
fit2-zhao 4f4aa6f5d2 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
 2021-03-30 11:50:34 +08:00
fit2-zhao e0182038b9 fix(接口定义): 修改默认模块 2021-03-30 11:46:22 +08:00
chenjianxing 11bb0cf5a4 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 11:31:38 +08:00
chenjianxing 6240306795 fix: 导入接口用例创建到默认模块 2021-03-30 11:30:52 +08:00
shiziyuan9527 b2f5eab0b6 fix(场景自动化): 修复升级环境问题 2021-03-30 11:30:23 +08:00
chenjianxing e56e2e19b5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 10:54:04 +08:00
chenjianxing 93b63980ea fix: 接口用例执行报错 2021-03-30 10:52:59 +08:00
chenjianxing e451a47f55 refactor: 修改swagger-parse版本 2021-03-30 10:10:17 +08:00
chenjianxing 3f4dda8ccb Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 20:01:08 +08:00
chenjianxing ca3b951e2d fix: 测试计划状态 2021-03-29 20:00:51 +08:00
fit2-zhao 61f7a82371 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 19:34:31 +08:00
fit2-zhao 53212d75e8 fix(场景自动化): 执行日志报错问题修复 2021-03-29 19:34:15 +08:00
chenjianxing 2ba7cd8b1a fix: swgger base-url 导入后路径多了一个'/' 2021-03-29 19:03:17 +08:00
chenjianxing b6faf61f73 fix: 旧版本导出文件接口定义导入失败 2021-03-29 18:50:59 +08:00
fit2-zhao 2bd6172e4a Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 18:23:24 +08:00
fit2-zhao 1d9059de34 refactor(接口自动化，接口定义): 删除接口自动化场景调试产生的记录详情，保留最后一条 2021-03-29 18:23:10 +08:00
chenjianxing cda0b0d1bf Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 17:55:56 +08:00
Ambitiousliga c1d7f5df42 feat(测试跟踪):通过Excel导入导出时有ID字段，可通过Excel导入来更新用例。 (#1727) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-29 17:55:32 +08:00
shiziyuan9527 7a9079a479 fix(场景自动化): 场景下步骤未启用当前场景的环境 2021-03-29 17:02:34 +08:00
song.tianyang 809142af53 fix: 场景关联ESB接口时复制的ESB案例无法构建树结构数据 
修复场景关联ESB接口时复制的ESB案例无法构建树结构数据
 2021-03-29 16:50:33 +08:00
fit2-zhao 933b508da0 fix(场景自动化): 修复升级环境问题 2021-03-29 16:23:04 +08:00
fit2-zhao 8d635743bc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:01:25 +08:00
Captain.B 980190c6bf refactor(性能测试): 资源池校验修改，停止容器错误处理 2021-03-29 14:58:51 +08:00
fit2-zhao d3fccb25d6 feat(场景自动化，测试用例，): 测试用例、 接口定义、场景自动化 增加“默认模块” 创建测试用例、接口定义、场景时 所属模块默认值为“默认模块” 2021-03-29 14:43:25 +08:00
Captain.B 4e70646a01 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 13:43:47 +08:00
Captain.B 6f18b5426f refactor(性能测试): 修改kafka默认的acks为0 2021-03-29 13:42:29 +08:00
fit2-zhao fddad77ace Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
 2021-03-29 13:31:42 +08:00
fit2-zhao 49097dc7b6 feat(接口定义): 接口定义、增加“默认模块” 创建接口定义所属模块默认值为“默认模块” 2021-03-29 13:19:59 +08:00
chenjianxing 9c96088006 Merge commit 'cc5ff944d1ed0ac524591553486cdc6a6effaadf' into v1.8 2021-03-29 12:00:19 +08:00
shiziyuan9527 74c1fafb71 fix(测试跟踪): 去掉评审关联用例时的权限控制 2021-03-29 10:47:30 +08:00
wenyann 6fd9b1aaa4 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 19:02:54 +08:00
wenyann 9818ea20fe fix: jenkins触发的测试测试计划进度和场景报告更新 2021-03-26 18:59:34 +08:00
Captain.B 44e1cf16fa Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:38:35 +08:00
Captain.B 4214e63b71 refactor: 增强验证csrftoken 2021-03-26 18:38:16 +08:00
song.tianyang ae3d1adf33 Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:33:52 +08:00
wenyann ca67a3ed56 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 18:13:08 +08:00
Captain.B e6f889b16e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:04:41 +08:00
fit2-zhao 8f06031cec fix(测试跟踪): 点击树菜单，列表恢复到列表 2021-03-26 18:03:00 +08:00
song.tianyang 64263c2cdb Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:02:08 +08:00
song.tianyang c1416fe407 fix: 测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中 
测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中
 2021-03-26 17:47:43 +08:00
wenyann d12ec06066 fix: 测试跟踪用例重复显示 2021-03-26 17:16:08 +08:00
chenjianxing cc5ff944d1 refactor: 重构模式搜索框 2021-03-26 17:06:22 +08:00
fit2-zhao 12f1c60a0f Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 16:29:35 +08:00
fit2-zhao dda1217c1a fix(接口自动化): 修复导入场景步骤请求 ip 和端口 是变量的问题 2021-03-26 16:29:18 +08:00
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-26 14:04:21 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
Captain.B 5ebe6756df Merge branch 'v1.8' 2021-03-26 09:52:39 +08:00
Captain.B 4cf1dd112b Merge branch 'v1.8' 2021-03-25 19:26:55 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
song.tianyang dfc24d96a4 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:25:33 +08:00
song.tianyang e3e799acf9 fix: 接口定义请求内容为 XML RAW 格式时文档模式报错 
接口定义请求内容为 XML RAW 格式时文档模式报错
 2021-03-25 18:25:21 +08:00
fit2-zhao 150cb57836 fix(接口自动化): 修复 csv 路径校验问题 2021-03-25 18:19:42 +08:00
fit2-zhao c5ab6d6395 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:14:23 +08:00
Captain.B 6c89cc6296 Merge remote-tracking branch 'origin/master' 2021-03-25 18:14:00 +08:00
fit2-zhao d6a0feb4fa fix(接口自动化): 修复jmx导入其他选项不能编辑问题 2021-03-25 18:13:53 +08:00
Captain.B 1879984912 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 18:12:14 +08:00
Captain.B 683430ec8d refactor: jmeter 版本升级 2021-03-25 18:11:58 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
fit2-zhao f0492e1346 fix(接口自动化): 修改场景报告名称长度 2021-03-25 17:23:30 +08:00
wenyann 8f4870dd84 Merge remote-tracking branch 'origin/master' 2021-03-25 17:02:55 +08:00
wenyann 01799cd937 fix: 修复测试计划无法执行测试用例 2021-03-25 17:02:36 +08:00
Coooder-X b515322331
fix(测试计划): 修复点击测试计划详情时自动发送通知 (#1703) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(测试计划): 修复点击测试计划详情时自动发送通知
 2021-03-25 15:30:25 +08:00
song.tianyang bd351f1c3e Merge remote-tracking branch 'origin/master' 2021-03-25 15:25:03 +08:00
song.tianyang 38f994c3df refactor: 解决性能测试定时任务状态不改变的问题 
解决性能测试定时任务状态不改变的问题
 2021-03-25 15:21:53 +08:00
fit2-zhao 4eac6ed970 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-25 15:13:49 +08:00
fit2-zhao 9f6e19928b fix(接口自动化): 修复测试报告触发方式不展示问题 2021-03-25 15:13:36 +08:00
song.tianyang f721b21924 Merge remote-tracking branch 'origin/master' 2021-03-25 14:45:33 +08:00
song.tianyang 51a172385a refactor: 解决性能测试定时任务状态不改变的问题 
解决性能测试定时任务状态不改变的问题
 2021-03-25 14:45:22 +08:00