Commit Graph

2309 Commits

Author SHA1 Message Date
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
fit2-zhao
be6d3e9e66 refactor(接口自动化): 重构场景加入到测试计划方法 2020-12-24 12:17:27 +08:00
chenjianxing
54247fc15c fix: 用例列表无法删除用例 2020-12-24 11:40:41 +08:00
fit2-zhao
08dbb9f59a refactor(接口自动化): 重构执行方法,按照场景存储 2020-12-24 11:38:35 +08:00
chenjianxing
0de9d0a073 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 11:37:28 +08:00
chenjianxing
e4dba81ad7 refactor: 接口自动化接口导入优化 2020-12-24 11:37:11 +08:00
Captain.B
7af4e161c4 Merge remote-tracking branch 'origin/master' 2020-12-24 11:22:15 +08:00
Captain.B
75ae7adfae fix: 保存基本信息时去掉路径最后的 / 2020-12-24 11:21:00 +08:00
song.tianyang
42d42bb76b fix: 首页-过去七天失败用例数量统计错误
修复首页-过去七天失败用例数量统计错误的问题
2020-12-24 11:19:01 +08:00
song.tianyang
4ae66e176b fix: 首页-过去七天失败用例数量统计错误
修复首页-过去七天失败用例数量统计错误的问题
2020-12-24 11:11:47 +08:00
song.tianyang
6b68429a47 Merge remote-tracking branch 'origin/master' 2020-12-24 10:36:50 +08:00
song.tianyang
62c7c00c04 fix: 接口/场景查看引用的测试计划显示重复
修复接口/场景查看引用的测试计划显示重复的问题的问题
2020-12-24 10:36:32 +08:00
fit2-zhao
c49e4c46b8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 10:31:41 +08:00
fit2-zhao
87e917578b fix(接口自动化): 修复请求参数问题 2020-12-24 10:31:20 +08:00
Captain.B
74abe9ece5 Merge remote-tracking branch 'origin/master' 2020-12-24 10:24:57 +08:00
Captain.B
7f80dfa3ec fix: 检查权限取消readonly的限制,改用checkowner 2020-12-24 10:22:48 +08:00
song.tianyang
f71d60fe54 Merge remote-tracking branch 'origin/master' 2020-12-24 10:16:34 +08:00
song.tianyang
b85cf231ca fix: 首页接口数据统计错误、定时任务不通知
修复首页接口数据统计错误、定时任务不通知的问题
2020-12-24 10:16:09 +08:00
Captain.B
0b68685e0d fix: 保留k8s job和日志 2020-12-24 10:04:55 +08:00
fit2-zhao
b9143716f7 fix(接口定义): 修复自定义请求执行缺陷 2020-12-23 20:57:28 +08:00
fit2-zhao
e4d245e505 fix(接口定义): 修复执行缺陷 2020-12-23 19:27:19 +08:00
song.tianyang
45d9a21512 fix: 首页接口数据统计、场景删除回收站数据
修复场景删除回收站数据异常的问题,首页接口数据统计增加情景接口的统计
2020-12-23 18:03:15 +08:00
fit2-zhao
6625b77ad9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 17:54:02 +08:00
fit2-zhao
6e75c66673 fix(接口定义): 修复执行缺陷 2020-12-23 17:34:21 +08:00
chenjianxing
576b858977 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 17:21:47 +08:00
chenjianxing
f6f142d7ba fix: 测试计划报告,测试计划结果为空 2020-12-23 17:21:07 +08:00
Captain.B
db4455714a Merge remote-tracking branch 'origin/master' 2020-12-23 17:00:55 +08:00
Captain.B
0f88a8168b fix: 只读用户点击接口自动花报错的问题修复 2020-12-23 17:00:34 +08:00
fit2-zhao
cb6b5844e9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 16:25:55 +08:00
fit2-zhao
156dfa20c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 16:25:36 +08:00
fit2-zhao
20a79f2870 fix(接口定义): 修改执行问题 2020-12-23 16:25:18 +08:00
chenjianxing
9143b48e05 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 16:25:10 +08:00
chenjianxing
4d7b794436 feat: 测试计划-失败计划列表 2020-12-23 16:25:01 +08:00
song.tianyang
71686be223 Merge remote-tracking branch 'origin/master' 2020-12-23 15:25:31 +08:00
fit2-zhao
8009ed2945 fix(接口自动化): 部分缺陷修复 2020-12-23 15:17:54 +08:00
song.tianyang
b4ab45880b fix: 接口关联测试计划、场景关联测试计划无效
修复接口关联测试计划、场景关联测试计划无效,测试计划里找不到数据的问题
2020-12-23 15:15:39 +08:00
chenjianxing
ae42f30ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 14:42:12 +08:00
chenjianxing
847585e427 feat: 测试计划-报告统计 2020-12-23 14:40:31 +08:00
chenjianxing
9c199766b0 feat: 测试计划-统计报告 2020-12-23 14:38:36 +08:00
fit2-zhao
5299e251d7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 13:12:22 +08:00
fit2-zhao
4e01bf5af3 fix(接口自动化): 外部导入和执行重构去除域名部分 2020-12-23 13:11:56 +08:00
Captain.B
781d27453a fix: 只读用户不能执行创建、修改、删除等操作 2020-12-23 12:28:23 +08:00
q4speed
fec5cf30f0 Merge remote-tracking branch 'origin/master' 2020-12-23 10:57:59 +08:00
q4speed
f1dcd2191a fix(接口测试): 修复条件控制器添加后无法正确显示的bug 2020-12-23 10:57:41 +08:00
Captain.B
6a2229d98c fix: 只读用户不能删除测试报告 2020-12-23 10:25:38 +08:00
Captain.B
6baf28bed3 Merge remote-tracking branch 'origin/master' into master 2020-12-23 10:20:52 +08:00
Captain.B
fe4220897b fix: 只读用户权限设置 2020-12-23 10:20:13 +08:00
song.tianyang
3c2dae7b8c fix: 修复首页数据统计-运行中的任务不显示场景定时任务的问题
修复首页数据统计-运行中的任务不显示场景定时任务的问题
2020-12-23 10:13:05 +08:00
chenjianxing
2581666165 fix: 解决冲突 2020-12-22 20:58:27 +08:00
chenjianxing
5a076ed70f fix: 测试计划关联多个项目接口列表出错 2020-12-22 20:55:05 +08:00
song.tianyang
128f98849c Merge remote-tracking branch 'origin/master' 2020-12-22 20:12:02 +08:00
song.tianyang
b060bcb389 fix(接口测试功能首页): 修复tips不随机更换、数据统计的缺陷
修复tips不随机更换的缺陷,改为每次进入页面随机更换tips;修复接口用例数量统计:未覆盖+已覆盖总数超过了接口总数的错误;修复统计已删除至回收站中的接口的错误;修复首页数据每次都要刷新浏览器才更新数据的错误
2020-12-22 20:11:52 +08:00
fit2-zhao
c4197029f7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 20:02:56 +08:00
fit2-zhao
8ed6857960 fix(接口自动化): 修复部分缺陷 2020-12-22 20:02:37 +08:00
song.tianyang
cac54095aa Merge remote-tracking branch 'origin/master' 2020-12-22 19:04:29 +08:00
song.tianyang
4552b58b0c feat(接口自动化): 增加定时任务功能
为场景增加定时任务功能,功能位置放于场景表格每一行都"操作"处
2020-12-22 19:03:52 +08:00
fit2-zhao
8e7b1f7489 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 17:43:02 +08:00
fit2-zhao
93914ed5b6 fix(接口自动化): 修复场景引用缺陷 2020-12-22 17:42:53 +08:00
chenjianxing
9ecb428004 fix: 解决冲突 2020-12-22 17:35:29 +08:00
chenjianxing
471f88aac6 feat: 接口测试关联场景用例 2020-12-22 17:27:30 +08:00
Captain.B
bb3845e28f Merge remote-tracking branch 'origin/master' into master 2020-12-22 17:17:06 +08:00
Captain.B
2face9c83a feat: 资源池支持image 2020-12-22 17:16:55 +08:00
fit2-zhao
41d063fde7 refactor(接口自动化): 重构标签 2020-12-22 17:07:50 +08:00
fit2-zhao
ef2412a3e2 feat(接口自动化): 标签定义 2020-12-22 16:49:47 +08:00
Captain.B
126430b18f refactor: 显示avgTransactions 2020-12-22 16:31:19 +08:00
fit2-zhao
6b83a68db2 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
2020-12-22 14:08:52 +08:00
fit2-zhao
5b6a4ddd82 fix(接口自动化):修复部分缺陷,合并sql 脚本 2020-12-22 14:05:53 +08:00
song.tianyang
fd554c2098 refactor: 更改不规范的包命名
更改不规范的包命名
2020-12-22 14:01:45 +08:00
song.tianyang
4cc1fc0935 Merge remote-tracking branch 'origin/master' 2020-12-22 13:58:01 +08:00
song.tianyang
23e65450c7 fix: 首页数据统计错误
修复首页-接口数量统计-未开始接口的统计错误
2020-12-22 13:57:35 +08:00
Captain.B
dcc1df4133 refactor: 测试报告日志查询修改 2020-12-22 12:00:03 +08:00
fit2-zhao
41146ad7d1 fix(接口自动化):修复执行缺陷 2020-12-22 10:12:24 +08:00
chenjianxing
ecfb1cf2fe refactor: 代码整理 2020-12-21 21:46:15 +08:00
chenjianxing
642de28841 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:38:04 +08:00
chenjianxing
434bf22bd9 fix: 解决冲突 2020-12-21 19:37:49 +08:00
fit2-zhao
045681c68a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:28:25 +08:00
fit2-zhao
3d302ac30b fix(接口自动化):修复DUBBO 协议执行缺陷 2020-12-21 19:28:06 +08:00
chenjianxing
ab7b06296f fix: 解决冲突 2020-12-21 19:25:46 +08:00
song.tianyang
c24aac4103 fix(修改接口覆盖率统计错误的问题): 修改接口覆盖率统计错误的问题
修改接口覆盖率统计错误的问题
2020-12-21 19:12:47 +08:00
song.tianyang
2136b6bea0 fix(测试环境与开发环境不一样引起的报错问题): 解决测试环境与开发环境不一样引起的报错问题
修改SQL,暂时改为不统计场景案例。待场景案例功能上线之后再进行修改
2020-12-21 19:07:51 +08:00
chenjianxing
1b8291bf0d fix: 解决冲突 2020-12-21 18:22:22 +08:00
song.tianyang
5cbbb73405 Merge remote-tracking branch 'origin/master' 2020-12-21 18:19:31 +08:00
song.tianyang
5b0be270d2 refactor(接口测试功能首页): 接口测试首页样式及统计数据更换
接口测试首页由于更换了样式、展示数据等,重新开发该页面的
2020-12-21 18:19:13 +08:00
chenjianxing
8090c2d700 feat: 测试计划接口用例关联 2020-12-21 18:05:19 +08:00
fit2-zhao
99819b6163 fix(接口自动化):修复共享cookie 问题 2020-12-21 17:54:58 +08:00
Captain.B
4c716a0946 Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-21 16:58:52 +08:00
Captain.B
9630fabfa2 fix: 执行job前设置namespace 2020-12-21 16:58:21 +08:00
fit2-zhao
7f8f571ed4 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-21 16:14:35 +08:00
fit2-zhao
de06ed0432 feat(接口自动化): 存储过程执行报告 2020-12-21 16:13:33 +08:00
Captain.B
51142905ad Merge remote-tracking branch 'origin/master' into master 2020-12-21 16:11:03 +08:00
Captain.B
fc660b6c2c refactor: 设置资源池,校验资源池修改 2020-12-21 15:25:44 +08:00
Captain.B
a46b2c83e3 refactor: 重构传递测试文件的方式 2020-12-21 15:04:18 +08:00
Captain.B
be95c69af5 refactor: 重构传递测试文件的方式 2020-12-21 15:03:41 +08:00
wenyann
421492cb51 fix:修改测试计划下用例sql 2020-12-21 14:33:26 +08:00
Captain.B
db472877b4 chore: Sync 2020-12-21 09:46:11 +08:00
fit2-zhao
d0552b63e4 feat(接口自动化): 共享cookie 2020-12-18 19:44:15 +08:00
fit2-zhao
23f0c5d116 feat(接口自动化): 共享cookie 2020-12-18 19:43:50 +08:00
fit2-zhao
419d5b2129 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 18:42:34 +08:00
fit2-zhao
460c1dc976 fix(接口自动化): form -data 格式执行缺陷修复 2020-12-18 18:42:16 +08:00
wenyann
7e2c7fd5aa Merge remote-tracking branch 'origin/master' 2020-12-18 17:43:25 +08:00
wenyann
6e13f0b85b fix:修复测试计划空指针异常 2020-12-18 17:42:49 +08:00
Captain.B
80eaf15b1f chore: Sync 2020-12-18 17:27:46 +08:00
fit2-zhao
ee9c1ba153 fix(接口自动化): 场景步骤权限控制 2020-12-18 16:37:27 +08:00
fit2-zhao
55c26387dd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 14:31:27 +08:00
fit2-zhao
fdc408bfbf fix(接口自动化): 修复导入场景缺陷 2020-12-18 14:31:04 +08:00
Captain.B
92a7460eee refactor: 设置临时的 test 配置 2020-12-18 14:24:05 +08:00
Captain.B
59f8f5106e Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-18 13:25:07 +08:00
Captain.B
2cebe9763e refactor: 设置limit执行多个job 2020-12-18 13:22:16 +08:00
fit2-zhao
a59238d93c fix(接口自动化): 修复场景步骤移除缺陷 2020-12-18 12:46:09 +08:00
Captain.B
d03b242701 chore: Sync 2020-12-18 11:15:01 +08:00
fit2-zhao
3db39fb276 fix(接口自动化): 修复回收站恢复缺陷 2020-12-18 10:28:28 +08:00
Captain.B
62f52fba18 chore: Sync 2020-12-18 10:02:35 +08:00
fit2-zhao
97e5549bc1 fix(接口自动化): 修复执行缺陷 2020-12-17 19:27:01 +08:00
fit2-zhao
b781ecaaf3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 19:01:03 +08:00