From a17635be5befb149ced1c9e549f148b342d40b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Thu, 20 Jun 2024 17:27:13 +0200 Subject: [PATCH] chore(ui): include test and custom types (#5940) --- packages/ui/client/composables/explorer/types.ts | 8 ++++++++ packages/ui/client/composables/explorer/utils.ts | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/ui/client/composables/explorer/types.ts b/packages/ui/client/composables/explorer/types.ts index c1e9cb7e86a7..163452b767c5 100644 --- a/packages/ui/client/composables/explorer/types.ts +++ b/packages/ui/client/composables/explorer/types.ts @@ -37,6 +37,14 @@ export interface UITaskTreeNode extends TaskTreeNode { duration?: number } +export interface TestTreeNode extends UITaskTreeNode { + type: 'test' +} + +export interface CustomTestTreeNode extends UITaskTreeNode { + type: 'custom' +} + export interface ParentTreeNode extends UITaskTreeNode { children: Set tasks: UITaskTreeNode[] diff --git a/packages/ui/client/composables/explorer/utils.ts b/packages/ui/client/composables/explorer/utils.ts index 7dbfdea5db18..9cd1e8593a83 100644 --- a/packages/ui/client/composables/explorer/utils.ts +++ b/packages/ui/client/composables/explorer/utils.ts @@ -1,12 +1,19 @@ import type { File, Task } from '@vitest/runner' import { isAtomTest } from '@vitest/runner/utils' -import type { FileTreeNode, ParentTreeNode, SuiteTreeNode, UITaskTreeNode } from '~/composables/explorer/types' +import type { + CustomTestTreeNode, + FileTreeNode, + ParentTreeNode, + SuiteTreeNode, + TestTreeNode, + UITaskTreeNode, +} from '~/composables/explorer/types' import { client } from '~/composables/client' import { getProjectNameColor, isSuite as isTaskSuite } from '~/utils/task' import { explorerTree } from '~/composables/explorer/index' import { openedTreeItemsSet } from '~/composables/explorer/state' -export function isTestNode(node: UITaskTreeNode): node is FileTreeNode { +export function isTestNode(node: UITaskTreeNode): node is TestTreeNode | CustomTestTreeNode { return node.type === 'test' || node.type === 'custom' }