Commit Graph

3446 Commits

Author SHA1 Message Date
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
chenjianxing f9e2c089ef fix: 接口用例页面响应组件优化 2021-01-19 20:30:30 +08:00
fit2-zhao 9b17d887ee Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 18:36:34 +08:00
fit2-zhao a1881d0f51 fix(接口自动化): 引用场景校验 2021-01-19 18:36:14 +08:00
song.tianyang 9527c29d96 Merge remote-tracking branch 'origin/master' 2021-01-19 18:32:41 +08:00
song.tianyang adcd180e44 fix: 修改用例图标
修改用例图标
2021-01-19 18:32:16 +08:00
fit2-zhao 4aa1c0cf57 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 18:01:29 +08:00
fit2-zhao 8a47dfa112 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-01-19 18:01:07 +08:00
shiziyuan9527 5b48087c22 fix(测试计划): 修复Dialog遮罩层问题 2021-01-19 17:30:27 +08:00
Captain.B 67f03a4d33 Merge remote-tracking branch 'origin/master' 2021-01-19 17:03:20 +08:00
Captain.B 0516111190 refactor: cas 不允许修改密码 2021-01-19 16:45:55 +08:00
shiziyuan9527 64a511fe00 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 16:33:25 +08:00
shiziyuan9527 086a1e50bb feat(测试计划): 性能测试用例按照名称或ID查询 2021-01-19 16:30:47 +08:00
BugKing 339c739bc2 refactor(系统设置): 调整项目管理和个人信息子菜单位置 2021-01-19 16:29:41 +08:00
Captain.B f666b140bb feat(xPack): cas 认证源设置 2021-01-19 16:22:32 +08:00
song.tianyang c7dfb4160b fix: 修改图标、修改"一件创建性能测试"时压力配置下方显示的内容
修改图标、修改"一件创建性能测试"时压力配置下方显示的内容
2021-01-19 16:16:58 +08:00
fit2-zhao f6490cb5ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 15:54:42 +08:00
fit2-zhao 387c685455 fix(接口自动化): 循环控制器死循环问题修复 2021-01-19 15:54:13 +08:00
Captain.B 9dde59379d Merge remote-tracking branch 'origin/master' 2021-01-19 15:50:20 +08:00
Captain.B 43ae3dd2ce feat(xPack): CAS 登录 2021-01-19 15:49:20 +08:00
shiziyuan9527 0b128343ef refactor(测试计划): 性能测试用例优化 2021-01-19 15:42:08 +08:00
song.tianyang 0f983aae63 fix: 修复测试计划手动保存报告不成功的问题
修复测试计划手动保存报告不成功的问题
2021-01-19 14:43:13 +08:00
song.tianyang e4b16c31d4 feat: 测试计划-增加定时任务、修改接口列表、接口自动化的按钮
测试计划-增加定时任务、修改接口列表、接口自动化的按钮
2021-01-19 14:26:58 +08:00
chenjianxing c964785385 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 13:50:57 +08:00
chenjianxing 56f38b5698 refactor: 环境批量添加变量和请求头 2021-01-19 13:50:49 +08:00
fit2-zhao e2356c1849 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 13:12:58 +08:00
fit2-zhao 4c882ffafd feat(接口定义): 测试步骤位置调整 2021-01-19 13:12:35 +08:00
chenjianxing 8f49a7fdd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 11:16:33 +08:00
chenjianxing 5938bc747f refactor: 从接口列表导入支持翻页多选 2021-01-19 11:16:16 +08:00
fit2-zhao ac4e52091d feat(接口自动化): 循环状态控制 ,当循环下只有一个请求时,可以开启/关闭; 当循环下超过一个请求时,则只能开启。 2021-01-19 10:12:08 +08:00
Captain.B 26edcd1e0c chore: Sync 2021-01-19 09:43:23 +08:00
chenjianxing 8589eeb47b refactor: 场景组件点击名称编辑自动获取焦点 2021-01-18 20:35:34 +08:00
chenjianxing 2baa9682e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 19:23:07 +08:00
chenjianxing 49071d1145 refactor: 用例列表添加批量执行 2021-01-18 19:22:58 +08:00
fit2-zhao 6e4e42812a fix(接口自动化): 循环控制器处理 2021-01-18 18:26:45 +08:00
fit2-zhao 7fdf8b4154 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
2021-01-18 18:15:31 +08:00
fit2-zhao ba6c5b85a6 fix(接口自动化): 修复执行报告场景名称问题 2021-01-18 18:12:02 +08:00
wenyann 3c36edbb96 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
2021-01-18 18:07:57 +08:00
wenyann 5b2359ec3c feat: swagger定时自动同步 2021-01-18 18:05:25 +08:00
shiziyuan9527 07de54a8e5 refactor(测试跟踪): 关联项目处增加说明图标 2021-01-18 17:54:07 +08:00
song.tianyang 3cbca58209 fix: 修复全选统计错误的缺陷、修复测试计划定时任务的缺陷
修复全选统计错误的缺陷、修复测试计划定时任务的缺陷
2021-01-18 17:45:01 +08:00
shiziyuan9527 de31246d53 refactor(测试跟踪): 用例评审优化 2021-01-18 17:28:12 +08:00
chenjianxing 0e88589142 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 17:10:55 +08:00
chenjianxing 51ca545122 fix: 修改接口用例空指针 2021-01-18 17:07:12 +08:00
fit2-zhao cb73ebc2a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 15:44:40 +08:00
fit2-zhao 17fc35d01e fix(接口定义): 单条用例执行时保存变化内容 2021-01-18 15:44:19 +08:00
chenjianxing 7cb3d59d02 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 15:38:46 +08:00
chenjianxing 6bb13a7a59 refactor: json响应自动格式化 2021-01-18 15:38:27 +08:00
fit2-zhao 8653a20c60 fix(接口定义): 现实执行脚本 2021-01-18 15:20:40 +08:00
fit2-zhao 7766db552c style(接口测试): 统一接口定义和接口自动化 Tab 添加样式 2021-01-18 14:22:14 +08:00
fit2-zhao 6d6853101b fix(接口自动化): 复制组件放到一起 2021-01-18 13:42:55 +08:00
fit2-zhao 20f7e727ea fix(接口定义): JSON-SCHEMA转换问题修复 2021-01-18 13:31:52 +08:00
fit2-zhao c1303bd8a8 refactor(接口定义): 重构HTTP请求,规范代码 2021-01-18 13:25:44 +08:00
fit2-zhao b0d01bebba fix(接口定义): 修复用例执行成功后,结果未更新,响应内容为空 2021-01-18 13:02:23 +08:00
fit2-zhao ab421ae204 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 12:44:38 +08:00
fit2-zhao 46a9600908 refactor(接口自动化): 重构添加组件方法 2021-01-18 12:44:02 +08:00
chenjianxing 49c0de83b6 refactor: 测试计划编辑用例按钮小屏适配 2021-01-18 11:39:51 +08:00
chenjianxing c53687d37d fix: 接口测试文件上传失败 2021-01-18 11:12:28 +08:00
chenjianxing b024c5da54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 10:29:10 +08:00
fit2-zhao b0c158235c fix(接口自动化): 修改变量统计问题 2021-01-18 09:50:42 +08:00
fit2-zhao bd505a5c32 style(接口自动化): 统一步骤样式 2021-01-13 18:18:50 +08:00
song.tianyang 8d152a077e feat(测试计划增加定时任务、增加测试报告查看页面):
测试计划增加定时任务、增加测试报告查看页面
2021-01-13 16:51:02 +08:00
fit2-zhao 4069654f7d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 16:34:00 +08:00
fit2-zhao a315a77055 style(接口定义): JSON-SCHEMA 样式调整 2021-01-13 16:33:39 +08:00
shiziyuan9527 93654862ef refactor(测试计划): 性能测试用例执行 2021-01-13 16:17:18 +08:00
chenjianxing 2dee505e53 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 16:04:27 +08:00
chenjianxing 0a8a2b55bf fix: 嵌套表格全选样式生效 2021-01-13 16:04:10 +08:00
fit2-zhao 41f928aa89 feat(接口定义): 接口用例增加执行结果展示 2021-01-13 15:25:05 +08:00
chenjianxing d24d7e5144 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 15:02:34 +08:00
chenjianxing b4d1b25cdf refactor: 用例列表全屏显示 2021-01-13 15:02:14 +08:00
fit2-zhao c8b9b2babb fix(接口自动化): 数据迁移,模块以树形结构展示 2021-01-13 14:34:43 +08:00
fit2-zhao 0230aba400 fix(接口自动化): 解决无法创建场景问题 2021-01-13 11:24:20 +08:00
chenjianxing 6f67e89a9d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 11:20:44 +08:00
chenjianxing 1ec251c65a refactor: 测试用例列表页面优化 2021-01-13 11:20:27 +08:00
shiziyuan9527 6811a5c9a2 refactor(测试计划): 统计报告优化 2021-01-13 11:19:22 +08:00
fit2-zhao 4654e5fff2 提交误删除引用 2021-01-13 10:20:59 +08:00
chenjianxing 53c2d6f7fa Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 09:56:52 +08:00
chenjianxing 5aa5b5ebc3 refactor: 场景和模块树页面优化 2021-01-13 09:56:33 +08:00
shiziyuan9527 1c4365cc28 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 18:09:26 +08:00
shiziyuan9527 17ecef469b feat(测试计划): 统计报告新增性能测试用例饼图 2021-01-12 18:08:40 +08:00
fit2-zhao dfd7f6de59 fix(接口自动化): LOOP 页面下拉选项丢失找回 2021-01-12 18:07:32 +08:00
fit2-zhao 20c9d9b50c fix(接口定义): 不允许拖拽 2021-01-12 18:02:23 +08:00
fit2-zhao 14a54cabcc Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/definition/components/processor/Jsr233Processor.vue
2021-01-12 18:00:26 +08:00
fit2-zhao 930850031e style(接口定义): 脚本样式优化 2021-01-12 17:55:41 +08:00
chenjianxing 4ffa2b045d fix: 解决冲突 2021-01-12 17:39:49 +08:00
chenjianxing 255e31e2d9 refactor: 接口定义组件优化 2021-01-12 17:34:52 +08:00
fit2-zhao 413241a688 fix(接口自动化): 修改移动问题 2021-01-12 17:31:29 +08:00
fit2-zhao cc1e26fbdc Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiComponent.vue
#	frontend/src/business/components/api/automation/scenario/IfController.vue
#	frontend/src/business/components/api/automation/scenario/Jsr233Processor.vue
#	frontend/src/business/components/api/automation/scenario/LoopController.vue
#	frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/definition/components/extract/ApiExtract.vue
2021-01-12 17:29:57 +08:00
fit2-zhao 59301d63ce fix(接口自动化): 解决场景自动化步骤编辑不能全选问题 2021-01-12 16:57:41 +08:00
chenjianxing 7f49a1b8ef Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 16:28:54 +08:00
chenjianxing 283912edc1 refactor: 重构接口自动化组件 2021-01-12 16:28:34 +08:00
fit2-zhao 0903d7f878 fix(接口定义): 默认添加一条用例 2021-01-12 16:13:03 +08:00
shiziyuan9527 30b3f83725 feat(测试计划): 性能测试用例展示ID列 2021-01-12 15:41:14 +08:00
shiziyuan9527 4cef65d9f8 feat(性能测试): 测试列表添加ID列 2021-01-12 15:22:08 +08:00
Captain.B d7dbcf0860 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/xpack
2021-01-12 15:09:04 +08:00
Captain.B c3673be342 feat: 配置认证源 2021-01-12 15:08:07 +08:00
fit2-zhao a1eac0996f feat(接口自动化): 修复部分缺陷 2021-01-12 14:51:15 +08:00
fit2-zhao 86b19b68fc feat(接口自动化): 报告优化 2021-01-12 11:16:46 +08:00
fit2-zhao a023b85f99 fix(接口自动化): 冲突合并 2021-01-11 19:00:47 +08:00
chenjianxing 5781cc7b1e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 18:14:48 +08:00
chenjianxing 07b500331d feat: 接口定义TCP 2021-01-11 18:14:35 +08:00