Commit Graph

2399 Commits

Author SHA1 Message Date
chenjianxing d564296a97 fix(接口测试): 场景url拼接不正确 2020-10-28 19:30:15 +08:00
wenyann 753b9da5c1 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 18:54:37 +08:00
wenyann 55d41d50a2 feat: 消息设置性能测试 2020-10-28 18:54:02 +08:00
chenjianxing 29cd976431 fix(接口测试): 文件上传自定义content-type 2020-10-28 18:02:36 +08:00
chenjianxing 0dbf3b943d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:34:26 +08:00
chenjianxing 2bb75e753d fix(接口测试): 项目列表控制台报错 2020-10-28 17:33:54 +08:00
q4speed 53ba1ac3e1 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:32:18 +08:00
q4speed 9be3a0370c Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2020-10-28 17:30:19 +08:00
chenjianxing 370863834d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:29:37 +08:00
chenjianxing ab1c90a47b refactor(接口测试): sql请求结果格式化 2020-10-28 17:29:29 +08:00
q4speed b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
Captain.B e97231657b Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 17:20:19 +08:00
Captain.B 9987bb9be4 feat(性能测试): 性能测试error统计 2020-10-28 17:20:04 +08:00
shiziyuan9527 5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
shiziyuan9527 f3f496b484 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 16:42:45 +08:00
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
shiziyuan9527 b9e5bb3355 fix(测试跟踪): 修复测试方式为自动时通过按钮被禁用的问题 2020-10-28 16:42:13 +08:00
Captain.B 9a34a5f27f fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:19:19 +08:00
Captain.B d26c05a306 feat: 测试计划用例列表高级搜索中增加按执行人搜索 2020-10-28 10:37:01 +08:00
Captain.B 32f130c05e Merge branch 'v1.4' into master 2020-10-27 13:26:00 +08:00
shiziyuan9527 7add174a32 feat(测试跟踪): 用例评审评论支持编辑和删除 2020-10-27 11:26:34 +08:00
Captain.B c8d3456a61 Merge branch 'v1.4' into master 2020-10-27 09:52:23 +08:00
chenjianxing 32771d7c6e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 19:12:58 +08:00
chenjianxing 8efda5ef5e refactor(接口测试): 优化jsonpath推荐 2020-10-26 19:12:46 +08:00
Captain.B 3989c53eda refactor: 测试跟踪首页修改 2020-10-26 18:24:35 +08:00
Captain.B ad97428e1d feat: 测试用例前置条件换行显示 2020-10-26 18:11:30 +08:00
Captain.B 04d10717de Merge branch 'v1.4' into master 2020-10-26 17:49:42 +08:00
wenyann d9db503bb3 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 17:13:11 +08:00
wenyann 6b5361f8b2 fix(消息设置):性能测试通知 2020-10-26 17:12:50 +08:00
Captain.B e33e92c6d7 refactor(消息通知): 拆分组件 2020-10-26 16:13:54 +08:00
pencui 712de81915
新增http请求,jsonpath断言批量功能 (#599)
* 新增jsonpath断言批量推荐功能

* 修复xpack下错误的代码结构

* 补正改版后的jsonpath解析功能

Co-authored-by: root <root@localhost.localdomain>
2020-10-26 11:33:36 +08:00
chenjianxing a7a2f495d6 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 10:02:04 +08:00
chenjianxing a0b2dbb53e refactor(接口测试): 修改全局变量代码模版 2020-10-26 10:01:55 +08:00
chenjianxing 8a894503b2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 09:59:49 +08:00
chenjianxing 7969c38ef8 refactor(接口测试): 修改全局变量代码模版 2020-10-26 09:59:40 +08:00
Captain.B d85b0141d2 Merge remote-tracking branch 'origin/master' into master 2020-10-23 18:02:07 +08:00
Captain.B aed4f98b72 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-23 18:01:11 +08:00
Captain.B b2877d0110 refactor: 简化代码 2020-10-23 18:00:59 +08:00
chenjianxing 3439bd95cf Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-23 18:00:32 +08:00
chenjianxing 45c2022424 fix(系统设置): 管理人员列表显示 2020-10-23 17:58:38 +08:00
Captain.B caaa082e54 refactor: 简化代码 2020-10-23 17:56:15 +08:00
wenyann c658df065e Merge remote-tracking branch 'origin/master' 2020-10-23 17:31:27 +08:00
wenyann d74ba542ed fix(消息设置):添加提示 2020-10-23 17:31:10 +08:00
Captain.B dc092b3d32 fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 17:26:55 +08:00
Captain.B e095691cdb fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 16:46:30 +08:00
shiziyuan9527 6beacb8b05 fix(测试跟踪): 修复批量更新用例后最近的用例列表未刷新的问题 2020-10-23 15:56:48 +08:00
shiziyuan9527 042f43d9da fix(测试跟踪): 修复功能测试的测试方式不能批量设置为自动的问题 2020-10-23 15:42:44 +08:00
wenyann ce3952bb3e fix(消息设置):添加提示 2020-10-23 15:34:33 +08:00
wenyann 611fc1202a fix(消息设置):消息设置修改 2020-10-23 15:26:39 +08:00
wenyann 10b258a9b0 fix(消息设置):消息设置修改 2020-10-23 14:52:53 +08:00
wenyann f64d7a21b0 Merge remote-tracking branch 'origin/master' 2020-10-23 14:00:03 +08:00
wenyann 056ea0aea1 fix(消息设置):消息设置人员范围 2020-10-23 13:48:24 +08:00
chenjianxing 4b7a42d2e8 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-23 12:47:24 +08:00
chenjianxing 196bcec3bf fix(接口测试): 引用复制场景保存测试报错 2020-10-23 12:47:06 +08:00
wenyann 00e7c7bed9 fix(消息设置): 非空提示 2020-10-23 10:51:41 +08:00
Captain.B d55354ab92 refactor: 消息通知的候选人列表隔离 2020-10-23 10:42:37 +08:00
wenyann 0a3e0574da fix(消息设置): 消息设置 2020-10-23 09:55:04 +08:00
chenjianxing 0da55f5ef0 fix: 系统设置页面权限缺失 2020-10-22 21:00:04 +08:00
chenjianxing b4fd4dc910 refactor(接口测试): 修改请求参数、请求内容名称 2020-10-22 18:19:23 +08:00
shiziyuan9527 318383afea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-22 15:02:18 +08:00
shiziyuan9527 5bde8dfef4 fix: 修复创建测试计划失败的问题 2020-10-22 15:01:44 +08:00
wenyann 5d789ce222 fix(消息设置): 表格内容居中显示 2020-10-22 13:34:59 +08:00
wenyann ce3fdd366a feat: 消息设置 2020-10-22 10:37:02 +08:00
wenyann 6e5397489f Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 10:22:43 +08:00
wenyann dd5ee58e28 Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
2020-10-22 10:21:46 +08:00
chenjianxing 133e1b2aea fix(系统设置): 管理员不能禁用自己 2020-10-22 10:16:09 +08:00
wenyann b5db4991e4 feat: 消息设置 2020-10-22 10:13:26 +08:00
Captain.B c51329433a Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 09:54:46 +08:00
Captain.B a9394eacb3 fix(性能测试): 修复压力配置-开启RPS上限按钮,执行测试后,按钮自动关闭 2020-10-22 09:54:34 +08:00
chenjianxing 935ad0f4f0 fix(接口测试): 修复误删代码 2020-10-22 09:43:39 +08:00
shiziyuan9527 040b10c2f5 fix(测试跟踪): 修复复制测试用例时附件未复制的问题 2020-10-21 21:36:25 +08:00
chenjianxing 063b821de7 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 19:10:46 +08:00
chenjianxing e98755d38e fix(接口测试): jar包描述长度限制 2020-10-21 19:09:20 +08:00
shiziyuan9527 815fada034 fix: 修复点击创建用例无反应的问题 2020-10-21 19:05:05 +08:00
chenjianxing 21983d1ccb fix(接口测试): 编辑jar包描述字段显示问题 2020-10-21 18:29:11 +08:00
chenjianxing 4a07f74706 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:26:09 +08:00
chenjianxing 71a54ba8bf fix(性能测试): 全选后切换显示数量后批量删除报错 2020-10-21 18:26:00 +08:00
chenjianxing 8b863e5eaa Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:06:35 +08:00
chenjianxing 6fffba9976 refactor(接口测试): 环境的环境域名末尾不自动添加/ 2020-10-21 18:06:27 +08:00
Captain.B 005cdc9eb5 Merge branch 'master' into v1.4 2020-10-21 17:15:39 +08:00
BugKing 7c2d0dd8af Merge branch 'master' into v1.4 2020-10-21 16:04:46 +08:00
shiziyuan9527 fe1bea3316 feat(测试跟踪): 用例相关的计划和评审中展示附件列表 2020-10-21 16:04:41 +08:00
chenjianxing 0b6ee308eb refactor(测试跟踪): 模块树最大深度8层 2020-10-21 14:40:42 +08:00
q4speed 1b7250cb7d Merge remote-tracking branch 'origin/master' 2020-10-21 14:17:39 +08:00
q4speed 47c3e40805 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-21 14:17:00 +08:00
q4speed c074fd77ef fix(接口测试): 修复TCP请求服务器或IP必填的bug 2020-10-21 14:14:22 +08:00
shiziyuan9527 4866c32746 feat(测试跟踪): 保存评审结果后自动跳转下一条用例 2020-10-21 14:14:13 +08:00
shiziyuan9527 49bd060cad refactor(测试跟踪): 测试用例附件的修改时间改为上传时间 2020-10-21 13:41:09 +08:00
Captain.B 869a4a315e Merge branch 'master' into v1.4 2020-10-21 09:26:06 +08:00
wenyann e35a400bb0 Merge remote-tracking branch 'origin/master' 2020-10-21 00:10:19 +08:00
wenyann b38fbf034e feat: 消息设置 2020-10-21 00:09:23 +08:00
shiziyuan9527 bd8ca07af6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 18:55:42 +08:00
shiziyuan9527 876cc63d02 refactor: i18n 2020-10-20 18:51:41 +08:00
chenjianxing e3a90f98ca Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 18:44:14 +08:00
chenjianxing 1632b3fe13 refactor: 代码优化 2020-10-20 18:44:05 +08:00
shiziyuan9527 21dd0e7508 refactor(用例评审): 调整用例评审页面评审按钮的位置 2020-10-20 18:35:33 +08:00
fit2-zhao fd0ee661a5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 17:41:21 +08:00
fit2-zhao 6ee4ca0921 refactor(测试跟踪): 导入用例提示消息优化,按照类型进行划分 2020-10-20 17:41:06 +08:00
shiziyuan9527 fd77afcfc6 feat(测试跟踪): 测试用例附件预览 2020-10-20 16:59:27 +08:00
BugKing 144803a8c2 refactor: 更改版本号 2020-10-20 16:50:16 +08:00
chenjianxing 8dad580a6a Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 16:48:45 +08:00
chenjianxing 510850db51 feat(接口测试): 支持提取多个值 2020-10-20 16:48:37 +08:00
q4speed 58a8510989 fix(接口测试): 去掉TCP请求必填服务器名称的bug 2020-10-20 16:30:34 +08:00
q4speed 9f1198fe9e Merge remote-tracking branch 'origin/master' 2020-10-20 16:05:49 +08:00
q4speed 99f21d6228 fix(接口测试): 修复因为太挤无法显示TCP配置输入框的bug 2020-10-20 16:05:35 +08:00
fit2-zhao 9d05edc6f4 fix(接口测试): 增加域名格式校验 2020-10-20 15:32:58 +08:00
fit2-zhao c44b72e5fa fix(测试跟踪): 修复选中关联单个模块用例实际上关联整个项目的用例缺陷 2020-10-20 14:44:07 +08:00
chenjianxing 73218f5f23 fix(测试跟踪): 点击面包屑全部用例,我的用例显示问题 2020-10-20 14:15:07 +08:00
chenjianxing 6de79df31f fix(接口测试): 文件上传删除文件失败 2020-10-20 13:46:19 +08:00
chenjianxing 1c9050d833 fix: 解决冲突 2020-10-20 13:11:10 +08:00
chenjianxing 764567d5f8 refactor(接口测试): 删除无用代码 2020-10-20 12:58:00 +08:00
chenjianxing bd43116ff4 feat(接口测试): 上传jar包 2020-10-20 12:54:09 +08:00
chenjianxing 9a009dbf28 feat(接口测试): 上传jar包 2020-10-20 12:53:09 +08:00
wenyann 87f53cbebf feat: 消息设置 2020-10-20 10:34:31 +08:00
wenyann f872fb6692 Merge remote-tracking branch 'origin/master' 2020-10-19 18:49:27 +08:00
wenyann 1b4047386e feat: 消息设置 2020-10-19 18:48:56 +08:00
shiziyuan9527 8b2fdaad7c fix(性能测试): 修复新建项目后修改已存在的测试所属项目的时候项目列表未更新的问题 2020-10-19 18:07:38 +08:00
q4speed b5b09842e7 Merge remote-tracking branch 'origin/master' 2020-10-19 17:44:45 +08:00
q4speed faa9c713c2 fix(接口测试): 修复TCPClient没有候选项的bug 2020-10-19 17:44:34 +08:00
shiziyuan9527 24217c96c8 feat(测试跟踪): 用例评审页面标明评审结果 2020-10-19 17:30:15 +08:00
shiziyuan9527 4e7babcda0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 16:06:45 +08:00
shiziyuan9527 045f0fd180 fix(测试跟踪): 修复测试评审的截止时间可以早于当前时间的问题 2020-10-19 16:06:36 +08:00
wenyann d2e1b81c6a Merge remote-tracking branch 'origin/master' 2020-10-19 15:45:39 +08:00
wenyann dd86a0f53a fix:修复预览详情格式,添加message表字段 2020-10-19 15:44:43 +08:00
Captain.B 452fc29771 Merge remote-tracking branch 'origin/master' into master 2020-10-19 15:21:15 +08:00
Captain.B 695aae0d9d fix(性能测试): 修复压力配置-开启RPS上限按钮,执行测试后,按钮自动关闭 2020-10-19 15:20:50 +08:00
shiziyuan9527 6cf026addc refactor(系统设置): 去掉创建组织时对特殊字符的限制 2020-10-19 15:11:30 +08:00
shiziyuan9527 f0f9877765 fix: 修复创建项目时因为描述超出长度限制而产生报错的问题 2020-10-19 14:59:24 +08:00
shiziyuan9527 9b7ca67649 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 14:03:07 +08:00
shiziyuan9527 d1fa9ca32a fix(测试跟踪): 修复测试用例上传附件报错的问题 2020-10-19 14:02:06 +08:00
q4speed ff5a52d966 Merge remote-tracking branch 'origin/master' 2020-10-19 13:00:30 +08:00
q4speed fb224d2289 feat(接口测试): 断言增加忽略状态 2020-10-19 12:59:29 +08:00
wenyann 951157592c feat: 性能测试报告字段优化 2020-10-19 12:29:40 +08:00
wenyann eccbaa639d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
2020-10-19 12:28:55 +08:00
wenyann d838073c59 feat: 性能测试报告字段优化 2020-10-19 12:27:03 +08:00
q4speed ae474fadd7 feat: 最近的评审改为我最近的评审。 2020-10-16 23:39:41 +08:00
wenyann f18c55b67f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 15:58:58 +08:00
wenyann 1169f46fac feat: 前置条件字符长度限制 2020-10-16 15:51:55 +08:00
fit2-zhao ce90cf9cb5 fix(测试跟踪): 修复用例关联全部问题 2020-10-16 14:28:17 +08:00
wenyann ce222275fb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 14:25:41 +08:00
wenyann 07dea85f7c feat: 消息设置 2020-10-16 14:25:24 +08:00
fit2-zhao e0a349e432 fix(系统设置): 修复成员列表筛选问题 2020-10-16 11:00:43 +08:00
fit2-zhao 50ee06bff1 refactor(测试跟踪): 优化变量名 2020-10-15 18:35:53 +08:00
fit2-zhao 25b40809db Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
2020-10-15 18:23:10 +08:00
fit2-zhao cbf2b89742 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
2020-10-15 18:22:27 +08:00
fit2-zhao b4af198897 refactor(测试跟踪): 测试计划,用例评审 两处关联测试用例一次加载全部优化 2020-10-15 18:08:41 +08:00
chenjianxing b21c799ba2 feat(接口测试): jar包管理 2020-10-15 17:37:49 +08:00
Captain.B b52f8ba9eb fix: 修复测试计划执行人选择的问题 2020-10-15 10:05:37 +08:00
fit2-zhao 92122e0546 refactor(测试跟踪): 关联测试用例一次加载全部优化 2020-10-14 18:56:27 +08:00
shiziyuan9527 1681f634f2 refactor(测试跟踪): 修改评审状态名称 2020-10-14 18:16:33 +08:00