test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,770 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

4507 Commits

Author SHA1 Message Date
Captain.B 0cfd281d07 feat(性能测试): 限制普通线程组的预热时间最大值不能超多压测时长 2021-03-30 10:04:20 +08:00
shiziyuan9527 47120c97cb refactor(场景自动化): 回退运行环境配置 2021-03-29 22:41:29 +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
chenjianxing c832bbed3e Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 18:51:58 +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
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
wenyann 7502bdcc7a fix:删除无用代码 2021-03-29 15:29:10 +08:00
fit2-zhao 8d635743bc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:01:25 +08:00
fit2-zhao a3b1c4f4d5 feat(场景自动化，测试用例): 默认选中树节点添加对应功能 2021-03-29 15:01:18 +08:00
fit2-zhao d3fccb25d6 feat(场景自动化，测试用例，): 测试用例、 接口定义、场景自动化 增加“默认模块” 创建测试用例、接口定义、场景时 所属模块默认值为“默认模块” 2021-03-29 14:43:25 +08:00
Captain.B 3ea6c015d1 Merge branch 'v1.8' 2021-03-29 13:44:58 +08:00
Captain.B 1d90a1b56c chore: sync 2021-03-29 13:44:41 +08:00
fit2-zhao e2ead6e002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
 2021-03-29 13:31:50 +08:00
fit2-zhao fddad77ace Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
 2021-03-29 13:31:42 +08:00
fit2-zhao 49097dc7b6 feat(接口定义): 接口定义、增加“默认模块” 创建接口定义所属模块默认值为“默认模块” 2021-03-29 13:19:59 +08:00
Captain.B 223b88cfbb Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 12:32:37 +08:00
Captain.B 4c5bcb6307 feat(性能测试): 修复场景名称过长导致样式出错的问题 2021-03-29 12:32:21 +08:00
shiziyuan9527 033a4a69f0 refactor(场景自动化): 运行环境优化 2021-03-29 12:03:14 +08:00
chenjianxing 9c96088006 Merge commit 'cc5ff944d1ed0ac524591553486cdc6a6effaadf' into v1.8 2021-03-29 12:00:19 +08:00
chenjianxing 28ed11d09b fix: 脑图全屏下拉框无法显示 2021-03-29 11:51:51 +08:00
Captain.B b5e3077544 Merge branch 'v1.8' 2021-03-29 10:57:10 +08:00
Captain.B c5e977b091 fix: 尝试修复表格固定列之后错乱的问题 2021-03-29 10:56:14 +08:00
Ambitiousliga 999f55985d
feat(测试跟踪):通过Excel导入导出时有ID字段，可通过Excel导入来更新用例。 (#1727) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-29 09:35:12 +08:00
shiziyuan9527 fd34e063ff refactor(场景自动化): 运行环境优化 2021-03-27 19:11:12 +08:00
Captain.B 0e1991ae28 fix(性能测试): 修复报告对比bug 2021-03-26 19:07:23 +08:00
Captain.B 8e8ce9a90d Merge branch 'v1.8' 2021-03-26 18:39:02 +08:00
song.tianyang ae3d1adf33 Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:33:52 +08:00
Captain.B cd13e58cb0 feat(性能测试): 测试报告支持对比 2021-03-26 18:24:04 +08:00
Captain.B 39187a0cba Merge branch 'v1.8' 2021-03-26 18:20:51 +08:00
Captain.B 9bfaf7588e Revert "feat(性能测试): 测试报告支持对比" 2021-03-26 18:20:18 +08:00
Captain.B a162fe4f45 Revert "feat(性能测试): 测试报告支持对比" 
This reverts commit e26561e4
 2021-03-26 18:16:54 +08:00
Captain.B 1f5fc92233 Revert "refactor(性能测试): 报告对比将当前报告的标记写在名称前边" 
This reverts commit 34be7ce2
 2021-03-26 18:16:43 +08:00
Captain.B 8b36c3b150 Merge branch 'v1.8' 2021-03-26 18:13:18 +08:00
wenyann ca67a3ed56 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 18:13:08 +08:00
wenyann 5ac89f8410 fix: 表头修改 2021-03-26 18:12:25 +08:00
Captain.B 34be7ce27f refactor(性能测试): 报告对比将当前报告的标记写在名称前边 2021-03-26 18:10:00 +08:00
Captain.B 40870f3d65 Merge remote-tracking branch 'origin/master' 2021-03-26 18:06:03 +08:00
Captain.B f29cad3cf0 chore: sync 2021-03-26 18:05:21 +08:00
Captain.B e6f889b16e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:04:41 +08:00
Captain.B cd80921632 Merge branch 'compare' into v1.8 2021-03-26 18:04:17 +08:00
Captain.B e26561e464 feat(性能测试): 测试报告支持对比 2021-03-26 18:03:58 +08:00
fit2-zhao 8f06031cec fix(测试跟踪): 点击树菜单，列表恢复到列表 2021-03-26 18:03:00 +08:00
song.tianyang 64263c2cdb Merge remote-tracking branch 'origin/v1.8' into v1.8 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
 2021-03-26 18:02:08 +08:00
song.tianyang c1416fe407 fix: 测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中 
测试用例，选中【选择所有数据】，翻页后发现第2页之后的数据并没有被选中
 2021-03-26 17:47:43 +08:00
wenyann d12ec06066 fix: 测试跟踪用例重复显示 2021-03-26 17:16:08 +08:00
chenjianxing 89c6666c9e Merge branch 'master' of github.com:metersphere/metersphere 2021-03-26 17:06:40 +08:00
chenjianxing cc5ff944d1 refactor: 重构模式搜索框 2021-03-26 17:06:22 +08:00
fit2-zhao 12f1c60a0f Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 16:29:35 +08:00
fit2-zhao dda1217c1a fix(接口自动化): 修复导入场景步骤请求 ip 和端口 是变量的问题 2021-03-26 16:29:18 +08:00
Captain.B b29d302ad2 refactor(性能测试): 测试报告统计标题 KO -> FAIL 2021-03-26 14:21:13 +08:00
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B 371628ba54 fix: 处理冲突 2021-03-26 14:10:04 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-26 14:04:21 +08:00
Captain.B 6fcc8536d0 chore: sync 2021-03-26 14:00:34 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
fit2-zhao e903441002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 11:21:52 +08:00
fit2-zhao ba76c82851 fix(接口自动化): 修复复制场景，场景变量不能编辑问题 2021-03-26 11:21:38 +08:00
Captain.B 767faf9dfe fix: 尝试修复表格固定列之后错乱的问题 2021-03-26 09:52:03 +08:00
fit2-zhao 6257fce4a9 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 19:34:48 +08:00
Captain.B ef6c7ae83c chore: sync 2021-03-25 19:26:42 +08:00
Captain.B 612d8438c9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 19:25:24 +08:00
Captain.B b4bb64f9da fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 
Closes #1708
 2021-03-25 19:25:08 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
fit2-zhao 12a32b8bc4 fix(接口自动化): 修复场景移动后，移动到的模块名称不能修改问题 2021-03-25 18:40:11 +08:00
shiziyuan9527 a8b54c9d74 refactor: 打开环境配置时默认选中当前配置 2021-03-25 18:33:03 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
song.tianyang 24c9b5d0a1 fix: 文档不超过5个数据时下滚出现问题 
文档不超过5个数据时下滚出现问题
 2021-03-25 17:02:59 +08:00
Captain.B 1c773f83de fix: 尝试修复表格固定列之后错乱的问题 2021-03-25 16:57:15 +08:00
Captain.B 8328cab574 chore: sync 2021-03-25 15:44:06 +08:00
chenjianxing 25d11cd5e6 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-25 15:33:58 +08:00
Captain.B 806772a339 fix(测试跟踪): 修复planId可能为空调用后台报错的问题 2021-03-25 14:54:59 +08:00
fit2-zhao e2ae033d87 fix(接口自动化): 修复if条件不起作用问题 2021-03-25 14:44:34 +08:00
chenjianxing fa78e9a7f5 refactor: 去掉控制台打印 2021-03-25 14:08:54 +08:00
chenjianxing 21bf611d2a Merge branch 'master' into v1.8 2021-03-25 14:06:20 +08:00
chenjianxing 7ac98d98cf fix: 测试用例列表标签显示问题 2021-03-25 14:05:37 +08:00
Captain.B 08d46862eb chore: sync 2021-03-25 12:24:45 +08:00
Captain.B 6e97d412ee fix(性能测试): 修复用例和场景转换性能测试保存文件的问题 2021-03-25 12:22:07 +08:00
song.tianyang cf39bb066d Merge remote-tracking branch 'origin/master' 2021-03-25 12:02:19 +08:00
song.tianyang 7780bf980d fix: 转性能测试增加参数 
转性能测试增加参数
 2021-03-25 11:59:54 +08:00
Captain.B 4aadacdf98 Merge remote-tracking branch 'origin/master' 2021-03-25 11:20:46 +08:00
Captain.B 21de1ba11f fix(性能测试): 提供文件更新的功能 2021-03-25 11:20:32 +08:00
song.tianyang abe7b9fae8 Merge remote-tracking branch 'origin/master' 2021-03-25 11:10:18 +08:00
song.tianyang 28b2048fcb fix: 测试计划关联跨项目场景用例，批量选中不显示数量的问题 
测试计划关联跨项目场景用例，批量选中不显示数量的问题
 2021-03-25 11:08:53 +08:00
fit2-zhao e0fd1422ab fix(接口自动化): 去除最大化关闭按钮 2021-03-25 11:08:17 +08:00
shiziyuan9527 83ee946f31 fix(测试跟踪): 修复测试评审关联用例页面默认未选中当前项目的问题 2021-03-25 10:24:41 +08:00
Captain.B 4e270cd409 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:20:36 +08:00
Captain.B c6319bf763 Merge remote-tracking branch 'origin/master' 2021-03-25 10:15:50 +08:00
Captain.B 0db75e1b12 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:15:33 +08:00
fit2-zhao b1e48675c1 refactor(接口自动化): 优化部分代码 2021-03-25 10:02:57 +08:00
chenjianxing 6a45fe5f57 fix: 页面刷新projectId为空 2021-03-25 09:49:34 +08:00
wenyann 52ef34c78b fix:jenkins通知 2021-03-25 08:41:01 +08:00
wenyann 51948d79a0 Merge remote-tracking branch 'origin/master' 2021-03-25 01:46:29 +08:00
wenyann 6c1daf4620 fix: 初始化自定义表头 2021-03-25 01:45:56 +08:00
Captain.B 0664c5a569 fix(性能测试): 修复从接口自动化创建性能测试没有场景的bug 2021-03-25 00:19:39 +08:00
Captain.B 73e9824c5f chore: sync 2021-03-24 23:05:38 +08:00
chenjianxing 8c10f3d5b4 refactor: 初始化vuex清除projectId 2021-03-24 22:25:59 +08:00
chenjianxing f80f6c74d1 fix: 工作空间无项目时报错 2021-03-24 22:21:51 +08:00
chenjianxing 6dd49752fc Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 22:13:10 +08:00
chenjianxing 6a79dcba08 refactor: 模块名称不能带'\' 2021-03-24 22:12:58 +08:00
Captain.B 51e820d697 refactor(测试跟踪): 删掉不用的代码 2021-03-24 21:56:29 +08:00
chenjianxing d03976d8e1 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 21:30:17 +08:00
chenjianxing 519c868418 refactor: 测试用例模块名称长度改为100 2021-03-24 21:30:07 +08:00
song.tianyang 9d134f85a4 Merge remote-tracking branch 'origin/master' 2021-03-24 20:20:49 +08:00
song.tianyang c90ab047bb fix: 修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题 
修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题
 2021-03-24 20:18:36 +08:00
fit2-zhao a611768e52 fix(接口自动化): 去掉脚本成功后缓存 2021-03-24 20:15:37 +08:00
fit2-zhao 0948132bae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 20:11:32 +08:00
chenjianxing 406a8ff935 fix: 测试计划-脑图用例状态未更新 2021-03-24 20:04:44 +08:00
chenjianxing 0fa16caf5a Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:57:18 +08:00
Coooder-X f115f25f87
fix: 测试计划的通过率前端值类型转换 (#1700) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态

* fix: 测试计划的通过率前端值类型转换

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-24 19:54:14 +08:00
chenjianxing 8cb054df86 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:53:19 +08:00
chenjianxing 21a4586ddc refactor: 编辑新增测试用例实时更新脑图 2021-03-24 19:53:08 +08:00
fit2-zhao 4c3e69cdf1 fix(接口自动化): 修复引用步骤执行结果内容运行复制 2021-03-24 19:27:11 +08:00
BugKing 5fce9a65bd Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-24 19:15:04 +08:00
BugKing 77a550dd3a refactor: 修改版本号 2021-03-24 19:14:54 +08:00
wenyann beac8a9a14 Merge remote-tracking branch 'origin/master' 2021-03-24 19:11:18 +08:00
wenyann e9c004d8ef fix:merge 2021-03-24 19:11:00 +08:00
Captain.B dfb0f1c12f Merge remote-tracking branch 'origin/master' 2021-03-24 19:07:14 +08:00
wenyann 95baefb1c9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 19:07:06 +08:00
Captain.B d92526ab4e chore: sync 2021-03-24 19:06:59 +08:00
song.tianyang 27e405fde5 Merge remote-tracking branch 'origin/master' 2021-03-24 19:05:17 +08:00
shiziyuan9527 f9eba24408 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 19:00:05 +08:00
song.tianyang 6ee42fbbea fix: 修复工作空间权限问题 
修复工作空间权限问题
 2021-03-24 18:59:15 +08:00
shiziyuan9527 0abec56775 fix(测试跟踪): 修复新建用例缺陷 2021-03-24 18:59:10 +08:00
wenyann 22d437cc85 fix:projectId 2021-03-24 18:58:26 +08:00
fit2-zhao c3937b1c44 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 18:58:05 +08:00
wenyann ad5346d7e8 fix:合并 2021-03-24 18:52:07 +08:00
fit2-zhao fca46fd9e7 fix(接口定义): 修复另存新接口路径不更新问题 2021-03-24 18:51:24 +08:00
wenyann efae6aae5b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 18:40:05 +08:00
wenyann 53fc7b6eaf fix:创建用例关联测试显示问题 2021-03-24 18:33:56 +08:00
fit2-zhao 637f0ea707 fix(接口自动化): 修复另存接口协议错误问题 2021-03-24 18:10:22 +08:00
Captain.B ebc1013c89 Merge remote-tracking branch 'origin/master' 2021-03-24 17:54:07 +08:00
fit2-zhao 9a6b47051b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:53:56 +08:00
shiziyuan9527 599a78995c fix(场景自动化): 跨项目sql用例环境问题 2021-03-24 17:52:26 +08:00
Captain.B 4b9b9f4953 Merge remote-tracking branch 'origin/master' 2021-03-24 17:51:59 +08:00
chenjianxing 3e52d67914 fix: 新增编辑用例更新脑图 2021-03-24 17:51:51 +08:00