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

2594 Commits

Author SHA1 Message Date
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
chenjianxing f9f5ff86bd refactor: postman导入优化 2021-01-06 15:13:21 +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 b2e619e355 fix(接口定义): DUBBO执行缺陷修复 2021-01-06 14:52:32 +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
fit2-zhao 59de447719 feat(接口自动化): 数据迁移 2021-01-06 14:18:51 +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
chenjianxing cc3006b9a1 refactor: 增加测试用例名称长度 2021-01-06 13:54:02 +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 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
fit2-zhao fc8c997716 feat(接口自动化): 数据迁移初版 2021-01-06 12:24:13 +08:00
chenjianxing e975dcbc18 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-06 12:04:40 +08:00
chenjianxing 55e8d9fec6 refactor: 导入接口到指定目录下 2021-01-06 12:04:21 +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
Captain.B d89de179b3 fix: 修复下载文件时文件名没有解析的bug 2021-01-06 10:03:07 +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 7f8478d904 fix: 添加dto用于生成jmx 
添加dto用于生成jmx
 2021-01-05 17:50:56 +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 2c2f8b8476 fix: 删除测试计划报错 2021-01-05 16:29:07 +08:00
ronghuaxiang 730f7452cd Update JMeterVars.java (#981) 
解决使用JSONPath的$..xx的语法匹配多个值时，提取出来的值不应该只有一个，
解决多值匹配时候变量无法传递问题

Co-authored-by: xiangronghua <xiangronghua@163.com>
 2021-01-05 16:00:54 +08:00
chenjianxing e927b1e6ac fix: swagger 名称为空报错 2021-01-05 15:59:27 +08:00
chenjianxing a259db45bc fix: swagger 名称为空报错 2021-01-05 15:58:01 +08:00
fit2-zhao b65c79424b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:34:31 +08:00
fit2-zhao 7e4ad2384a fix(接口自动化): 场景批量执行，无步骤的场景跳过，正常的继续执行 2021-01-05 15:33:47 +08:00
chenjianxing 6e7560cf6a Merge branch 'v1.6' 2021-01-05 15:11:53 +08:00
ronghuaxiang 62a82dbf04
Update JMeterVars.java (#981) 
解决使用JSONPath的$..xx的语法匹配多个值时，提取出来的值不应该只有一个，
解决多值匹配时候变量无法传递问题

Co-authored-by: xiangronghua <xiangronghua@163.com>
 2021-01-05 14:50:55 +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
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
chenjianxing 83da070040 fix: xpath提取出错会添加断言错误 2021-01-05 11:35:39 +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
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing 45d0a6515e fix: 取消关联项目同取消关联的接口用例 2021-01-04 18:01:56 +08:00
chenjianxing c507e86f52 fix: 关联接口用例列表重复显示问题 2021-01-04 14:19:59 +08:00
song.tianyang b0f9723dd4 refactor: 接口用例、用例列表、场景用例列表增加创建性能测试的功能 
接口用例、用例列表、场景用例列表增加创建性能测试的功能  原来是跳转之后后台直接创建，现在跳转到创建页面
 2021-01-04 12:39:19 +08:00
chenjianxing aa81f08341 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-04 11:40:29 +08:00
chenjianxing 7270c24eb2 fix: swagger 导入栈溢出 2021-01-04 11:40:12 +08:00
song.tianyang 8e5105d579 feat: 接口用例、用例列表、场景用例列表增加创建性能测试的功能 
接口用例、用例列表、场景用例列表增加创建性能测试的功能
 2021-01-04 11:28:17 +08:00
Captain.B c3f0b8d96f chore: Sync 2020-12-31 16:35:37 +08:00
Captain.B ec8265b4be chore: Sync 2020-12-31 16:35:07 +08:00
fit2-zhao d29c8bf2a2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 16:22:09 +08:00
fit2-zhao 0c6468946f fix(接口定义): 修复接口参数类型 2020-12-31 16:15:16 +08:00
fit2-zhao 429cd31531 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-31 16:12:39 +08:00
fit2-zhao 6dd2f72c05 fix(接口自动化): 接口用例执行修改 2020-12-31 16:12:22 +08:00
BugKing f2b439905e Merge branch 'master' into v1.6 2020-12-31 16:02:55 +08:00
fit2-zhao a2e2994dbc fix(接口自动化): 预览 2020-12-31 16:00:23 +08:00
Captain.B 3801ab6bb5 Merge branch 'v1.6' 2020-12-31 15:49:38 +08:00
chenjianxing b9848e452c fix: 导入接口重复替换，删除测试计划删除关联的接口用例 2020-12-31 15:40:00 +08:00
fit2-zhao 8cf56af2b9 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-31 15:24:03 +08:00
fit2-zhao 515f524f3e feat(接口测试): 增加Jenkins 调用 执行用例方法 2020-12-31 15:23:45 +08:00
wenyann b190b77788 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-31 15:11:36 +08:00
wenyann 3155af90f5 fix: jenkins接口修改 2020-12-31 15:11:08 +08:00
fit2-zhao 199327be75 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 15:02:37 +08:00
BugKing a19e3521e2 Merge branch 'master' into v1.6 2020-12-31 14:32:32 +08:00
chenjianxing d4fd50b274 refactor: 测试用例名称长度增大 2020-12-31 14:06:20 +08:00
fit2-zhao a9a6c52122 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 14:04:15 +08:00
chenjianxing 53943f4176 refactor: 代码优化 2020-12-31 13:58:42 +08:00
fit2-zhao 75bb894228 fix(接口自动化): 存储JSON-SCHEMA 2020-12-31 13:48:47 +08:00
BugKing d191dd36bd Merge branch 'master' into v1.6 2020-12-31 13:39:02 +08:00
chenjianxing 69414cae58 fix：导出json路径为空是，模块显示id 2020-12-31 11:22:51 +08:00
chenjianxing ab495f21f4 fix: swagger 3 堆栈溢出 2020-12-31 10:48:01 +08:00
fit2-zhao b84abd3713 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 10:45:14 +08:00
fit2-zhao d3cd2f4843 fix(接口自动化): 修复执行类型为空时错误 2020-12-31 10:44:20 +08:00
fit2-zhao f9746619f2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 09:57:49 +08:00
chenjianxing f40726a74a fix: 解决冲突 2020-12-31 09:46:03 +08:00
zwp201301 9279deb3e9
Bug修复：swagger接口的入参必填与非必填。目前是没有判断swagger的必填与否，全部固定为必填。 (#1025) 
1、KeyValue中的required属性不能写死，需要在对象构造的时候初始化；
2、HeaderParameter和CookieParameter类型参数，增加required属性；
3、FormParameter、QueryParameter、HeaderParameter和CookieParameter均增加required属性动态传递给KeyValue
 2020-12-31 09:30:29 +08:00
chenjianxing 3f80c98d76 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 22:00:23 +08:00
chenjianxing aed55a9709 refactor: 支持swagger 3.0 2020-12-30 22:00:00 +08:00
shiziyuan9527 e9454d273b fix(测试计划): 修复编辑测试计划缺陷 2020-12-30 20:31:49 +08:00
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 4b975918e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-30 11:27:22 +08:00
fit2-zhao a683bb27ff fix(接口自动化): 修复http环境请求头公共参数无效问题 2020-12-30 11:25:26 +08:00
fit2-zhao 22fee64092 fix(接口自动化): 增加json 列表编辑器 2020-12-30 11:03:59 +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 16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +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
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