Commit Graph

3372 Commits

Author SHA1 Message Date
Captain.B 575cc7dbed Merge branch 'v1.8' 2021-03-30 14:53:13 +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
Coooder-X 138f1e3874
fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式 (#1751)
* feat(测试跟踪): 测试用例下载模版增加标签列

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

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

* fix(接口定义): 修复swagger导入一些值缺失 & 请求体导出支持json、xml格式
2021-03-30 13:07:09 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +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
Ambitiousliga f8b35a9e72
fix(测试跟踪):Excel导入用例时标签有内容会报错 (#1747)
* fix(测试跟踪):Excel导入用例时标签有内容报错

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

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 11:02:59 +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