test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,943 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

2505 Commits

Author SHA1 Message Date
Captain.B 473d279817 fix: 修改枚举使用不当的问题 2021-01-13 14:41:47 +08:00
fit2-zhao 193a212e09 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 14:41:07 +08:00
fit2-zhao 57beb94ada fix(接口自动化): 修复数据迁移后无法编辑问题 2021-01-13 14:40:38 +08:00
Captain.B f8785d06ab fix: 通过apikey登陆使用local realm 2021-01-13 14:13:15 +08:00
Captain.B 9921489cc4 Merge remote-tracking branch 'origin/master' 2021-01-13 14:00:39 +08:00
Captain.B 8e70eefe3c refactor: 接收测试结束的通知 2021-01-13 14:00:19 +08:00
fit2-zhao f0acc7c392 fix(接口定义): 修复参数提取 空指针问题 2021-01-13 13:43:44 +08:00
fit2-zhao a0312d1025 refactor(接口定义): 重构接口执行提取参数方法 2021-01-13 13:19:45 +08:00
wenyann a2ff38a10f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 11:37:22 +08:00
chenjianxing 1ec251c65a refactor: 测试用例列表页面优化 2021-01-13 11:20:27 +08:00
wenyann 2639e2a266 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-13 10:46:02 +08:00
wenyann 7d33f66a26 fix: 添加测试环境，查询测试计划下性能测试 2021-01-13 10:40:46 +08:00
fit2-zhao d72edc7b33 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 18:52:19 +08:00
fit2-zhao 96900cd1f4 refactor(接口自动化): 执行代码优化 2021-01-12 18:51:55 +08:00
shiziyuan9527 17ecef469b feat(测试计划): 统计报告新增性能测试用例饼图 2021-01-12 18:08:40 +08:00
fit2-zhao 5d96c71d06 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:54:38 +08:00
fit2-zhao a46f3cfbba fix(测试跟踪): 测试用例XMIND导入，重复内容更新 2021-01-12 15:53:12 +08:00
shiziyuan9527 9e52669a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:41:45 +08:00
shiziyuan9527 30b3f83725 feat(测试计划): 性能测试用例展示ID列 2021-01-12 15:41:14 +08:00
Captain.B 4233af67e9 Merge remote-tracking branch 'origin/master' 2021-01-12 15:39:52 +08:00
Captain.B e2048ef969 fix: 修复普通用户查询所有角色列表的bug 
Closes #1090
 2021-01-12 15:39:20 +08:00
shiziyuan9527 4cef65d9f8 feat(性能测试): 测试列表添加ID列 2021-01-12 15:22:08 +08:00
Captain.B 67a9e1588e feat: 配置认证源 2021-01-12 15:12:10 +08:00
Captain.B d7dbcf0860 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/xpack
 2021-01-12 15:09:04 +08:00
Captain.B c3673be342 feat: 配置认证源 2021-01-12 15:08:07 +08:00
fit2-zhao 5b60ac942c fix(接口定义): 修复模块移动缺陷 2021-01-12 14:58:30 +08:00
fit2-zhao a1eac0996f feat(接口自动化): 修复部分缺陷 2021-01-12 14:51:15 +08:00
fit2-zhao 86b19b68fc feat(接口自动化): 报告优化 2021-01-12 11:16:46 +08:00
fit2-zhao e451248e25 fix(接口自动化): 冲突合并 2021-01-12 09:33:44 +08:00
fit2-zhao a023b85f99 fix(接口自动化): 冲突合并 2021-01-11 19:00:47 +08:00
fit2-zhao 93d57b7d1f fix(接口自动化): 修复测试报告，按照场景展示 2021-01-11 18:50:12 +08:00
chenjianxing 5781cc7b1e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 18:14:48 +08:00
chenjianxing 07b500331d feat: 接口定义TCP 2021-01-11 18:14:35 +08:00
fit2-zhao 6b57e3a3e2 fix(接口自动化): 所有高级搜索增加TAGS 2021-01-11 15:54:49 +08:00
fit2-zhao 869b66e551 fix(接口自动化): 修复JSON 格式数据请求问题 2021-01-11 15:11:24 +08:00
Captain.B 2564c81302 Merge remote-tracking branch 'origin/master' 2021-01-11 14:19:25 +08:00
Captain.B d64691fe9a refactor: 性能测试表头优化 2021-01-11 14:08:48 +08:00
fit2-zhao b542049389 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 13:47:29 +08:00
fit2-zhao 489b2b8f10 feat(接口定义): 高级查询 2021-01-11 13:46:56 +08:00
Captain.B a00334acf3 fix: 修复查询个人信息时越权的问题 
Closes #1089
 2021-01-11 11:38:24 +08:00
shiziyuan9527 313fb0a244 feat(测试计划): 性能测试用例执行结果 2021-01-08 18:13:47 +08:00
Captain.B e9482b3ecb Merge remote-tracking branch 'origin/master' 2021-01-08 18:05:11 +08:00
Captain.B f84d373020 fix: 修复共享变量导致通知不能发送 2021-01-08 18:04:35 +08:00
fit2-zhao f22a917f12 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 17:54:16 +08:00
fit2-zhao a57e07bba5 feat(接口自动化): 完成场景变量 2021-01-08 17:54:09 +08:00
fit2-zhao fe74a26fd2 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-01-08 17:53:45 +08:00
Captain.B 3a26a9cfbc fix: 修复个人信息设置功能的bug 
Closes #1087
 2021-01-08 17:46:43 +08:00
Captain.B ddd640c7c1 fix: 修复个人信息设置功能的bug 
Closes #1087
 2021-01-08 17:44:29 +08:00
Captain.B 7cd5d8c661 refactor: 性能测试执行前检查资源池的状态 2021-01-08 16:08:47 +08:00
fit2-zhao 30762dae9f feat(接口自动化): 完成场景变量基础存储功能 2021-01-08 15:54:45 +08:00
Captain.B 1c385a991f Merge remote-tracking branch 'origin/master' 2021-01-08 15:22:56 +08:00
Captain.B e98d1eee56 refactor: 接口测试用例列表表头优化 2021-01-08 15:22:37 +08:00
chenjianxing 46736b254f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 14:52:34 +08:00
chenjianxing 2286f66e0c fix: 解决冲突 2021-01-08 14:50:24 +08:00
Captain.B d37ae32045 refactor: 接口列表表头优化 2021-01-08 14:43:06 +08:00
chenjianxing c62adcfc32 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-08 14:42:17 +08:00
chenjianxing aa53e696cc fix: swagger2.0 导入失败 2021-01-08 14:40:07 +08:00
shiziyuan9527 2f8d0e9163 feat(测试计划): 批量取消性能测试用例关联 2021-01-08 14:20:04 +08:00
fit2-zhao 7c3b718863 fix(接口定义): 冲突合并 2021-01-08 13:49:58 +08:00
fit2-zhao ff0b258785 fix(接口定义): 修复用例最后结果统计问题 2021-01-08 13:37:57 +08:00
Captain.B ed819b4710 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-08 13:37:18 +08:00
Captain.B 67c71ff01a refactor: 统一显示标签 2021-01-08 13:35:43 +08:00
fit2-zhao c291de3292 feat(接口自动化): 场景变量处理 2021-01-08 13:29:00 +08:00
shiziyuan9527 a8a9664070 feat(测试计划): 取消项目关联时取消性能测试用例关联 2021-01-08 11:36:41 +08:00
wenyann 019135b947 fix: 修复测试计划不全问题 2021-01-08 10:42:39 +08:00
shiziyuan9527 a2856898d6 refactor(测试计划): 性能测试用例按照项目查询 2021-01-07 18:57:12 +08:00
Captain.B 73f09844bb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-01-07 17:57:20 +08:00
Captain.B 460b4daff6 feat: 显示标签列 2021-01-07 17:53:36 +08:00
shiziyuan9527 0e1b379b67 feat(测试计划): 性能测试用例执行 2021-01-07 17:17:44 +08:00
Captain.B a2c1baece6 feat: 测试用例保存tag 2021-01-07 16:03:02 +08:00
song.tianyang a70b8b31ab refactor: 合并分支 feature_1000439 解决冲突 
合并分支 feature_1000439 解决冲突
 2021-01-07 15:26:20 +08:00
Captain.B 18340d16e5 feat: 接口测试用例保存tag 2021-01-07 15:18:52 +08:00
Captain.B 590e6c9a9c Merge remote-tracking branch 'origin/master' 2021-01-07 14:07:42 +08:00
song.tianyang 1909c4267f Merge branch 'feature_1000439' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
 2021-01-07 14:06:26 +08:00
Captain.B c609ce254f feat: 接口定义保存tag 2021-01-07 14:04:21 +08:00
song.tianyang 2ebdaf6832 Merge remote-tracking branch 'origin/master' 2021-01-07 13:42:23 +08:00
song.tianyang d208d358be feat: 测试计划增加定时任务,执行接口案例和场景案例 
测试计划增加定时任务,执行接口案例和场景案例
 2021-01-07 13:41:54 +08:00
shiziyuan9527 555d60fb07 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 11:10:53 +08:00
shiziyuan9527 657d800536 feat(测试计划): 测试计划增加性能测试用例 2021-01-07 11:10:19 +08:00
fit2-zhao cfa70bb622 fix(接口自动化): 修复http 协议输入参数无名称 校验 2021-01-07 10:47:28 +08:00
fit2-zhao 3bb9d4c8f1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 10:42:33 +08:00
fit2-zhao c0fb16571a fix(接口自动化): 解决sql类型数据源 无法回显问题，并对历史数据进行兼容 2021-01-07 10:41:57 +08:00
shiziyuan9527 87a074310f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 10:22:59 +08:00
chenjianxing edf8eaed08 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 19:22:29 +08:00
chenjianxing 5f0a802114 Merge branch 'v1.6' 2021-01-06 19:20:31 +08:00
fit2-zhao 540aba788c fix(接口自动化): 修复数据迁移缺陷 2021-01-06 18:55:25 +08:00
fit2-zhao 4dfaa1c463 fix(接口自动化): 修复数据迁移，sql类型数据源丢失问题 2021-01-06 18:34:17 +08:00
fit2-zhao d1c179fc5c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 18:27:10 +08:00
fit2-zhao f096e1e52b feat(接口自动化): 循环控制器 2021-01-06 18:26:52 +08:00
chenjianxing e012d43889 fix: 断言正确空指针 2021-01-06 18:21:25 +08:00
shiziyuan9527 42217eb1c6 feat(测试计划): 增加性能测试用例 2021-01-06 18:14:47 +08:00
chenjianxing 32b8f17ba0 fix: 断言正确时获取不到请求结果 2021-01-06 18:10:48 +08:00
chenjianxing 625085c0a6 fix: swagger3 空指针 2021-01-06 17:10:42 +08:00
chenjianxing 5770f91e92 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 17:04:39 +08:00
chenjianxing 7788f4d53d Merge branch 'v1.6' 2021-01-06 17:04:17 +08:00
chenjianxing 1566f8c79b fix: 修改模块名称报错 2021-01-06 16:31:27 +08:00
chenjianxing 9cb5c64925 refactor: v1.6 2021-01-06 16:21:26 +08:00
Captain.B c6ceea74ab refactor: 设置rps时长 2021-01-06 16:14:11 +08:00
Captain.B 9bd8a55f2e chore: Sync 2021-01-06 15:26:47 +08:00
chenjianxing d41560b705 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-06 15:13:40 +08:00