From 72fe5fffaf7989ebdb9da9386d59f3798e6c22bc Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Thu, 12 Jan 2023 19:38:02 +0800 Subject: [PATCH 1/2] fix: trim input filename and test name --- packages/vitest/src/node/core.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts index eeff77a45e11..0cd4d317d104 100644 --- a/packages/vitest/src/node/core.ts +++ b/packages/vitest/src/node/core.ts @@ -364,13 +364,13 @@ export class Vitest { } async changeNamePattern(pattern: string, files: string[] = this.state.getFilepaths(), trigger?: string) { - this.config.testNamePattern = pattern ? new RegExp(pattern) : undefined + this.config.testNamePattern = pattern.trim() ? new RegExp(pattern) : undefined await this.rerunFiles(files, trigger) } async changeFilenamePattern(pattern: string) { const files = this.state.getFilepaths() - if (!pattern) + if (!pattern.trim()) return await this.rerunFiles(files, 'reset filename pattern') const filteredFiles = await this.globTestFiles([pattern]) await this.rerunFiles(filteredFiles, 'change filename pattern') From ff88037ab06483c678435921585eb49c58d424bb Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Thu, 12 Jan 2023 22:39:15 +0800 Subject: [PATCH 2/2] fix: update trim position --- packages/vitest/src/node/core.ts | 4 ++-- packages/vitest/src/node/stdin.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts index 0cd4d317d104..eeff77a45e11 100644 --- a/packages/vitest/src/node/core.ts +++ b/packages/vitest/src/node/core.ts @@ -364,13 +364,13 @@ export class Vitest { } async changeNamePattern(pattern: string, files: string[] = this.state.getFilepaths(), trigger?: string) { - this.config.testNamePattern = pattern.trim() ? new RegExp(pattern) : undefined + this.config.testNamePattern = pattern ? new RegExp(pattern) : undefined await this.rerunFiles(files, trigger) } async changeFilenamePattern(pattern: string) { const files = this.state.getFilepaths() - if (!pattern.trim()) + if (!pattern) return await this.rerunFiles(files, 'reset filename pattern') const filteredFiles = await this.globTestFiles([pattern]) await this.rerunFiles(filteredFiles, 'change filename pattern') diff --git a/packages/vitest/src/node/stdin.ts b/packages/vitest/src/node/stdin.ts index fce2a739e0bb..0bfc603b0226 100644 --- a/packages/vitest/src/node/stdin.ts +++ b/packages/vitest/src/node/stdin.ts @@ -83,7 +83,7 @@ export function registerConsoleShortcuts(ctx: Vitest) { message: 'Input test name pattern (RegExp)', initial: ctx.config.testNamePattern?.source || '', }]) - await ctx.changeNamePattern(filter, undefined, 'change pattern') + await ctx.changeNamePattern(filter.trim(), undefined, 'change pattern') on() } @@ -95,8 +95,8 @@ export function registerConsoleShortcuts(ctx: Vitest) { message: 'Input filename pattern', initial: latestFilename, }]) - latestFilename = filter - await ctx.changeFilenamePattern(filter) + latestFilename = filter.trim() + await ctx.changeFilenamePattern(filter.trim()) on() }