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

3234 Commits

Author SHA1 Message Date
fit2-zhao 3ea76df748 feat(接口自动化): 场景变量页面i18n 提示优化 2021-01-08 18:32:24 +08:00
shiziyuan9527 313fb0a244 feat(测试计划): 性能测试用例执行结果 2021-01-08 18:13:47 +08:00
BugKing fb681bf9b3 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-01-08 17:56:09 +08:00
BugKing f541a70235 fix(系统设置): 修复项目列表环境管理按钮丢失问题 2021-01-08 17:54:18 +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
chenjianxing 9723f85c46 fix: 解决冲突 2021-01-08 17:16:32 +08:00
chenjianxing 5465d9cf64 feat: 场景添加jsonpath功能 2021-01-08 17:12:06 +08:00
shiziyuan9527 2bba395f40 refactor(测试计划): 性能测试用例执行优化 2021-01-08 16:18:37 +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 a7bc099305 refactor: 全选按钮样式 2021-01-08 15:18:04 +08:00
chenjianxing 46736b254f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 14:52:34 +08:00
chenjianxing e188bb203f refactor: 固定场景保存按钮 2021-01-08 14:51:38 +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
shiziyuan9527 2f8d0e9163 feat(测试计划): 批量取消性能测试用例关联 2021-01-08 14:20:04 +08:00
chenjianxing 5cbaeb06c4 refactor: 接口用例和接口自动化页面全选框样式 2021-01-08 14:12:25 +08:00
fit2-zhao 7c3b718863 fix(接口定义): 冲突合并 2021-01-08 13:49:58 +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
shiziyuan9527 963156a969 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 11:34:24 +08:00
chenjianxing 252f26ae61 fix: 接口列表tag报错 2021-01-08 11:13:50 +08:00
chenjianxing 0ab925251c feat: 添加jsonpath提取推荐 2021-01-08 11:05:35 +08:00
shiziyuan9527 0caf64769a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 10:22:58 +08:00
chenjianxing 529a8b74ac Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 19:34:13 +08:00
chenjianxing 37da6206ea feat: jsonpaht断言推荐 2021-01-07 19:34:00 +08:00
shiziyuan9527 a2856898d6 refactor(测试计划): 性能测试用例按照项目查询 2021-01-07 18:57:12 +08:00
fit2-zhao f70e241602 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 18:32:48 +08:00
fit2-zhao 1852c8296f fix(接口自动化): 场景变量基础页面完成 2021-01-07 18:32:41 +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 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
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
shiziyuan9527 42217eb1c6 feat(测试计划): 增加性能测试用例 2021-01-06 18:14:47 +08:00
Captain.B 9bd8a55f2e chore: Sync 2021-01-06 15:26:47 +08:00
Captain.B f02477ce05 Merge remote-tracking branch 'origin/master' 2021-01-06 15:11:32 +08:00
Captain.B a71f4a6610 Merge branch 'tmp' 2021-01-06 15:10:42 +08:00
Captain.B 5952b01646 refactor: 按照迭代次数和执行时间区分性能测试 2021-01-06 14:59:35 +08:00
fit2-zhao 3789365746 feat(接口自动化): 循环控制器 2021-01-06 14:49:33 +08:00
fit2-zhao 5ec2e11ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:19:11 +08:00
chenjianxing baea09fcae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:05:47 +08:00
chenjianxing d2fd83389c fix: 解决冲突 2021-01-06 14:01:21 +08:00
fit2-zhao 643db9c863 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
 2021-01-06 13:49:43 +08:00
fit2-zhao f810d15bfb style(系统管理): 样式调整 2021-01-06 13:45:23 +08:00
fit2-zhao 624970c16d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 
# Conflicts:
#	frontend/src/business/components/settings/project/MsProject.vue
 2021-01-06 13:43:30 +08:00
fit2-zhao 09fd2c2ab6 feat(接口自动化): 增加URL唯一性校验开关，控制URL校验规则 2021-01-06 13:38:17 +08:00
chenjianxing f01c7f9d59 refator: 项目列表添加jar包上传 2021-01-06 13:35:27 +08:00
fit2-zhao fc8c997716 feat(接口自动化): 数据迁移初版 2021-01-06 12:24:13 +08:00
song.tianyang 5f26ee9e26 Merge remote-tracking branch 'origin/master' 2021-01-06 10:18:10 +08:00
song.tianyang 9b22917e8c fix: 首页跳转场景修改页面控制套报错 
修复首页跳转场景修改页面控制套报错的问题
 2021-01-06 10:17:55 +08:00
Captain.B e937b3d949 Merge remote-tracking branch 'origin/master' 2021-01-06 10:04:52 +08:00
Captain.B f3dc01d3a9 Merge branch 'v1.6' 2021-01-06 10:04:27 +08:00
song.tianyang b402acfeda fix: 场景跳转数据查询功能失效 
修复场景跳转数据查询功能失效的问题
 2021-01-05 18:20:51 +08:00
song.tianyang 252f5f3c10 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-05 18:05:46 +08:00
song.tianyang 9a32e83a01 feat: 接口测试首页优化 
接口测试首页优化
 2021-01-05 17:43:55 +08:00
wenyann 2d609fded2 Merge remote-tracking branch 'origin/master' 2021-01-05 17:37:13 +08:00
wenyann 1a43a1605a fix: 更换jenkins查询测试计划接口 2021-01-05 17:32:28 +08:00
chenjianxing 2a605a77c0 refactor: 去掉测试接口用例添加到测试计划按钮 2021-01-05 16:21:13 +08:00
chenjianxing e8afbf3cb5 refactor: 全选框样式优化 2021-01-05 16:00:25 +08:00
chenjianxing 606a8fb38e fix: 关联用例小屏适配 2021-01-05 16:00:11 +08:00
chenjianxing 1f51cb63e0 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:40:33 +08:00
chenjianxing 37acc581f2 refactor: 全选框样式优化 2021-01-05 15:40:02 +08:00
fit2-zhao b65c79424b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:34:31 +08:00
chenjianxing c39e71b626 fix: 关联用例小屏适配 2021-01-05 15:22:21 +08:00
chenjianxing 6e7560cf6a Merge branch 'v1.6' 2021-01-05 15:11:53 +08:00
fit2-zhao 25caf3c48e fix(接口定义): url 规范问题修改 2021-01-05 14:43:02 +08:00
shiziyuan9527 b824302acf feat(测试计划): 接口测试用例页面添加ID列 2021-01-05 14:27:47 +08:00
fit2-zhao 1e6b252d12 feat(接口定义): 增加批量修改用例信息功能 2021-01-05 14:23:13 +08:00
wenyann d984b2f08a Merge remote-tracking branch 'origin/master' 2021-01-05 14:21:01 +08:00
wenyann 5aa46f6656 feat: 添加邮件测试 2021-01-05 14:20:32 +08:00
chenjianxing af8b6e4ae0 fix: 测试计划自报告自定义表格样式问题 2021-01-05 13:44:55 +08:00
Captain.B 9fc151f6e2 chore: Sync 2021-01-05 12:59:03 +08:00
fit2-zhao 554af29606 refactor(接口定义): 增加JSON-SCHEMA开关 2021-01-05 12:46:07 +08:00
fit2-zhao 02c99498e7 refactor(接口定义): 规范JSON控件的i18n 2021-01-05 10:08:45 +08:00
chenjianxing 6b076416fb fix: 旧版复制请求，文件上传参数同步修改问题 2021-01-05 10:05:17 +08:00
fit2-zhao 4fb1a6319a Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2021-01-05 09:34:02 +08:00
chenjianxing 24e89b5b3c refactor: 测试计划关联页面优化 2021-01-04 19:46:48 +08:00
chenjianxing e7d489a469 fix: python脚本无法使用 2021-01-04 19:15:16 +08:00
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing 29cc8caff3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-04 18:05:50 +08:00
chenjianxing 1fede9b66b refactor: 封装全选组件 2021-01-04 15:56:31 +08:00
shiziyuan9527 ad597dcd79 fix: 修复菜单组件会重复监听事件的问题 2021-01-04 15:44:38 +08:00