Commit Graph

6610 Commits

Author SHA1 Message Date
chenjianxing b0dbc6e240 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-30 13:06:21 +08:00
chenjianxing c93a4913a7 Merge branch 'v1.8' 2021-03-30 13:06:03 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +08:00
Captain.B 2b32f119a0 chore: sync 2021-03-30 12:58:52 +08:00
chenjianxing fc9d040579 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 12:06:18 +08:00
chenjianxing 378c31e3ca fix: swagger2 导入响应体 2021-03-30 12:05:52 +08:00
fit2-zhao cc07843e12 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 11:50:49 +08:00
fit2-zhao 4f4aa6f5d2 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
2021-03-30 11:50:34 +08:00
BugKing 569e86b0ce build: mvn打包前先安装前端依赖 2021-03-30 11:48:44 +08:00
fit2-zhao e0182038b9 fix(接口定义): 修改默认模块 2021-03-30 11:46:22 +08:00
chenjianxing 11bb0cf5a4 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 11:31:38 +08:00
chenjianxing 6240306795 fix: 导入接口用例创建到默认模块 2021-03-30 11:30:52 +08:00
shiziyuan9527 b2f5eab0b6 fix(场景自动化): 修复升级环境问题 2021-03-30 11:30:23 +08:00
Ambitiousliga f8b35a9e72
fix(测试跟踪):Excel导入用例时标签有内容会报错 (#1747)
* fix(测试跟踪):Excel导入用例时标签有内容报错

* fix(测试跟踪):excel导入只有新增用例且和错误用例时,关闭窗口会自动刷新。

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-30 11:02:59 +08:00
chenjianxing e56e2e19b5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 10:54:04 +08:00
chenjianxing 93b63980ea fix: 接口用例执行报错 2021-03-30 10:52:59 +08:00
Captain.B f18f2f2559 Merge branch 'v1.8' 2021-03-30 10:28:23 +08:00
Captain.B ede1cb0330 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 10:27:22 +08:00
Captain.B f2a6341b4c fix: 修复文件加载时文件名重复没有显示文件名的bug 2021-03-30 10:27:04 +08:00
chenjianxing 9aea32acf6 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 10:10:31 +08:00
chenjianxing e451a47f55 refactor: 修改swagger-parse版本 2021-03-30 10:10:17 +08:00
Captain.B 391a2924c8 chore: sync 2021-03-30 10:04:58 +08:00
Captain.B 0cfd281d07 feat(性能测试): 限制普通线程组的预热时间最大值不能超多压测时长 2021-03-30 10:04:20 +08:00
shiziyuan9527 47120c97cb refactor(场景自动化): 回退运行环境配置 2021-03-29 22:41:29 +08:00
chenjianxing 3f4dda8ccb Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 20:01:08 +08:00
chenjianxing ca3b951e2d fix: 测试计划状态 2021-03-29 20:00:51 +08:00
fit2-zhao 61f7a82371 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 19:34:31 +08:00
fit2-zhao 53212d75e8 fix(场景自动化): 执行日志报错问题修复 2021-03-29 19:34:15 +08:00
chenjianxing 2ba7cd8b1a fix: swgger base-url 导入后路径多了一个'/' 2021-03-29 19:03:17 +08:00
chenjianxing c832bbed3e Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 18:51:58 +08:00
chenjianxing b6faf61f73 fix: 旧版本导出文件接口定义导入失败 2021-03-29 18:50:59 +08:00
fit2-zhao 09c027a79c fix(场景自动化): 修复最大化切换数据展示问题 2021-03-29 18:38:06 +08:00
wenyann d7113c4c0c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 18:30:42 +08:00
wenyann 7332bd41ec fix:用例添加了评论,但编辑的时候看不到 2021-03-29 18:27:46 +08:00
fit2-zhao 2bd6172e4a Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 18:23:24 +08:00
fit2-zhao 1d9059de34 refactor(接口自动化,接口定义): 删除接口自动化场景调试产生的记录详情,保留最后一条 2021-03-29 18:23:10 +08:00
chenjianxing cda0b0d1bf Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 17:55:56 +08:00
Ambitiousliga c1d7f5df42 feat(测试跟踪):通过Excel导入导出时有ID字段,可通过Excel导入来更新用例。 (#1727)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-29 17:55:32 +08:00
song.tianyang 8697826dfd Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 17:40:35 +08:00
song.tianyang 2fac88cca8 fix: 修复页面展现XML格式数据时会自动转化标签的问题
修复页面展现XML格式数据时会自动转化标签的问题
2021-03-29 17:28:56 +08:00
shiziyuan9527 7a9079a479 fix(场景自动化): 场景下步骤未启用当前场景的环境 2021-03-29 17:02:34 +08:00
song.tianyang 809142af53 fix: 场景关联ESB接口时复制的ESB案例无法构建树结构数据
修复场景关联ESB接口时复制的ESB案例无法构建树结构数据
2021-03-29 16:50:33 +08:00
wenyann 52b0709753 fix:修复表头显示问题 2021-03-29 16:43:52 +08:00
fit2-zhao cb9a4d4a83 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 16:24:08 +08:00
fit2-zhao 933b508da0 fix(场景自动化): 修复升级环境问题 2021-03-29 16:23:04 +08:00
Captain.B 966b7318ca Merge branch 'v1.8' 2021-03-29 15:51:57 +08:00
Captain.B b00576b670 chore: sync 2021-03-29 15:50:00 +08:00
fit2-zhao 7e9e3f5a7b Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:46:57 +08:00
fit2-zhao 82def4f5b5 style(场景自动化): 调整步骤样式,默认显示复制按钮 2021-03-29 15:46:51 +08:00
wenyann ae391e54ce Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 15:29:32 +08:00