fix(测试跟踪): 修复测试计划-UI测试用例列表/关联用例/关联用例-高级搜索3个地方的执行结果状态显示及搜索返回不符

--bug=1018856 --user=刘瑶 【测试跟踪】测试计划-UI测试用例列表/关联用例/关联用例-高级搜索3个地方的执行结果状态显示及搜索返回不符 https://www.tapd.cn/55049933/s/1277349
--bug=1018848 --user=刘瑶 【测试跟踪】报告-UI 用例统计分析-未执行和失败tab页未显示数据且点击执行结果未显示报告 https://www.tapd.cn/55049933/s/1277350
This commit is contained in:
nathan.liu 2022-10-25 22:34:50 +08:00 committed by nathanliu2022
parent d35e1eb4e4
commit 9fa0ddfd4f
4 changed files with 27 additions and 8 deletions

View File

@ -273,6 +273,24 @@ export const API_SCENARIO_RESULT = {
multiple: true multiple: true
} }
} }
// 场景执行结果
export const UI_SCENARIO_RESULT = {
key: "lastResult",
name: 'MsTableSearchSelect',
label: 'test_track.plan_view.execute_result',
operator: {
options: [OPERATORS.IN, OPERATORS.NOT_IN]
},
options: [
{text: 'Pending', value: 'PENDING'},
{text: 'Success', value: 'SUCCESS'},
{text: 'Error', value: 'ERROR'},
],
props: { // 尾部控件的props一般为element ui控件的props
multiple: true
}
}
// 请求类型 // 请求类型
export const API_METHOD = { export const API_METHOD = {
key: "method", key: "method",
@ -858,6 +876,7 @@ export const TEST_PLAN_RELEVANCE_FUNC_CONFIGS = [NAME, TAGS, CREATE_TIME, UPDATE
export const TEST_PLAN_RELEVANCE_API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, TAGS, UPDATE_TIME, CREATE_TIME, CREATOR]; export const TEST_PLAN_RELEVANCE_API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, TAGS, UPDATE_TIME, CREATE_TIME, CREATOR];
export const TEST_PLAN_RELEVANCE_API_CASE_CONFIGS = [NAME, PRIORITY, TAGS, UPDATE_TIME, CREATOR, API_PATH]; export const TEST_PLAN_RELEVANCE_API_CASE_CONFIGS = [NAME, PRIORITY, TAGS, UPDATE_TIME, CREATOR, API_PATH];
export const TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS = [NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, CREATE_TIME, UPDATE_TIME, CREATOR]; export const TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS = [NAME, PRIORITY, TAGS, API_SCENARIO_RESULT, CREATE_TIME, UPDATE_TIME, CREATOR];
export const TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS = [NAME, PRIORITY, TAGS, UI_SCENARIO_RESULT, CREATE_TIME, UPDATE_TIME, CREATOR];
export const TEST_PLAN_RELEVANCE_LOAD_CASE = [NAME, STATUS, CREATE_TIME, UPDATE_TIME, CREATOR]; export const TEST_PLAN_RELEVANCE_LOAD_CASE = [NAME, STATUS, CREATE_TIME, UPDATE_TIME, CREATOR];
// 测试用例关联测试 // 测试用例关联测试

View File

@ -11,7 +11,7 @@
<ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare" <ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare"
:report="report" :is-template="isTemplate" :plan-id="planId" :report="report" :is-template="isTemplate" :plan-id="planId"
:ui-all-cases="uiAllCases" :ui-all-cases="uiAllCases"
:filter-status="['Error']" :filter-status="['Error', 'ERROR']"
@setSize="setFailureSize"/> @setSize="setFailureSize"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane style="min-height: 500px" name="third" v-if="unExecuteEnable"> <el-tab-pane style="min-height: 500px" name="third" v-if="unExecuteEnable">
@ -21,7 +21,7 @@
<ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare" <ui-scenario-result :is-db="isDb" :share-id="shareId" :is-share="isShare"
:report="report" :is-template="isTemplate" :plan-id="planId" :report="report" :is-template="isTemplate" :plan-id="planId"
:ui-all-cases="uiAllCases" :ui-all-cases="uiAllCases"
:filter-status="['unexecute', 'STOP']" :filter-status="['unexecute', 'STOP', 'PENDING']"
@setSize="setUnExecuteSize"/> @setSize="setUnExecuteSize"/>
</el-tab-pane> </el-tab-pane>

View File

@ -55,10 +55,10 @@
<el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')" sortable="custom" <el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')" sortable="custom"
min-width="120px"> min-width="120px">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success'"> <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success' || row.lastResult === 'SUCCESS'">
{{ $t('api_test.automation.success') }} {{ $t('api_test.automation.success') }}
</el-link> </el-link>
<el-link type="danger" @click="showReport(row)" v-if="row.lastResult === 'Fail'"> <el-link type="danger" @click="showReport(row)" v-if="row.lastResult === 'Fail' || row.lastResult === 'FAIL'">
{{ $t('api_test.automation.fail') }} {{ $t('api_test.automation.fail') }}
</el-link> </el-link>
</template> </template>
@ -79,7 +79,7 @@ import MsTag from "metersphere-frontend/src/components/MsTag";
import TestPlanScenarioListHeader from "../api/TestPlanScenarioListHeader"; import TestPlanScenarioListHeader from "../api/TestPlanScenarioListHeader";
import PriorityTableItem from "@/business/common/tableItems/planview/PriorityTableItem"; import PriorityTableItem from "@/business/common/tableItems/planview/PriorityTableItem";
import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar"; import MsTableAdvSearchBar from "metersphere-frontend/src/components/search/MsTableAdvSearchBar";
import {TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS} from "metersphere-frontend/src/components/search/search-components"; import {TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
import {ENV_TYPE} from "metersphere-frontend/src/utils/constants"; import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
import MsTable from "metersphere-frontend/src/components/table/MsTable"; import MsTable from "metersphere-frontend/src/components/table/MsTable";
import {getOwnerProjects, getVersionFilters} from "@/business/utils/sdk-utils"; import {getOwnerProjects, getVersionFilters} from "@/business/utils/sdk-utils";
@ -113,7 +113,7 @@ export default {
loading: false, loading: false,
showConfigButtonWithOutPermission: false, showConfigButtonWithOutPermission: false,
condition: { condition: {
components: TEST_PLAN_RELEVANCE_API_SCENARIO_CONFIGS components: TEST_PLAN_RELEVANCE_UI_SCENARIO_CONFIGS
}, },
currentScenario: {}, currentScenario: {},
schedule: {}, schedule: {},

View File

@ -148,7 +148,7 @@
:label="$t('api_test.automation.last_result')"> :label="$t('api_test.automation.last_result')">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-link @click="showReport(row)" :disabled="!row.lastResult || row.lastResult==='PENDING' || row.lastResult==='UnExecute'"> <el-link @click="showReport(row)" :disabled="!row.lastResult || row.lastResult==='PENDING' || row.lastResult==='UnExecute'">
<ms-test-plan-api-status :status="row.lastResult"/> <ms-test-plan-api-status status="PENDING"/>
</el-link> </el-link>
</template> </template>
</ms-table-column> </ms-table-column>
@ -189,7 +189,7 @@ import MsTag from "metersphere-frontend/src/components/MsTag";
import {getCurrentProjectID, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token"; import {getCurrentProjectID, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
import {hasLicense} from "metersphere-frontend/src/utils/permission"; import {hasLicense} from "metersphere-frontend/src/utils/permission";
import {getUUID, strMapToObj} from "metersphere-frontend/src/utils"; import {getUUID, strMapToObj} from "metersphere-frontend/src/utils";
import TestPlanScenarioListHeader from "../api/TestPlanScenarioListHeader"; import TestPlanScenarioListHeader from "../ui/TestPlanUiScenarioListHeader";
import MsPlanRunMode from "@/business/plan/common/PlanRunModeWithEnv"; import MsPlanRunMode from "@/business/plan/common/PlanRunModeWithEnv";
import { import {
initCondition, initCondition,