Skip to content

Commit 8b3c76a

Browse files
authored
chore: refactor test setup (#19789)
1 parent 2fa1495 commit 8b3c76a

File tree

2 files changed

+16
-27
lines changed

2 files changed

+16
-27
lines changed

playground/vitestSetup.ts

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ export const serverLogs: string[] = []
6767
export const browserLogs: string[] = []
6868
export const browserErrors: Error[] = []
6969

70-
export let resolvedConfig: ResolvedConfig = undefined!
71-
7270
export let page: Page = undefined!
7371
export let browser: Browser = undefined!
7472
export let viteTestUrl: string = ''
@@ -107,15 +105,6 @@ beforeAll(async (s) => {
107105
browser = await chromium.connect(wsEndpoint)
108106
page = await browser.newPage()
109107

110-
const globalConsole = global.console
111-
const warn = globalConsole.warn
112-
globalConsole.warn = (msg, ...args) => {
113-
// suppress @vue/reactivity-transform warning
114-
if (msg.includes('@vue/reactivity-transform')) return
115-
if (msg.includes('Generated an empty chunk')) return
116-
warn.call(globalConsole, msg, ...args)
117-
}
118-
119108
try {
120109
page.on('console', (msg) => {
121110
// ignore favicon request in headed browser
@@ -226,9 +215,6 @@ async function loadConfig(configEnv: ConfigEnv) {
226215
usePolling: true,
227216
interval: 100,
228217
},
229-
fs: {
230-
strict: !isBuild,
231-
},
232218
},
233219
build: {
234220
// esbuild do not minify ES lib output since that would remove pure annotations and break tree-shaking
@@ -249,13 +235,14 @@ export async function startDefaultServe(): Promise<void> {
249235
process.env.VITE_INLINE = 'inline-serve'
250236
const config = await loadConfig({ command: 'serve', mode: 'development' })
251237
viteServer = server = await (await createServer(config)).listen()
252-
viteTestUrl = server.resolvedUrls.local[0]
253-
if (server.config.base === '/') {
254-
viteTestUrl = viteTestUrl.replace(/\/$/, '')
255-
}
238+
viteTestUrl = stripTrailingSlashIfNeeded(
239+
server.resolvedUrls.local[0],
240+
server.config.base,
241+
)
256242
await page.goto(viteTestUrl)
257243
} else {
258244
process.env.VITE_INLINE = 'inline-build'
245+
let resolvedConfig: ResolvedConfig
259246
// determine build watch
260247
const resolvedPlugin: () => PluginOption = () => ({
261248
name: 'vite-plugin-watcher',
@@ -294,7 +281,10 @@ export async function startDefaultServe(): Promise<void> {
294281
const previewServer = await preview(previewConfig)
295282
// prevent preview change NODE_ENV
296283
process.env.NODE_ENV = _nodeEnv
297-
viteTestUrl = previewServer.resolvedUrls.local[0]
284+
viteTestUrl = stripTrailingSlashIfNeeded(
285+
previewServer.resolvedUrls.local[0],
286+
previewServer.config.base,
287+
)
298288
await page.goto(viteTestUrl)
299289
}
300290
}
@@ -362,6 +352,13 @@ export function slash(p: string): string {
362352
return p.replace(/\\/g, '/')
363353
}
364354

355+
function stripTrailingSlashIfNeeded(url: string, base: string): string {
356+
if (base === '/') {
357+
return url.replace(/\/$/, '')
358+
}
359+
return url
360+
}
361+
365362
declare module 'vite' {
366363
export interface UserConfig {
367364
/**

vitest.config.e2e.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ export default defineConfig({
2020
// Prevent Vitest from running the workspace packages in Vite's SSR runtime
2121
moduleDirectories: ['node_modules', 'packages'],
2222
},
23-
onConsoleLog(log) {
24-
if (
25-
log.match(
26-
/experimental|jit engine|emitted file|tailwind|The CJS build of Vite/i,
27-
)
28-
)
29-
return false
30-
},
3123
},
3224
esbuild: {
3325
target: 'node18',

0 commit comments

Comments
 (0)