Commit Graph

4540 Commits

Author SHA1 Message Date
chenjianxing 9107a21d74 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 17:26:18 +08:00
chenjianxing b68a0a4586 fix: 导入接口没有带模块 2021-03-31 17:26:05 +08:00
song-tianyang ca11ff4bc1 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 17:04:07 +08:00
chenjianxing b1a3dd3473 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 16:50:22 +08:00
chenjianxing b2b83a57f5 fix: 接口定义无法选择模块 2021-03-31 16:50:04 +08:00
song-tianyang 2fd563f670 Merge branch 'v1.8' of http://github.com/metersphere/metersphere into v1.8 2021-03-31 16:44:45 +08:00
song.tianyang 5b3df1ab15 fix: 优化接口覆盖率的loading方式:改为图标
优化接口覆盖率的loading方式:改为图标
2021-03-31 16:13:16 +08:00
song.tianyang 7cc2737a5f fix: 优化excel模板导入,模块字数超标的提示
优化excel模板导入,模块字数超标的提示
2021-03-31 15:58:50 +08:00
wenyann f4a745ca81 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 15:34:46 +08:00
wenyann ace4c51f0c fix:用例步骤颜色加深 2021-03-31 15:08:41 +08:00
fit2-zhao f768f9aac8 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 15:04:23 +08:00
fit2-zhao cb1ba0e0aa style(接口定义): 通用下拉树 节点内容过长显示不全优化 2021-03-31 15:04:09 +08:00
Captain.B bfe011abc7 Merge branch 'v1.8' 2021-03-31 15:00:09 +08:00
song.tianyang c45e601994 fix: 接口测试首页增加"接口覆盖率统计"
接口测试首页增加"接口覆盖率统计"
2021-03-31 14:43:59 +08:00
fit2-zhao b918df0e15 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 14:33:11 +08:00
fit2-zhao 2279c17d73 fix(接口自动化): 修改转场景测试名称 2021-03-31 14:33:04 +08:00
chenjianxing 5dd39b60e5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 13:44:02 +08:00
chenjianxing d55bbc6dd8 fix: 接口导出没有带路径 2021-03-31 13:43:43 +08:00
fit2-zhao 0cb2188cd2 fix(接口自动化): 恢复xpack 2021-03-31 13:24:50 +08:00
Captain.B 201027d432 Merge branch 'v1.8' 2021-03-31 13:24:02 +08:00
Captain.B 4045f5546f chore: sync 2021-03-31 13:23:26 +08:00
fit2-zhao d62391e6ca fix(接口自动化): 注释全路径校验 2021-03-31 13:20:53 +08:00
fit2-zhao ed3e076a01 fix(接口自动化): 放开全路径校验 2021-03-31 13:17:05 +08:00
fit2-zhao e092a7a130 fix(接口自动化): 放开全路径校验 2021-03-31 13:03:33 +08:00
fit2-zhao 1221bb8d66 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 13:00:04 +08:00
fit2-zhao 4811432acc fix(接口自动化): 修复csv 分隔符不能编辑问题 2021-03-31 12:59:48 +08:00
Captain.B 6d857da2f4 Merge branch 'v1.8' 2021-03-31 12:24:54 +08:00
Captain.B 8c7e941ee4 chore: sync 2021-03-31 12:24:38 +08:00
Captain.B 8d90e427a9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 12:22:33 +08:00
Captain.B 71c512174d fix(性能测试): 修复上传测试文件偶尔会传多个的bug 2021-03-31 12:22:14 +08:00
shiziyuan9527 a21c611d35 fix(场景自动化): 运行环境显示问题 2021-03-31 12:12:13 +08:00
fit2-zhao b20a870581 fix(接口自动化): 修复jsonPathAssrtion 5.2 版本升级后问题 2021-03-31 11:25:17 +08:00
Captain.B 13386da0af Merge branch 'v1.8' into master 2021-03-31 08:17:27 +08:00
Captain.B c1f00d8257 fix: 尝试修复表格固定列之后错乱的问题 2021-03-31 08:17:00 +08:00
Captain.B bdc0127207 chore: sync 2021-03-30 22:07:53 +08:00
fit2-zhao db11b495d0 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 19:54:35 +08:00
fit2-zhao 5d78d51091 fix(接口自动化): 检查场景步骤是否都是全路径 2021-03-30 19:54:18 +08:00
Captain.B 5cc4e709fe Merge branch 'v1.8' 2021-03-30 19:22:50 +08:00
Captain.B 1a858c619d fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:20:39 +08:00
Captain.B 6d8873ca5c Merge branch 'v1.8' 2021-03-30 19:15:04 +08:00
Captain.B 9257eb55cc chore: sync 2021-03-30 19:14:50 +08:00
Captain.B 75fb21ca4b Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 19:14:07 +08:00
Captain.B 10a24e60a5 fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:13:44 +08:00
Captain.B 058ff22195 Merge branch 'v1.8' 2021-03-30 18:33:56 +08:00
fit2-zhao c23a31400e Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 18:32:39 +08:00
Captain.B 5a205b9c1f fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 2021-03-30 18:31:56 +08:00
fit2-zhao 5ed35abe59 fix(接口定义): 修复环境地址不是标准域名问题 2021-03-30 18:31:33 +08:00
song.tianyang cb9bbe26ea fix: 接口定义列表错位方法优化代码回退
接口定义列表错位方法优化代码回退
2021-03-30 17:39:22 +08:00
song.tianyang 812735696a Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:29:27 +08:00
fit2-zhao 78b06d18ee Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:28:06 +08:00
fit2-zhao 233cceec73 fix(场景自动化): 删除单个场景问题修复 2021-03-30 17:27:43 +08:00
Captain.B 5dbafb8770 Merge branch 'v1.8' 2021-03-30 17:27:15 +08:00
Captain.B 43f6bc09dd chore: sync 2021-03-30 17:23:02 +08:00
song.tianyang e63a56257c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:16:49 +08:00
song.tianyang 71f883a377 fix: 解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
2021-03-30 17:14:38 +08:00
fit2-zhao 63d1e2e640 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:05:16 +08:00
fit2-zhao 3243e5fb68 fix(场景自动化): 修复场景名称过长显示问题 2021-03-30 17:04:33 +08:00
chenjianxing af3d54b82f refactor: jsonpath推荐关闭按钮优化 2021-03-30 16:59:45 +08:00
chenjianxing 01480fc6f2 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:42:06 +08:00
song.tianyang 60136a3e02 fix: ESB导入增加xpack判断,ESB导入模板去掉"是否必填"列,ESB请求参数去掉"是否必填"列
ESB导入增加xpack判断,ESB导入模板去掉"是否必填"列,ESB请求参数去掉"是否必填"列
2021-03-30 16:33:45 +08:00
song.tianyang cc99108e28 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 16:29:10 +08:00
Ambitiousliga ab98740321 fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 16:20:22 +08:00
fit2-zhao 6db8a133de fix(接口自动化): 修复端口是变量的问题 2021-03-30 15:52:25 +08:00
Captain.B 7185961ad2 Merge branch 'v1.8' 2021-03-30 15:43:52 +08:00
fit2-zhao 22b63d03df Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:35:39 +08:00
fit2-zhao 81645d4387 fix(接口自动化): 选中模块创建数据,默认放到当前选择的模块下 2021-03-30 15:35:11 +08:00
Captain.B 3a11fd16eb chore: sync 2021-03-30 15:31:27 +08:00
fit2-zhao a05d1a773a fix(测试用例,接口定义,接口自动化): 默认添加的模块,不能编辑也不能删除。 2021-03-30 15:20:34 +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 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
Captain.B 6bc2601bc7 Merge branch 'v1.8' 2021-03-30 14:11:52 +08:00
fit2-zhao c84d1e8535 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 13:55:37 +08:00
fit2-zhao 6303bcb42e fix(测试用例,接口定义,接口自动化): 增加默认模块,默认创建用例都放到默认模块下 2021-03-30 13:55:32 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +08:00
Captain.B 2b32f119a0 chore: sync 2021-03-30 12:58: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
song.tianyang 33e0207d84 fix(推荐断言弹框可以点击空白关闭): 推荐断言弹框可以点击空白关闭 2021-03-30 11:44:35 +08:00
Captain.B f18f2f2559 Merge branch 'v1.8' 2021-03-30 10:28:23 +08:00
Captain.B f2a6341b4c fix: 修复文件加载时文件名重复没有显示文件名的bug 2021-03-30 10:27:04 +08:00
Captain.B 391a2924c8 chore: sync 2021-03-30 10:04:58 +08:00
Captain.B 0cfd281d07 feat(性能测试): 限制普通线程组的预热时间最大值不能超多压测时长 2021-03-30 10:04:20 +08:00
shiziyuan9527 47120c97cb refactor(场景自动化): 回退运行环境配置 2021-03-29 22:41:29 +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
chenjianxing c832bbed3e Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 18:51:58 +08:00
fit2-zhao 09c027a79c fix(场景自动化): 修复最大化切换数据展示问题 2021-03-29 18:38:06 +08:00
wenyann d7113c4c0c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 18:30:42 +08:00
wenyann 7332bd41ec fix:用例添加了评论,但编辑的时候看不到 2021-03-29 18:27:46 +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
song.tianyang 8697826dfd Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 17:40:35 +08:00
song.tianyang 2fac88cca8 fix: 修复页面展现XML格式数据时会自动转化标签的问题
修复页面展现XML格式数据时会自动转化标签的问题
2021-03-29 17:28:56 +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
wenyann 52b0709753 fix:修复表头显示问题 2021-03-29 16:43:52 +08:00
Captain.B 966b7318ca Merge branch 'v1.8' 2021-03-29 15:51:57 +08:00