refactor: cleanup

vitest-dev · Oct 2, 2022 · bc509c0 · bc509c0
1 parent 5660350
commit bc509c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
@@ -177,16 +177,12 @@ export class Vitest {
     })
     checker.onParseStart(async () => {
       await this.report('onInit', this)
-      const files = checker.getTestFiles()
-      if (files)
-        await this.report('onCollected', checker.getTestFiles())
+      await this.report('onCollected', checker.getTestFiles())
     })
     checker.onWatcherRerun(async () => {
       await this.report('onWatcherRerun', testsFilesList, 'File change detected. Triggering rerun.')
       await checker.collectTests()
-      const files = checker.getTestFiles()
-      if (files)
-        await this.report('onCollected', checker.getTestFiles())
+      await this.report('onCollected', checker.getTestFiles())
     })
     await checker.collectTests()
     await checker.start()

diff --git a/packages/vitest/src/node/reporters/base.ts b/packages/vitest/src/node/reporters/base.ts
@@ -275,8 +275,8 @@ export abstract class BaseReporter implements Reporter {
     }
 
     if (failedTests.length) {
-      const type = this.mode === 'typecheck' ? 'Typechecks' : 'Tests'
-      logger.error(c.red(divider(c.bold(c.inverse(` Failed ${type} ${failedTests.length} `)))))
+      const message = this.mode === 'typecheck' ? 'Type Errors' : 'Failed Tests'
+      logger.error(c.red(divider(c.bold(c.inverse(` ${message} ${failedTests.length} `)))))
       logger.error()
 
       await this.printTaskErrors(failedTests, errorDivider)

diff --git a/packages/vitest/src/typescript/collect.ts b/packages/vitest/src/typescript/collect.ts
@@ -92,14 +92,14 @@ export async function collectTests(ctx: Vitest, filepath: string): Promise<null
     },
   })
   let lastSuite: ParsedSuite = file
-  const getLatestSuite = (index: number) => {
+  const updateLatestSuite = (index: number) => {
     const suite = lastSuite
     while (lastSuite !== file && lastSuite.end < index)
       lastSuite = suite.suite as ParsedSuite
     return lastSuite
   }
   definitions.sort((a, b) => a.start - b.start).forEach((definition, idx) => {
-    const latestSuite = getLatestSuite(definition.start)
+    const latestSuite = updateLatestSuite(definition.start)
     let mode = definition.mode
     if (latestSuite.mode !== 'run') // inherit suite mode, if it's set
       mode = latestSuite.mode