From 1839007011b3a871a1930b0414a201f348fab97d Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 5 Jan 2023 04:22:12 +0800 Subject: [PATCH 01/11] add basic reporter --- docs/config/index.md | 1 + packages/vitest/src/node/reporters/basic.ts | 5 +++++ packages/vitest/src/node/reporters/index.ts | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 packages/vitest/src/node/reporters/basic.ts diff --git a/docs/config/index.md b/docs/config/index.md index 477d86f844d7..cac1d8ed8b43 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -353,6 +353,7 @@ Project root Custom reporters for output. Reporters can be [a Reporter instance](https://github.com/vitest-dev/vitest/blob/main/packages/vitest/src/types/reporter.ts) or a string to select built in reporters: - `'default'` - collapse suites when they pass + - `'basic'` - default reporter in ci - `'verbose'` - keep the full task tree visible - `'dot'` - show each task as a single dot - `'junit'` - JUnit XML reporter (you can configure `testsuites` tag name with `VITEST_JUNIT_SUITE_NAME` environmental variable) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts new file mode 100644 index 000000000000..6bd569757049 --- /dev/null +++ b/packages/vitest/src/node/reporters/basic.ts @@ -0,0 +1,5 @@ +import { DefaultReporter } from './default' + +export class BasicReporter extends DefaultReporter { + isTTY = false as const +} diff --git a/packages/vitest/src/node/reporters/index.ts b/packages/vitest/src/node/reporters/index.ts index 664f2afcad58..dc1b4d859641 100644 --- a/packages/vitest/src/node/reporters/index.ts +++ b/packages/vitest/src/node/reporters/index.ts @@ -1,3 +1,4 @@ +import { BasicReporter } from './basic' import { DefaultReporter } from './default' import { DotReporter } from './dot' import { JsonReporter } from './json' @@ -10,6 +11,7 @@ export { DefaultReporter } export const ReportersMap = { 'default': DefaultReporter, + 'basic': BasicReporter, 'verbose': VerboseReporter, 'dot': DotReporter, 'json': JsonReporter, From 03feb9b053ef8627710f9ed57d4a79a3b98818ce Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 5 Jan 2023 05:03:13 +0800 Subject: [PATCH 02/11] extend basic reporter --- packages/vitest/src/node/reporters/basic.ts | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 6bd569757049..0d5d5fb7524b 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -1,5 +1,27 @@ import { DefaultReporter } from './default' +import type { UserConsoleLog } from '#types' export class BasicReporter extends DefaultReporter { isTTY = false as const + + async onTestRemoved() { + } + + onCollected() { + } + + async onFinished(files = this.ctx.state.getFiles(), errors = this.ctx.state.getUnhandledErrors()) { + await super.onFinished(files, errors) + } + + async stopListRender() { + this.renderer = undefined + } + + onUserConsoleLog(log: UserConsoleLog) { + if (!this.shouldLog(log)) + return + + super.onUserConsoleLog(log) + } } From 2246466d605fd693ea52238ed81e57443c8de82b Mon Sep 17 00:00:00 2001 From: Trim21 Date: Sat, 7 Jan 2023 19:51:08 +0800 Subject: [PATCH 03/11] Update index.md --- docs/config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/index.md b/docs/config/index.md index cac1d8ed8b43..3d76ba59336f 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -353,7 +353,7 @@ Project root Custom reporters for output. Reporters can be [a Reporter instance](https://github.com/vitest-dev/vitest/blob/main/packages/vitest/src/types/reporter.ts) or a string to select built in reporters: - `'default'` - collapse suites when they pass - - `'basic'` - default reporter in ci + - `'basic'` - behavior like default reporter in ci - `'verbose'` - keep the full task tree visible - `'dot'` - show each task as a single dot - `'junit'` - JUnit XML reporter (you can configure `testsuites` tag name with `VITEST_JUNIT_SUITE_NAME` environmental variable) From 131696c8bfeb4ec696ecd9a4e5c0ba40955fc741 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Sat, 7 Jan 2023 19:52:51 +0800 Subject: [PATCH 04/11] Update index.md --- docs/config/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/index.md b/docs/config/index.md index 3d76ba59336f..fd6bc3e9b9b1 100644 --- a/docs/config/index.md +++ b/docs/config/index.md @@ -353,7 +353,7 @@ Project root Custom reporters for output. Reporters can be [a Reporter instance](https://github.com/vitest-dev/vitest/blob/main/packages/vitest/src/types/reporter.ts) or a string to select built in reporters: - `'default'` - collapse suites when they pass - - `'basic'` - behavior like default reporter in ci + - `'basic'` - give a reporter like default reporter give in ci - `'verbose'` - keep the full task tree visible - `'dot'` - show each task as a single dot - `'junit'` - JUnit XML reporter (you can configure `testsuites` tag name with `VITEST_JUNIT_SUITE_NAME` environmental variable) From dabdb8470069491ec7e6ab3e90b41669ce393511 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 12 Jan 2023 08:27:30 +0800 Subject: [PATCH 05/11] extend from base reporter --- packages/vitest/src/node/reporters/basic.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 0d5d5fb7524b..6322c708fb15 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -1,7 +1,7 @@ -import { DefaultReporter } from './default' +import { BaseReporter } from './base' import type { UserConsoleLog } from '#types' -export class BasicReporter extends DefaultReporter { +export class BasicReporter extends BaseReporter { isTTY = false as const async onTestRemoved() { @@ -14,13 +14,10 @@ export class BasicReporter extends DefaultReporter { await super.onFinished(files, errors) } - async stopListRender() { - this.renderer = undefined - } - onUserConsoleLog(log: UserConsoleLog) { - if (!this.shouldLog(log)) + if (!this.shouldLog(log)) { return + } super.onUserConsoleLog(log) } From 032a0328fb8b41025ee0c8bdf308d4f1f4aeb9e4 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 12 Jan 2023 08:40:34 +0800 Subject: [PATCH 06/11] fix lint --- packages/vitest/src/node/reporters/basic.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 6322c708fb15..f3b41a68511f 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -10,14 +10,9 @@ export class BasicReporter extends BaseReporter { onCollected() { } - async onFinished(files = this.ctx.state.getFiles(), errors = this.ctx.state.getUnhandledErrors()) { - await super.onFinished(files, errors) - } - onUserConsoleLog(log: UserConsoleLog) { - if (!this.shouldLog(log)) { + if (!this.shouldLog(log)) return - } super.onUserConsoleLog(log) } From 16e46c0cb7bb0fa20195a2e88f4135c25f336ac9 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 12 Jan 2023 08:46:10 +0800 Subject: [PATCH 07/11] override onReRun --- packages/vitest/src/node/reporters/basic.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index f3b41a68511f..2b86665606be 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -10,6 +10,9 @@ export class BasicReporter extends BaseReporter { onCollected() { } + async onWatcherRerun() { + } + onUserConsoleLog(log: UserConsoleLog) { if (!this.shouldLog(log)) return From 496d3d5c10cb743c84153f3d09d25d7ad526aa8a Mon Sep 17 00:00:00 2001 From: Trim21 Date: Thu, 12 Jan 2023 08:57:13 +0800 Subject: [PATCH 08/11] only ovverride onWatcherRerun --- packages/vitest/src/node/reporters/basic.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 2b86665606be..3dfc8e5354c1 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -4,12 +4,6 @@ import type { UserConsoleLog } from '#types' export class BasicReporter extends BaseReporter { isTTY = false as const - async onTestRemoved() { - } - - onCollected() { - } - async onWatcherRerun() { } From b59c74cb92e5315adde390d228a09840ae6090e5 Mon Sep 17 00:00:00 2001 From: Vladimir Sheremet Date: Mon, 16 Jan 2023 10:04:31 +0100 Subject: [PATCH 09/11] chore: cleanup --- packages/vitest/src/node/reporters/basic.ts | 16 ++++++---------- packages/vitest/src/utils/env.ts | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 3dfc8e5354c1..ea24eb20209d 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -1,16 +1,12 @@ import { BaseReporter } from './base' -import type { UserConsoleLog } from '#types' +import type { File } from '#types' export class BasicReporter extends BaseReporter { - isTTY = false as const + isTTY = false - async onWatcherRerun() { - } - - onUserConsoleLog(log: UserConsoleLog) { - if (!this.shouldLog(log)) - return - - super.onUserConsoleLog(log) + reportSummary(files: File[]) { + // non-tty mode doesn't add a new line + this.ctx.logger.log() + return super.reportSummary(files) } } diff --git a/packages/vitest/src/utils/env.ts b/packages/vitest/src/utils/env.ts index 87c1c22667d2..648a7337ceea 100644 --- a/packages/vitest/src/utils/env.ts +++ b/packages/vitest/src/utils/env.ts @@ -1,2 +1,2 @@ -export const isNode = typeof process < 'u' && typeof process.stdout < 'u' && !process.versions?.deno && !globalThis.window -export const isBrowser = typeof window !== 'undefined' +export const isNode: boolean = typeof process < 'u' && typeof process.stdout < 'u' && !process.versions?.deno && !globalThis.window +export const isBrowser: boolean = typeof window !== 'undefined' From 9a461ac6e170c5975580063f3fc9187a1f164d78 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Mon, 16 Jan 2023 17:12:20 +0800 Subject: [PATCH 10/11] add override back --- packages/vitest/src/node/reporters/basic.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index ea24eb20209d..08860a34d6cd 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -3,6 +3,9 @@ import type { File } from '#types' export class BasicReporter extends BaseReporter { isTTY = false + + async onWatcherRerun() { + } reportSummary(files: File[]) { // non-tty mode doesn't add a new line From 64169d3ac82046cb6d8d8a67dca1aefee3ff7aae Mon Sep 17 00:00:00 2001 From: Trim21 Date: Mon, 16 Jan 2023 17:35:50 +0800 Subject: [PATCH 11/11] revert --- packages/vitest/src/node/reporters/basic.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/vitest/src/node/reporters/basic.ts b/packages/vitest/src/node/reporters/basic.ts index 08860a34d6cd..ea24eb20209d 100644 --- a/packages/vitest/src/node/reporters/basic.ts +++ b/packages/vitest/src/node/reporters/basic.ts @@ -3,9 +3,6 @@ import type { File } from '#types' export class BasicReporter extends BaseReporter { isTTY = false - - async onWatcherRerun() { - } reportSummary(files: File[]) { // non-tty mode doesn't add a new line