From 32ac59a03bda86428c1037e4a0a8f740b74523a6 Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Tue, 18 Jun 2024 13:56:04 +0200
Subject: [PATCH] fix: don't mark suites state since they are calculated based
 on children (#419)

* fix: don't mark suites state since they are calculated based on children

* test: correct tests for test results

* chore: cleanup
---
 src/runner/runner.ts   | 39 +++++++++++++++++++++++----------------
 test-e2e/basic.test.ts |  4 ++--
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/runner/runner.ts b/src/runner/runner.ts
index 117ea5d..f4101cb 100644
--- a/src/runner/runner.ts
+++ b/src/runner/runner.ts
@@ -3,9 +3,9 @@ import { rm } from 'node:fs/promises'
 import stripAnsi from 'strip-ansi'
 import * as vscode from 'vscode'
 import { getTasks } from '@vitest/ws-client'
-import type { ErrorWithDiff, File, ParsedStack, Task, TaskResult } from 'vitest'
+import type { ErrorWithDiff, File, ParsedStack, TaskResult } from 'vitest'
 import { basename, normalize, relative } from 'pathe'
-import { TestFile, TestFolder, getTestData } from '../testTreeData'
+import { TestCase, TestFile, TestFolder, getTestData } from '../testTreeData'
 import type { TestTree } from '../testTree'
 import type { VitestFolderAPI } from '../api'
 import { log } from '../log'
@@ -75,7 +75,7 @@ export class TestRunner extends vscode.Disposable {
         if (task.mode === 'skip' || task.mode === 'todo')
           testRun.skipped(test)
         else
-          this.markResult(testRun, test, task.result, task)
+          this.markResult(testRun, test, task.result)
       })
     })
 
@@ -95,7 +95,7 @@ export class TestRunner extends vscode.Disposable {
       files.forEach((file) => {
         const testItem = this.tree.getTestItemByTask(file)
         if (testItem)
-          this.markResult(testRun, testItem, file.result, file)
+          this.markResult(testRun, testItem, file.result)
       })
 
       if (unhandledError)
@@ -333,24 +333,31 @@ export class TestRunner extends vscode.Disposable {
     })
   }
 
-  private markResult(testRun: vscode.TestRun, test: vscode.TestItem, result?: TaskResult, task?: Task) {
+  private markResult(testRun: vscode.TestRun, test: vscode.TestItem, result?: TaskResult) {
+    const isTestCase = getTestData(test) instanceof TestCase
+
+    // generally, we shouldn't mark non test cases because
+    // parents are calculated based on children
+    if (!isTestCase) {
+      if (result?.state === 'fail') {
+        // errors in a suite are stored only if it happens during discovery
+        const errors = result.errors?.map(err =>
+          err.stack || err.message,
+        )
+        if (!errors?.length)
+          return
+        test.error = errors.join('\n')
+      }
+      return
+    }
+
     if (!result) {
       testRun.started(test)
       return
     }
+
     switch (result.state) {
       case 'fail': {
-        // error in a suite doesn't mean test fail
-        if (task?.type === 'suite') {
-          const errors = result.errors?.map(err =>
-            new vscode.TestMessage(err.stack || err.message),
-          )
-          if (!errors)
-            return
-          test.error = errors.map(e => e.message.toString()).join('\n')
-          testRun.errored(test, errors, result.duration)
-          return
-        }
         const errors = result.errors?.map(err =>
           testMessageForTestError(test, err),
         ) || []
diff --git a/test-e2e/basic.test.ts b/test-e2e/basic.test.ts
index 266701b..3a36d85 100644
--- a/test-e2e/basic.test.ts
+++ b/test-e2e/basic.test.ts
@@ -20,7 +20,7 @@ test('basic', async ({ launch }) => {
 
   await tester.runAllTests()
 
-  await expect(tester.tree.getResults()).toHaveText('3/7')
+  await expect(tester.tree.getResults()).toHaveText('2/4')
   await expect(tester.tree.getFileItem('pass.test.ts')).toHaveState('passed')
   await expect(tester.tree.getFileItem('fail.test.ts')).toHaveState('failed')
   await expect(tester.tree.getFileItem('mix.test.ts')).toHaveState('failed')
@@ -36,7 +36,7 @@ test('custom imba language', async ({ launch }) => {
 
   await tester.runAllTests()
 
-  await expect(tester.tree.getResults()).toHaveText('5/7')
+  await expect(tester.tree.getResults()).toHaveText('3/4')
   await expect(tester.tree.getFileItem('basic.test.imba')).toHaveState('passed')
   await expect(tester.tree.getFileItem('utils.imba')).toHaveState('passed')
   await expect(tester.tree.getFileItem('counter.imba')).toHaveState('failed')