Commit Graph

6391 Commits

Author SHA1 Message Date
song.tianyang b2daeb76c2 Merge remote-tracking branch 'origin/master' 2021-03-23 18:26:34 +08:00
song.tianyang 3ae60653ab fix: 更改导入模板解析方式-以tapd为主
更改导入模板解析方式-以tapd为主 (tapd的报文头sheet和其他sheet相比没有是否必输这一列)
2021-03-23 18:21:58 +08:00
fit2-zhao 4640746de5 fix(接口自动化): 场景步骤协议展示及另存为新接口问题修复 2021-03-23 18:20:31 +08:00
BugKing a1fdc25a96 style(性能测试): 修改性能测试压力配置样式 2021-03-23 18:10:06 +08:00
fit2-zhao 478c98ac21 fix(接口自动化): 场景步骤断言规则增加查看功能 2021-03-23 18:05:51 +08:00
song.tianyang 066ac69c6d feat: 接口定义导入-根据不同的接口选择,展现不同的到导入方式
接口定义导入-根据不同的接口选择,展现不同的到导入方式
2021-03-23 17:47:49 +08:00
Captain.B 2cd2e8207e Merge remote-tracking branch 'origin/master' 2021-03-23 17:40:37 +08:00
Captain.B 7f69f17a5b Merge remote-tracking branch 'origin/master' 2021-03-23 17:36:41 +08:00
Captain.B 40c1ebea20 refactor(性能测试): 修改压力配置的页面 2021-03-23 17:36:25 +08:00
shiziyuan9527 e0ffb4ad65 fix(测试跟踪): 首页测试计划用例数统计错误 2021-03-23 17:34:04 +08:00
fit2-zhao 774fd1f425 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 17:31:47 +08:00
fit2-zhao eeedae7a4a fix(接口自动化): 场景步骤按钮控制 2021-03-23 17:30:23 +08:00
song.tianyang dc1ef10180 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2021-03-23 17:28:07 +08:00
chenjianxing 8993e53b70 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 17:26:11 +08:00
chenjianxing 0bd0098b95 fix: 接口自动化从vuex获取projectId 2021-03-23 17:26:00 +08:00
song.tianyang d83df6e1cc feat: ESB接口导入和模板下载
ESB接口导入和模板下载
2021-03-23 17:25:20 +08:00
Captain.B 6544382236 Merge remote-tracking branch 'origin/master' 2021-03-23 17:06:35 +08:00
Captain.B 41fe3cbe6b fix: 修复创建性能测试查询文件是否存在的bug 2021-03-23 17:06:14 +08:00
shiziyuan9527 79e11e651a fix(场景自动化): 查看场景时报空指针异常 2021-03-23 17:03:00 +08:00
fit2-zhao c4ae15256b fix(接口自动化): 条件控制器 报告中名字为空问题修复 2021-03-23 17:00:39 +08:00
chenjianxing 0073ed1307 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 16:47:45 +08:00
chenjianxing e2285238d3 fix: 接口定义创建到其他项目 2021-03-23 16:47:32 +08:00
fit2-zhao 3dba18779f fix(接口自动化): 次数循环成功后继续循环 开关校验问题修复 2021-03-23 16:35:47 +08:00
fit2-zhao 08c9cc09df fix(接口定义): 测试执行-另存新接口 增加路径反显 2021-03-23 16:12:43 +08:00
Captain.B 8c965b2486 refactor: 使用shiro的session过期方式 2021-03-23 15:56:33 +08:00
Captain.B 0c1cbeeabf Merge remote-tracking branch 'origin/master' 2021-03-23 15:53:23 +08:00
Captain.B ed39f30328 fix: 修复编辑测试计划没有更新tags的bug 2021-03-23 15:53:05 +08:00
chenjianxing 41a1a5f38b Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 15:49:35 +08:00
chenjianxing 4b7933a85d refactor: 重构vuex 2021-03-23 15:49:24 +08:00
fit2-zhao b6c550bb2a style: 统一样式修改 2021-03-23 15:32:02 +08:00
fit2-zhao 0dce5022e8 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:31:43 +08:00
fit2-zhao 89dc94fac5 style: 统一样式修改 2021-03-23 15:31:23 +08:00
BugKing 1e81835dcf Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-23 15:08:07 +08:00
BugKing a92b750ae7 style: 修改列表标签列格式 2021-03-23 15:08:00 +08:00
fit2-zhao 00af593531 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:07:12 +08:00
fit2-zhao 27f9f34be3 fix(接口定义): 批量执行记录最后执行环境 2021-03-23 15:06:57 +08:00
wenyann 923d36e42d Merge remote-tracking branch 'origin/master' 2021-03-23 14:50:37 +08:00
wenyann e9e73f87d3 fix:测试计划关联过来的接口用例使用默认环境 2021-03-23 14:50:22 +08:00
shiziyuan9527 a072f3992d fix(测试计划): 失败用例统计未包含阻塞用例 2021-03-23 14:39:31 +08:00
wenyann 8c768895d4 Merge remote-tracking branch 'origin/master' 2021-03-23 14:16:18 +08:00
wenyann dc2f3cc092 fix:表头出现空白情况 2021-03-23 14:15:59 +08:00
fit2-zhao b7fe6101ee fix(接口定义): 恢复用例执行代码,接口变更,用例不能跟着变更 2021-03-23 14:11:48 +08:00
fit2-zhao 6761a96f15 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 13:54:22 +08:00
fit2-zhao 1be8ab1cac fix(接口自动化,接口定义): 回收站增加批量恢复功能 2021-03-23 13:54:04 +08:00
shiziyuan9527 39f48e3583 fix(测试跟踪): 修复首页跳转 2021-03-23 11:40:52 +08:00
wenyann 6be8af57a3 Merge remote-tracking branch 'origin/master' 2021-03-23 11:24:24 +08:00
wenyann 14ba48c95b fix:关联测试用例点击行选中 2021-03-23 11:24:04 +08:00
wenyann 23628537a2 fix:去掉测试用例下拉 2021-03-23 11:23:21 +08:00
fit2-zhao 4978b9381f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 11:11:24 +08:00
fit2-zhao 5b87b34071 fix(接口自动化): 解决while循环 超时时间影响后一个请求不执行问题修复 2021-03-23 11:11:08 +08:00