Commit Graph

2322 Commits

Author SHA1 Message Date
shiziyuan9527 987ab3b395 fix(测试跟踪): 修复测试跟踪首页数据查询问题 2020-12-30 18:50:06 +08:00
shiziyuan9527 6ba32fbda9 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 18:16:18 +08:00
shiziyuan9527 1631803bbd refactor(测试计划): 测试计划优化 2020-12-30 18:15:07 +08:00
fit2-zhao d8d572fb14 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 16:55:27 +08:00
fit2-zhao 56d0a24fd8 fix(接口自动化): 修复通用请求头问题 2020-12-30 16:55:12 +08:00
song.tianyang a1c1a023a6 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-30 14:43:43 +08:00
song.tianyang d32000e0bd feat: 接口定义-案例表格增加全部数据批量操作支持
接口定义-案例表格增加全部数据批量操作支持
2020-12-30 14:42:48 +08:00
fit2-zhao a683bb27ff fix(接口自动化): 修复http环境请求头公共参数无效问题 2020-12-30 11:25:26 +08:00
Captain.B 22e8bf6def refactor: k8s 环境指定namespace 2020-12-30 10:40:37 +08:00
Captain.B 4cf7c06f07 refactor: k8s 环境指定namespace 2020-12-30 10:34:17 +08:00
song.tianyang 9be10ec291 refactor: 处理上次提交合并冲突时未删除的代码块
处理上次提交合并冲突时未删除的代码块
2020-12-29 18:00:03 +08:00
song.tianyang 7cc9f8c01d Merge remote-tracking branch 'origin/v1.6' into v1.6
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
2020-12-29 17:46:22 +08:00
song.tianyang f2908ac330 feat: 接口定义页面增加"选择所有数据"操作
接口定义页增加"选择所有数据"功能,用于批量修改、批量删除
2020-12-29 17:41:35 +08:00
chenjianxing 62ac695a0b refactor: 测试计划关联列表只列出有未关联用例的接口 2020-12-29 16:43:29 +08:00
chenjianxing 2ff0726965 fix: 解决冲突 2020-12-29 15:39:51 +08:00
chenjianxing 9ce507d201 refactor: 测试计划获取关联接口列表 2020-12-29 15:32:57 +08:00
song.tianyang f1564b5751 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:19:47 +08:00
song.tianyang fbc19a6f32 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:18:05 +08:00
fit2-zhao fb8abc6c18 fix(接口自动化): 执行场景没有步骤时保护 2020-12-29 15:17:55 +08:00
song.tianyang 669cfd168b feat: 增加"选择所有数据"功能
接口自动化页面、测试报告页面,增加"选择所有数据"功能,用于批量操作
2020-12-29 15:17:43 +08:00
chenjianxing 8d8292227f refactor: 代码优化 2020-12-29 14:15:58 +08:00
Captain.B 1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
Captain.B 1154b3ce80 fix: 修改k8s资源池节点验证信息 2020-12-29 11:03:24 +08:00
Captain.B c52fddbe19 refactor: 国际化 not support key 显示具体的key 2020-12-29 10:54:08 +08:00
fit2-zhao 711c787f8d fix(接口自动化): 添加执行时 mock 处理 2020-12-29 09:56:26 +08:00
fit2-zhao f5ea7d25b9 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-28 19:36:58 +08:00
Captain.B 5d9da617be Merge branch 'v1.6' 2020-12-28 16:52:50 +08:00
chenjianxing 8e1d3a3da7 fix: 更新提交 2020-12-28 14:44:46 +08:00
shiziyuan9527 06706736db refactor: sql 2020-12-28 14:29:03 +08:00
Captain.B 271275f4bd chore: Sync 2020-12-28 14:25:07 +08:00
chenjianxing 85b90f3226 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 14:20:51 +08:00
chenjianxing f323e737e1 fix: 性能测试列表为空 2020-12-28 14:20:26 +08:00
chenjianxing 5f1adb6d34 fix: 性能测试列表为空 2020-12-28 14:19:49 +08:00
luoylove 24e89c2c57
swaggerParser RefProperty bug fix (#994)
Co-authored-by: luoyoujun <luoyoujun3712@dingtalk.com>
2020-12-28 13:47:25 +08:00
Captain.B 79d34a1825 fix(接口测试): 接口测试 url encoder
Closes #872
2020-12-28 13:04:18 +08:00
Captain.B 758677beb5 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-28 12:55:13 +08:00
Captain.B 4cc0fd0e24 fix(接口测试): 接口测试 url encoder
Closes #872
2020-12-28 12:54:48 +08:00
chenjianxing 965f43d9fc Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 12:50:58 +08:00
chenjianxing 8696347f4a fix: 测试计划进度没有统计到接口测试用例 2020-12-28 12:49:40 +08:00
Captain.B ad982b5e09 fix: 修复火狐icon不能显示的问题 2020-12-28 11:08:17 +08:00
Captain.B dd5b0d9cab chore: Sync 2020-12-28 10:50:01 +08:00
chenjianxing 007ede7069 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 10:43:31 +08:00
chenjianxing 08b75e5ddb 解决${}变量请求体格式化问题 2020-12-28 10:43:03 +08:00
shiziyuan9527 e6f5b717b4 feat(接口): 接口相关列表添加ID列 2020-12-25 21:52:52 +08:00
chenjianxing 0d037a9165 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:24:22 +08:00
fit2-zhao de716c32ab fix(接口自动化): 修复拖拽问题 2020-12-25 18:23:31 +08:00
chenjianxing 7f52b22864 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:23:19 +08:00
chenjianxing 1c5f83a1b3 refactor: 导出带模块,导入自动生成模块 2020-12-25 18:22:55 +08:00
fit2-zhao 76b3624aac Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:00:30 +08:00
fit2-zhao ee27fa0c5e fix(接口自动化): 模块同级别排序 2020-12-25 18:00:05 +08:00
Captain.B fa5a693d1f refactor: 去掉 $$get 方法 2020-12-25 15:40:28 +08:00
Captain.B 414674d833 fix: 下载jtl国际化的key失败 2020-12-25 14:53:55 +08:00
chenjianxing f7a0463eb2 fix: 接口导入 2020-12-25 14:45:35 +08:00
fit2-zhao bc79ae48f3 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-25 14:31:39 +08:00
fit2-zhao 719bda0ff7 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 13:57:54 +08:00
fit2-zhao 7645026dae fix(接口自动化): 修复环境公共变量 2020-12-25 13:57:36 +08:00
Captain.B 6e3139d24f chore: Sync 2020-12-25 13:31:00 +08:00
Captain.B 8db039e1b7 fix: 修复rps index 越界的问题 2020-12-25 13:30:35 +08:00
chenjianxing cd3e68ab4d refactor: 接口导入到选中模块 2020-12-25 12:07:06 +08:00
chenjianxing 0f5da509cf fix: 取消调试注释 2020-12-25 11:28:16 +08:00
chenjianxing a09c4e3b04 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 11:18:12 +08:00
chenjianxing a923a5b55e fix: 没选项目报错 2020-12-25 11:17:59 +08:00
fit2-zhao 68ad16412d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 11:16:51 +08:00
fit2-zhao 312b028ade fix(接口自动化): 修复导入接口列表内容查询问题 2020-12-25 11:16:35 +08:00
song.tianyang 79ef041153 fix: 接口测试,定时任务数量统计,统计了手动执行的次数
修复接口测试,定时任务数量统计,统计了手动执行的次数的问题
2020-12-25 11:08:44 +08:00
fit2-zhao caa7a5d4d7 fix(接口自动化): 添加断言规则,修复执行报告缺陷 2020-12-25 10:35:50 +08:00
BugKing fbda7b423f Merge branch 'master' into v1.6 2020-12-24 19:09:58 +08:00
fit2-zhao 8d378c163d fix(接口自动化): 批量执行优化 2020-12-24 19:01:44 +08:00
fit2-zhao 2ec31650d0 fix(接口自动化): 修复选择权限问题 2020-12-24 18:43:31 +08:00
fit2-zhao dc6a960dac fix(接口自动化): 修复请求参数问题 2020-12-24 18:27:14 +08:00
chenjianxing 8dff0e81f7 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-24 18:24:45 +08:00
BugKing 9d5210ada8 Merge branch 'master' into v1.6 2020-12-24 18:17:22 +08:00
fit2-zhao 4e8deba17b fix(接口自动化): 报告优化 2020-12-24 18:15:28 +08:00
fit2-zhao d9f1f19e7d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 17:52:33 +08:00
fit2-zhao 997be02950 fix(接口自动化): 修复场景变量问题 2020-12-24 17:51:53 +08:00
fit2-zhao ea5ff734b6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 17:36:14 +08:00
fit2-zhao c36952b0ba fix(接口自动化): 执行结果重构 2020-12-24 17:35:57 +08:00
song.tianyang 4b0a18ebf1 Merge remote-tracking branch 'origin/master' 2020-12-24 17:06:49 +08:00
song.tianyang 03172b05ec fix: 接口用例统计了回收站里的接口
修复接口用例统计了回收站里的接口的问题
2020-12-24 17:06:37 +08:00
wenyann 783494c9db fix: 模版类型修改 2020-12-24 16:14:31 +08:00
song.tianyang 8d3f281453 fix: 首页7天失败案例、定时任务成功失败次数
修首页7天失败案例未只统计测试计划的数据的问题、定时任务成功失败次数统计不对的问题
2020-12-24 16:01:36 +08:00
Captain.B 42ab7247fb chore: Sync 2020-12-24 15:53:42 +08:00
chenjianxing bcbcfebe61 Merge branch 'master' of https://github.com/metersphere/metersphere into v1.6 2020-12-24 15:06:41 +08:00
song.tianyang e4e421f90a fix: 首页7天失败案例统计不足
修复首页7天失败案例统计不足的问题、统计场景时统计了回收站内的数据都问题
2020-12-24 14:51:59 +08:00
chenjianxing 1035b9f9ec Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 14:20:23 +08:00
chenjianxing 92e1411289 fix: 接口场景导入名称修改 2020-12-24 14:20:14 +08:00
song.tianyang f09cc98b67 style: 首页tips超链接颜色是紫色
修复首页tips超链接颜色是紫色的问题,并只针对地址做了超链接
2020-12-24 14:14:51 +08:00
fit2-zhao 4309a300d6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 13:58:40 +08:00
fit2-zhao fb4d232be4 fix(接口自动化): 修改执行结果报告 2020-12-24 13:58:20 +08:00
wenyann 89a8643c4d fix: 模版修改 2020-12-24 13:47:48 +08:00
wenyann 86c84855b8 fix:测试执行状态修改 2020-12-24 13:43:39 +08:00
wenyann b1d95c8d55 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 13:35:00 +08:00
song.tianyang f75aa48da2 Merge remote-tracking branch 'origin/master' 2020-12-24 13:20:48 +08:00
song.tianyang 35462667e3 fix: 首页-过去七天失败用例数量查询速度过慢
修复首页-过去七天失败用例数量查询速度过慢的问题
2020-12-24 13:20:18 +08:00
wenyann 3e9ae4afcb Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
2020-12-24 13:18:36 +08:00
chenjianxing 24b30a73fa refactor: 去掉旧版查看报告按钮 2020-12-24 13:14:50 +08:00
wenyann e2f272f601 fix:测试执行状态修改 2020-12-24 12:51:33 +08:00
Captain.B ed68556937 Merge remote-tracking branch 'origin/master' 2020-12-24 12:45:34 +08:00
Captain.B 025a5c5638 fix: 设置测试参数-执行测试后报告页并发数显示默认值 2020-12-24 12:44:13 +08:00
fit2-zhao caa36951cc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 12:17:45 +08:00