Commit Graph

2134 Commits

Author SHA1 Message Date
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
fit2-zhao f0d45a9aa0 fix(接口自动化): 修复组件缺陷 2020-12-17 19:00:39 +08:00
Captain.B 4eb155362e refactor: 设置limit执行多个job 2020-12-17 18:54:20 +08:00
Captain.B da6b3382ff Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-17 18:52:42 +08:00
song.tianyang 62d1522dc6 Merge remote-tracking branch 'origin/master' 2020-12-17 18:48:26 +08:00
Captain.B bbfb7987a2 refactor: 设置limit执行多个job 2020-12-17 18:48:04 +08:00
song.tianyang 5539df37b9 refactor: 重构统计SQL书写位置
将统计SQL书写位置挪至由{table}Mapper挪至Ext{table}Mapper
2020-12-17 18:47:52 +08:00
fit2-zhao 3a7c731376 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
2020-12-17 18:39:58 +08:00
fit2-zhao 689be330f0 fix(接口定义): 修复部分缺陷 2020-12-17 18:33:34 +08:00
fit2-zhao 310756d5f7 fix(接口定义): 修复部分缺陷 2020-12-17 18:32:54 +08:00
Captain.B fef2bc7e8a Merge remote-tracking branch 'origin/master' into master 2020-12-17 18:02:16 +08:00
Captain.B fa269fde93 refactor: k8s 环境变量 2020-12-17 18:01:41 +08:00
song.tianyang 66c01949af feat: 接口测试模块-首页页面展示以及后台接口适配
接口测试模块-首页开发,包含接口、用例、场景、定时任务、失败案例和运行中任务等功能的开发
2020-12-17 17:37:19 +08:00
song.tianyang 7707f9902d feat: 接口测试模块-首页开发Service方法
接口测试模块-首页开发,包含接口、用例、场景、定时任务、失败案例和运行中任务等功能的开发
2020-12-17 17:35:27 +08:00
fit2-zhao e05657fe11 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:47:36 +08:00
fit2-zhao 9482d72783 fix(接口定义): 修复部分缺陷 2020-12-17 16:47:18 +08:00
q4speed 4c1f6bb985 fix(接口测试): 修复dubbo测试报告一直不能完成的bug 2020-12-17 16:27:21 +08:00
shiziyuan9527 3f59ca5928 feat(测试跟踪): 测试用例添加评论 2020-12-17 15:35:16 +08:00
chenjianxing ba689c3e27 feat: 接口测试用例关联页面 2020-12-17 15:28:33 +08:00
chenjianxing f377bd251a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 14:34:17 +08:00
chenjianxing 173b7ef59d feat: 接口定义与接口用例切换 2020-12-17 14:33:59 +08:00
fit2-zhao 9d9f949414 fix(接口定义): 模块移动处理 2020-12-17 14:11:20 +08:00
BugKing cca4e4f129 refactor: 修改版本号 2020-12-17 12:55:56 +08:00
fit2-zhao 1c184a3865 fix(接口定义): 修复部分缺陷 2020-12-17 12:15:20 +08:00
shiziyuan9527 76edbbd917 fix: 修复删除项目缺陷 2020-12-17 10:58:51 +08:00
fit2-zhao 45e1ecb9fa fix(接口自动化): 部分缺陷修复 2020-12-16 19:23:30 +08:00
Captain.B 614bcaaf15 chore: Sync 2020-12-16 18:11:58 +08:00
fit2-zhao 56d8d66e92 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 17:33:42 +08:00
fit2-zhao 8ac28a233f fix(接口自动化): 修复场景复制缺陷 2020-12-16 17:30:47 +08:00
chenjianxing 992b367f53 fix: 解决冲突 2020-12-16 17:04:45 +08:00
chenjianxing 7d1296b6d0 refactor: 重构apicaselist 2020-12-16 17:01:31 +08:00
fit2-zhao 3d1b39e592 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 16:38:03 +08:00
fit2-zhao ee82f669c3 refactor(接口定义): 接口执行历史保留 2020-12-16 16:37:42 +08:00
shiziyuan9527 d4f28df3b9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 15:44:09 +08:00
wenyann 98459d6d5e fix:placeholder 2020-12-16 14:44:08 +08:00
shiziyuan9527 62b02eeb81 refactor: 删除无用代码 2020-12-16 14:38:13 +08:00
fit2-zhao a73b202551 feat(接口自动化): 增加外部导入到场景功能 2020-12-16 14:27:35 +08:00
fit2-zhao 86c6254d48 feat(接口自动化): 增加外部导入到场景功能 2020-12-16 14:14:00 +08:00
fit2-zhao 0ff2be302d feat(接口定义): 增加批量方法 2020-12-16 13:01:39 +08:00
chenjianxing 884fc213dd fix: 接口自动化报错 2020-12-15 20:42:06 +08:00
chenjianxing 1344e94e94 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 20:22:07 +08:00
chenjianxing 5d29fc6730 fix: 测试计划用例列表报错 2020-12-15 20:21:52 +08:00
wenyann 804b264acd fix:x-pack 2020-12-15 19:10:31 +08:00
chenjianxing 07d3ae45d0 refactor: 接口自动化模块树重构 2020-12-15 18:17:23 +08:00
fit2-zhao cdbaa1c208 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 14:22:05 +08:00
fit2-zhao c85cd23fc0 fix(接口自动化): 部分缺陷修复 2020-12-15 14:21:13 +08:00
wenyann df142d65f4 fix: 修复嵌套弹出框被遮罩层挡住 2020-12-15 14:18:05 +08:00
Captain.B 23aaaa54ba Merge remote-tracking branch 'origin/master' into master 2020-12-15 13:57:25 +08:00
Captain.B e32ff12d22 refactor: 使用k8s资源池 2020-12-15 13:56:23 +08:00
fit2-zhao f51af8a0ff Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 11:43:35 +08:00
fit2-zhao 236a9241d8 feat(接口自动化): 添加执行操作 2020-12-15 11:43:14 +08:00
Captain.B 7377fd530b refactor: 增加日志 2020-12-15 11:09:58 +08:00
Captain.B 5554db1959 chore: 同步模块 2020-12-15 10:47:58 +08:00
chenjianxing 27c18ef8a3 refactor:模块树后端重构: 2020-12-15 10:32:11 +08:00
BugKing 06a45cbbda fix: 修复查看已有性能测试 SQL 问题 2020-12-14 18:06:55 +08:00
fit2-zhao fd3c8052fc fix(接口定义): 修复执行相关缺陷 2020-12-14 17:35:16 +08:00
Captain.B 3314483424 Merge remote-tracking branch 'origin/master' into master 2020-12-14 17:01:10 +08:00
Captain.B a5a8f94cbe fix: 指定注入的 rest template 2020-12-14 17:00:51 +08:00
fit2-zhao 6254ed1fea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:58:00 +08:00
fit2-zhao 82248b22da fix(接口定义): 修改Tree 样式问题 2020-12-14 16:57:42 +08:00
Captain.B f1f7472758 Merge remote-tracking branch 'origin/master' into master 2020-12-14 16:15:32 +08:00
Captain.B f10b154a8a fix: 指定注入的 rest template 2020-12-14 16:14:45 +08:00
fit2-zhao 6672c7756e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:08:15 +08:00
fit2-zhao 97db3909e8 fix(接口定义): 批量更新完成 2020-12-14 16:07:48 +08:00
Captain.B 6eb0a46edd Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-14 15:39:25 +08:00
Captain.B 723d5aa462 fix: 修复开源版显示图片的问题 2020-12-14 15:38:38 +08:00
fit2-zhao 1efe5b0c2d fix(接口定义): 部分缺陷修复 2020-12-14 14:35:32 +08:00
fit2-zhao cd16ed684b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 12:21:50 +08:00
fit2-zhao 469802030c fix(接口定义): 部分缺陷修复 2020-12-14 12:19:35 +08:00
Captain.B e071f33dbd feat(性能测试-xPack): 增加k8s资源池 2020-12-14 11:42:07 +08:00
fit2-zhao 9ff168a539 feat(接口自动化): 统一报告头 2020-12-11 18:24:25 +08:00
fit2-zhao 2d381a14fb feat(接口自动化): 统一执行方式 2020-12-11 18:10:18 +08:00
fit2-zhao a3cfeaca6c feat(接口自动化): 添加请求参数 2020-12-11 14:24:55 +08:00
chenjianxing df6b6da40f fix: 解决冲突 2020-12-11 12:51:04 +08:00
Captain.B e9d5c8b9d2 fix: 修复邮件配置smtps时的错误 2020-12-11 11:37:38 +08:00
shiziyuan9527 f399ba2885 feat(接口测试): 资源按照项目查询 2020-12-11 10:50:43 +08:00