Commit Graph

2125 Commits

Author SHA1 Message Date
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
chenjianxing
54f5e8aad5 refator: 接口用例页面优化 2020-12-11 09:40:00 +08:00
Captain.B
9dff8408de Merge branches 'master', 'master' and 'master' of github.com:metersphere/metersphere into master 2020-12-10 18:48:38 +08:00
Captain.B
d20719c9ee refactor: 重构checkowner的逻辑 2020-12-10 18:47:29 +08:00
shiziyuan9527
38cf12fbcb feat(性能测试): 资源按照项目查询 2020-12-10 18:29:23 +08:00
Captain.B
8c26c9b9f3 Merge branches 'master', 'master' and 'master' of github.com:metersphere/metersphere into master 2020-12-10 18:15:48 +08:00
Captain.B
181b5c11cc fix: 修复 check owner project 时出现的问题 2020-12-10 18:11:34 +08:00
fit2-zhao
541a823339 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 17:42:21 +08:00
fit2-zhao
70c22f57e8 feat(接口自动化): 统一样式风格及统一执行处理 2020-12-10 17:42:05 +08:00
wenyann
cfa0489e59 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 17:33:30 +08:00
wenyann
5cc9797554 fix:修复jenkins上用例缺失问题 2020-12-10 17:32:31 +08:00
fit2-zhao
db0fa8a810 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 16:49:14 +08:00
fit2-zhao
d5b777a55a feat(接口自动化): 统一样式风格 2020-12-10 16:48:56 +08:00
shiziyuan9527
094dfc7da3 feat(测试跟踪): 最近列表按照项目查询 2020-12-10 15:38:54 +08:00
shiziyuan9527
239ce6bd5b feat(测试跟踪): 资源按照项目查询 2020-12-10 15:16:50 +08:00
fit2-zhao
7f98702691 feat(接口自动化): 统一项目获取 2020-12-10 13:45:10 +08:00
fit2-zhao
bc49f69ede feat(接口自动化): 完成接口引用 2020-12-10 12:46:14 +08:00
fit2-zhao
afa7527738 feat(接口定义): 完成查看引用和添加用例到测试计划功能 2020-12-10 11:03:34 +08:00
fit2-zhao
1f59d12f7b feat(接口自动化): 完善回收站功能 2020-12-09 19:02:26 +08:00
fit2-zhao
c021bb5647 feat(接口自动化): 完成场景添加到测试计划几查看引用功能 2020-12-09 17:26:52 +08:00
fit2-zhao
9f4adbbbf9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-09 12:26:20 +08:00
fit2-zhao
48c69444c7 fix(接口定义): 部分缺陷修复 2020-12-09 12:25:15 +08:00
shiziyuan9527
1ff77583a4 refactor: flyway 2020-12-09 10:55:33 +08:00
shiziyuan9527
41290ee516 fix(系统设置): 创建项目跳转问题 2020-12-09 10:47:31 +08:00
Captain.B
9349f06c05 chore: Sync submodule 2020-12-09 10:33:35 +08:00
Captain.B
5f350ed32e Merge remote-tracking branch 'origin/master' into master 2020-12-09 10:26:41 +08:00
Captain.B
2fe673af83 fix: 修复jenkins消息通知没有替换变量的问题 2020-12-09 10:26:02 +08:00
fit2-zhao
d3040ee9df feat(接口自动化): 去除重合部分功能 2020-12-09 09:56:14 +08:00
fit2-zhao
3e15d419fb feat(接口自动化): 冲突合并 2020-12-08 20:11:48 +08:00
fit2-zhao
2ebfcc2db1 feat(接口自动化): 完成定时任务 2020-12-08 19:41:48 +08:00
fit2-zhao
6a8a718ff2 feat(接口自动化): 完成批量执行等 2020-12-08 17:51:59 +08:00
chenjianxing
a11a54c23a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 17:41:41 +08:00
BugKing
7a0004cb5a Merge branch 'v1.5' into master 2020-12-08 17:05:11 +08:00
q4speed
eee5bc586a feat(接口自动化): 查看场景引用 2020-12-08 15:55:21 +08:00
Captain.B
48c9af48c4 Merge remote-tracking branch 'origin/master' into master 2020-12-08 15:19:48 +08:00
Captain.B
05141df790 refactor(XPack): 消息通知模版 2020-12-08 15:12:35 +08:00
fit2-zhao
6ce41bdbde Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 13:47:49 +08:00
fit2-zhao
ffb2fc8bdc feat(接口自动化): 完成场景公共参数,修复接口定义另存用例问题 2020-12-08 13:47:09 +08:00
chenjianxing
d24c9c43b2 fix: 前端报错 2020-12-08 12:02:12 +08:00
chenjianxing
91d37ccafe feat(接口测试): 接口定义插件格式导入 2020-12-08 11:28:23 +08:00
chenjianxing
0d8d12b17b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 20:17:32 +08:00
chenjianxing
036d5a5551 feat(接口测试): 接口定义 postman 导入 2020-12-07 20:17:25 +08:00
fit2-zhao
d762644d87 feat(接口自动化): 完成场景调试,和基础报告 2020-12-07 19:08:26 +08:00
fit2-zhao
b848830976 feat(接口自动化): 完成场景批量执行,基础报告生成 2020-12-07 19:03:51 +08:00
shiziyuan9527
48c82d2852 feat(系统设置): 项目管理迁移至系统设置 2020-12-07 17:28:04 +08:00
chenfanghang
063726b5cc refactor(接口监控):接口列表排序按字母排序 2020-12-07 14:28:38 +08:00
chenjianxing
1aab595ab0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 11:04:00 +08:00
chenjianxing
7ba3c09a3d refacotr(接口测试): swagger 导入创建模块 2020-12-07 11:03:37 +08:00
fit2-zhao
8d7ec9b8ed Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:06:27 +08:00
Captain.B
7bfb226314 Merge remote-tracking branch 'origin/master' into master 2020-12-04 18:04:42 +08:00
chenjianxing
768ed785a9 fix(接口测试): metersphere 文件导入错误 2020-12-04 18:01:32 +08:00
fit2-zhao
7bb3cb7eca Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:00:57 +08:00
fit2-zhao
57986195e7 feat(接口自动化): 完成场景调试,和基础报告 2020-12-04 18:00:37 +08:00
Captain.B
faf8c1f80f Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/api/router.js
#	frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
2020-12-04 17:57:00 +08:00
Captain.B
7ee9522298 chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-12-04 17:35:53 +08:00
BugKing
25631ce05f Revert "chore: 同步 submodule"
This reverts commit 9e62022a
2020-12-04 15:53:21 +08:00
chenjianxing
45f791a4b1 refactor(测试跟踪): swagger 获取tag 2020-12-04 15:09:34 +08:00
chenjianxing
ec4ff14bf6 refactor: 处理swagger响应体 2020-12-03 21:13:53 +08:00
fit2-zhao
97e3f91008 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:37:33 +08:00
fit2-zhao
25238c2b32 feat(接口自动化): 完成场景引用和复制,接口的引用和复制 2020-12-03 19:36:43 +08:00
chenjianxing
5d37c09413 fix: 导入id和请求id一致 2020-12-03 19:36:08 +08:00
chenjianxing
18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing
f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing
3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
chenjianxing
fde6ae766c refactor(接口测试): swagger 导入重构 2020-12-03 16:27:00 +08:00
Captain.B
3e00db1011 refactor: 重构发送通知的后台 2020-12-03 15:57:38 +08:00
shiziyuan9527
d00d847e88 fix: 去掉sql分号 2020-12-03 14:45:55 +08:00
Captain.B
bf13f09322 fix: 修复异步方法启动的问题 2020-12-03 14:08:04 +08:00
fit2-zhao
ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao
c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B
f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B
22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao
b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00
fit2-zhao
77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
shiziyuan9527
46d86b7f08 fix(测试跟踪): TAPD缺陷状态同步为工作流中缺陷状态名称 2020-12-02 16:38:11 +08:00
q4speed
4065663f55 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/i18n/zh-CN.js
2020-12-02 15:34:04 +08:00
q4speed
9e600dab94 feat(接口自动化): 场景列表 2020-12-02 15:32:16 +08:00
fit2-zhao
d571c9dc07 fix(接口定义): http 协议headers 收入到请求中 2020-12-02 14:21:17 +08:00
chenjianxing
b08775dbb9 feat(接口测试): 接口定义导入 2020-12-01 21:07:32 +08:00
fit2-zhao
4e607cfa7b fix(接口定义): 少文件提交 2020-12-01 19:02:32 +08:00
fit2-zhao
184b7ca3f4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 17:49:17 +08:00
fit2-zhao
f62ae2bd59 fix(接口定义): 自动生成代码规范修改 2020-12-01 17:47:39 +08:00
shiziyuan9527
439cf3b89b refactor(测试跟踪): 用例评审查询优化 2020-12-01 15:00:30 +08:00
Captain.B
edab268a4c Merge branch 'v1.5' into master 2020-12-01 10:00:11 +08:00
chenfanghang
8dc013927c feat(接口监控):增加响应时间与状态监控功能 2020-11-30 18:52:57 +08:00
Captain.B
04a41e22f8 Merge remote-tracking branch 'origin/master' into master 2020-11-30 17:08:18 +08:00
Captain.B
57b86dd2ef refactor(性能测试): 修复单位错误 2020-11-30 17:07:20 +08:00
shiziyuan9527
6ed65e22d3 refactor(测试跟踪): 优化查询 2020-11-30 16:40:02 +08:00
shiziyuan9527
bee4cfced7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 16:38:29 +08:00
fit2-zhao
1ad6aefc7d fix(性能测试): 还原误修改类 2020-11-30 16:33:01 +08:00
fit2-zhao
9a6f2518fc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 16:03:54 +08:00
fit2-zhao
511c0ff1a9 feat(接口自动化): 基础增加统计总数 2020-11-30 16:03:23 +08:00
shiziyuan9527
834baeac31 Merge branch 'refector' 2020-11-30 14:59:37 +08:00
chenjianxing
4d52439cfb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:41:47 +08:00
chenjianxing
9ca89babed fix(接口测试): 保存并执行为DEBUG模式 2020-11-30 14:41:29 +08:00
fit2-zhao
b9fc0c8195 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:30:08 +08:00
fit2-zhao
ae11f66b79 feat(接口自动化): 基础结构创建 2020-11-30 14:29:49 +08:00
chenjianxing
0c7ba5cb80 refactor: 认证相关请求返回4xx响应码 2020-11-30 14:27:28 +08:00
fit2-zhao
c5380e6934 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-11-30 11:03:04 +08:00
fit2-zhao
9bd1935167 feat(接口定义): 历史记录添加 2020-11-30 11:02:51 +08:00
fit2-zhao
e02e7c726f fix(测试跟踪): 目录节点添加保护 2020-11-30 11:01:29 +08:00
chenjianxing
b74f9e21f5 fix: 解决冲突 2020-11-27 18:10:41 +08:00
chenjianxing
30a1858ffa fix: 解决冲突 2020-11-27 18:09:30 +08:00
chenjianxing
455b231133 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-11-27 17:57:36 +08:00
chenjianxing
c53fe5ac4a fix(接口测试): 引用的场景支持禁用启用 2020-11-27 17:57:23 +08:00
Captain.B
a1d32d79a8 Merge branch 'v1.5' into master 2020-11-27 16:29:41 +08:00
Captain.B
b9052ca787 fix(性能测试): 删除测试报告时删除相关的jtl 2020-11-27 16:28:49 +08:00
fit2-zhao
c9e2e3e489 fix(接口定义): 执行方法修改 2020-11-27 14:22:07 +08:00
fit2-zhao
dd5cdad759 feat(接口定义):删除多余文件 2020-11-27 14:04:40 +08:00
fit2-zhao
73204d7793 feat(接口定义): 合并master 最新代码 2020-11-27 13:59:18 +08:00