Commit Graph

3446 Commits

Author SHA1 Message Date
fit2-zhao 3ac8b83d54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 13:50:21 +08:00
fit2-zhao 33cd6b37e8 feat(接口自动化): 循环控制器 结果处理 2021-01-25 13:49:59 +08:00
shiziyuan9527 e005e39326 fix(测试计划): 修复性能测试按照状态筛选不生效的问题 2021-01-25 10:59:26 +08:00
chenjianxing 058c3b3dd4 refactor: pr代码优化 2021-01-25 10:10:21 +08:00
Captain.B 2013e784f9 Merge remote-tracking branch 'origin/master' 2021-01-22 19:40:00 +08:00
Captain.B c71b1d49f3 refactor(xPack): 接入oidc单点登录 2021-01-22 19:28:34 +08:00
song.tianyang e6d2e1bf4d feat: 测试计划定时任务报告增加状态字段
测试计划定时任务报告增加状态字段
2021-01-22 19:06:30 +08:00
fit2-zhao 96ae6250be fix(接口自动化): 修复部分缺陷 2021-01-22 18:42:04 +08:00
fit2-zhao 5ae9f4dcfe Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:18:26 +08:00
fit2-zhao 53fd31ec90 fix(接口自动化): 修复I18n 显示问题 2021-01-22 18:17:53 +08:00
Joker bb952bd430
fix swagger2.0 NullPointException (#1196)
* fix swagger2.0同步时存在$ref参数而dto不存在的情况

* 删除多余代码

* 修复编辑HTTP配置域名为空是,数据库config拼接的json串中domain没有更新为空的情况

* 语法调整

Co-authored-by: fengkaijun <fengkaijun@yingzi.com>
2021-01-22 18:17:19 +08:00
fit2-zhao 5340a37cb1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:12:25 +08:00
fit2-zhao 4e38c73ac5 fix(接口自动化): 修复部分缺陷 2021-01-22 18:12:05 +08:00
shiziyuan9527 4b41e9df0c fix(测试计划): 修复报告统计结果错误 2021-01-22 17:14:12 +08:00
wenyann 2cdf1e6730 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
2021-01-22 17:07:43 +08:00
wenyann 8e1f189ce9 feat: swagger定时修改 2021-01-22 17:01:41 +08:00
chenjianxing 4144a35a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 16:32:24 +08:00
chenjianxing f2c93f828b fix: 编辑用例新增不显示上一条下一条 2021-01-22 16:32:13 +08:00
chenjianxing 6243e3a410 feat: 用例编辑支持上一条下一条 2021-01-22 16:30:49 +08:00
Captain.B 96926b3311 refactor: 设置迭代次数和rpslimit的上限 2021-01-22 16:20:43 +08:00
Captain.B 9025f42876 fix: 修复创建性能测试页面,按迭代次数点击没反应 2021-01-22 16:15:04 +08:00
song.tianyang 14b21ca544 feat: 接口测试首页-运行中的定时任务增加字段
接口测试首页-运行中的定时任务增加字段
2021-01-22 15:21:37 +08:00
fit2-zhao 8f45254225 fix(接口自动化): 自定义脚本问题修复 2021-01-22 14:18:42 +08:00
fit2-zhao 3c96877c1c style(接口自动化): 步骤页面优化 2021-01-22 14:06:45 +08:00
fit2-zhao 38169542e2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 12:57:27 +08:00
fit2-zhao 1157a1c422 fix(场景自动化): 修复场景描述不能编辑问题,修复CSV 预览问题 2021-01-22 12:55:07 +08:00
shiziyuan9527 b0fa695c29 fix(测试计划): 去掉关联性能测试用例页面左侧模块树 2021-01-22 11:39:36 +08:00
shiziyuan9527 b68eb372f1 feat(性能测试): 报告请求统计页面支持按 label 筛选请求 2021-01-22 11:13:39 +08:00
fit2-zhao b01c6930cb refactor(接口自动化): 优化场景步骤调试结果 2021-01-22 10:51:43 +08:00
fit2-zhao 7326f2409e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 10:36:16 +08:00
fit2-zhao eb47d5151c fix(接口定义): 【优化】降低新手用户使用门槛 2021-01-22 10:35:53 +08:00
chenjianxing b7900468e1 refactor: tcp添加断言等操作 2021-01-22 10:31:21 +08:00
chenjianxing 526e3baa13 refactor: 文档跳转新页面 2021-01-21 20:42:14 +08:00
chenjianxing ccd7d08ef5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 19:45:25 +08:00
chenjianxing 27603bbf90 feat: 场景列表批量移动 2021-01-21 19:45:12 +08:00
song.tianyang ce7aa0e947 fix: 复制场景会出现场景名称一样的情况
修复制场景会出现场景名称一样的情况的问题
2021-01-21 19:07:30 +08:00
song.tianyang d214bca4bc fix: 修改测试计划内批量处理的按钮名称
修改测试计划内批量处理的按钮名称: 批量删除改为批量取消关联
2021-01-21 18:59:55 +08:00
song.tianyang cb081e848c feat: 场景案例画面:固定表格中的操作列
场景案例画面:固定表格中的操作列
2021-01-21 18:45:16 +08:00
fit2-zhao 330c4c8a37 fix(接口定义): dialog 弹框层级修复 2021-01-21 18:35:07 +08:00
fit2-zhao da1bbf9dea Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 18:26:54 +08:00
fit2-zhao deac357040 fix(接口定义): 测试接口时不更新原接口数据 2021-01-21 18:26:31 +08:00
chenjianxing 5d9cf69916 fix: 场景页面批量编辑用例 2021-01-21 17:43:02 +08:00
song.tianyang d97772a36a Merge remote-tracking branch 'origin/master' 2021-01-21 15:22:32 +08:00
song.tianyang 0e3684e6c7 fix: 接口定义页面中不同卡片页的图标
修复接口定义页面中不同卡片页的图标与原型图对应不上的问题
2021-01-21 15:21:53 +08:00
Captain.B 8699187673 refactor(接口测试): 测试用例显示tags 2021-01-21 14:54:56 +08:00
fit2-zhao 76d8e84341 fix(接口自动化): 移除多余控件 2021-01-21 14:24:33 +08:00
fit2-zhao 773658eac2 fix(接口自动化): 移除多余控件 2021-01-21 14:22:56 +08:00
fit2-zhao 29bb8eb816 style(接口定义): 接口用例 批量处理样式调整 2021-01-21 14:02:05 +08:00
fit2-zhao 5114e1abd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 12:19:14 +08:00
fit2-zhao feeb44155b fix(接口自动化): 初始化TAG问题修复 2021-01-21 12:18:54 +08:00
chenjianxing 76b08dc6de Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 12:13:17 +08:00
chenjianxing ca3a26a171 fix: 树修改后过滤失效 2021-01-21 12:13:01 +08:00
fit2-zhao 0ca5ae9565 style(接口定义): tag 样式调整 2021-01-21 11:32:06 +08:00
fit2-zhao 8840053d18 refactor(接口定义): 点击用例结果状态,展开用例结果详情页面 2021-01-21 11:30:23 +08:00
fit2-zhao 6751fa0b39 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 11:16:15 +08:00
fit2-zhao 73f98975cc style(接口定义): 统一TAG 样式 2021-01-21 11:15:41 +08:00
chenjianxing cf9e24f069 fix: json结果自动格式化 2021-01-21 10:32:03 +08:00
chenjianxing 668949a918 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 10:11:07 +08:00
chenjianxing e1a22680bd fix: 测试计划测试用例小屏下一步无法点击 2021-01-21 10:10:53 +08:00
Coooder-X 1f9c00b02f
fix:解决 定时任务生成表达式 指定小时下拉框列表内容不正确 (#1228) 2021-01-20 20:46:41 +08:00
Coooder-X 89b6edf5c6
fix:解决 创建新项目编辑-描述输入框无法换行 (#1225) 2021-01-20 20:46:25 +08:00
Coooder-X 930a0a83a0
fix(登陆):修复登陆密码错误时 提示重新登陆 (#1219) 2021-01-20 20:46:06 +08:00
Coooder-X 2aed1743e4
fix: 解决 接口测试-接口自动化-场景-修改场景时描述信息不显示 (#1223) 2021-01-20 20:32:47 +08:00
chenjianxing deae6d6053 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 20:27:28 +08:00
chenjianxing 9c310d7678 feat: TCP优化 2021-01-20 20:27:12 +08:00
Captain.B bf0bff3b0a fix: 修复编辑用例的时候标签没有及时刷新的问题 2021-01-20 17:34:45 +08:00
fit2-zhao f2fd694000 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 16:50:23 +08:00
fit2-zhao 9dea1d11ea fix(接口定义): 修复接口路径大小写转换问题 2021-01-20 16:49:54 +08:00
song.tianyang ebdaf4de5f Merge remote-tracking branch 'origin/master' 2021-01-20 16:44:51 +08:00
song.tianyang 57e971a357 fix:
修复场景步骤标题未显示的问题、修复测试计划的性能测试任务结束回调时资源占用的问题
2021-01-20 16:43:32 +08:00
chenjianxing 3a342b915d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 16:00:53 +08:00
chenjianxing b2870b6329 feat: 支持js脚本 2021-01-20 16:00:35 +08:00
song.tianyang 805cd4af9f Merge remote-tracking branch 'origin/master' 2021-01-20 15:47:16 +08:00
song.tianyang 7a1cd04000 fix: 接口定义页面,案例按钮在火狐浏览器不兼容
修复接口定义页面,案例按钮在火狐浏览器不兼容的问题
2021-01-20 15:45:52 +08:00
Captain.B 0be924475b chore: Sync 2021-01-20 15:43:30 +08:00
wenyann 76af7537cb fix: 场景文本修改 2021-01-20 15:38:39 +08:00
song.tianyang 4ae7a4753d Merge remote-tracking branch 'origin/master' 2021-01-20 15:26:22 +08:00
song.tianyang 03ee409b5f refactor: 接口测试细节优化
接口测试细节优化:Tapd接口测试细节优化B任务,主要包含:接口自定义页面copy场景时自动保存、部分页面按钮以及文字的主题色修改等
2021-01-20 15:26:00 +08:00
fit2-zhao b532d7a2de Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 15:22:13 +08:00
fit2-zhao 758a7a5356 fix(接口定义): 接口用例结果初始化 2021-01-20 15:21:54 +08:00
chenjianxing d2e0e81f60 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 15:12:39 +08:00
fit2-zhao e2eed011f7 style(接口自动化): 接口步骤样式统一 2021-01-20 15:11:41 +08:00
chenjianxing 65ad9b1e80 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 15:04:13 +08:00
chenjianxing b1fb972f99 feat: 支持groovy脚本 2021-01-20 15:03:49 +08:00
fit2-zhao cdf1b73253 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 14:53:58 +08:00
fit2-zhao 91ded7f5ba feat(接口定义): 另存新用例 TAG问题修复 2021-01-20 14:53:34 +08:00
wenyann 7868ce4957 Merge remote-tracking branch 'origin/master' 2021-01-20 14:08:36 +08:00
wenyann c7500edaa9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
#	backend/src/main/java/io/metersphere/xpack
2021-01-20 14:04:46 +08:00
chenjianxing 201b3b8f30 refactor: 场景列表添加状态列 2021-01-20 14:02:15 +08:00
wenyann 8512f8f262 feat: swagger定时同步 2021-01-20 13:56:58 +08:00
chenjianxing d08717c352 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 13:46:46 +08:00
chenjianxing 73d63ce072 refactor: 环境变量添加描述和复制功能 2021-01-20 13:44:21 +08:00
fit2-zhao 0070123bef feat(接口定义): 增加用例批量编辑功能 2021-01-20 13:12:09 +08:00
fit2-zhao 81165295e3 fix(接口定义): 批量执行用例校验 2021-01-20 12:50:10 +08:00
fit2-zhao 269ee4d7b0 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 11:53:06 +08:00
fit2-zhao 67635aebbd fix(接口定义): 用例状态统计不准确问题修复 2021-01-20 11:52:37 +08:00
chenjianxing deb0a636d9 fix: 解决冲突 2021-01-20 11:51:27 +08:00
chenjianxing 23a92b8e19 refactor: 用例列表页面优化 2021-01-20 11:06:03 +08:00
fit2-zhao ea7090b3eb refactor(接口定义): 重构用例存储及结果统计 2021-01-20 10:29:17 +08:00
chenjianxing ed349c5071 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 20:30:40 +08:00