test: fix tests

vitest-dev · Nov 13, 2024 · c1e23c5 · c1e23c5
1 parent 104002d
commit c1e23c5
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/test/browser/specs/runner.test.ts b/test/browser/specs/runner.test.ts
@@ -1,7 +1,6 @@
 import { readFile } from 'node:fs/promises'
 import { beforeAll, describe, expect, onTestFailed, test } from 'vitest'
-import { defaultBrowserPort } from 'vitest/config'
-import { browser, provider, runBrowserTests } from './utils'
+import { browser, runBrowserTests } from './utils'
 
 describe('running browser tests', async () => {
   let stderr: string
@@ -29,8 +28,6 @@ describe('running browser tests', async () => {
       console.error(stderr)
     })
 
-    expect(stdout).toContain(`Browser runner started by ${provider} at http://localhost:${defaultBrowserPort}/`)
-
     expect(browserResultJson.testResults).toHaveLength(19)
     expect(passedTests).toHaveLength(17)
     expect(failedTests).toHaveLength(2)

diff --git a/test/browser/specs/server-url.test.ts b/test/browser/specs/server-url.test.ts
@@ -1,24 +1,28 @@
 import { afterEach, expect, test } from 'vitest'
-import { provider, runBrowserTests } from './utils'
+import { runBrowserTests } from './utils'
 
 afterEach(() => {
   delete process.env.TEST_HTTPS
 })
 
 test('server-url http', async () => {
-  const { stdout, stderr } = await runBrowserTests({
+  const { stderr, ctx } = await runBrowserTests({
     root: './fixtures/server-url',
+    watch: true, // otherwise the browser is closed before we can get the url
   })
+  const url = ctx?.projects[0].browser?.vite.resolvedUrls?.local[0]
   expect(stderr).toBe('')
-  expect(stdout).toContain(`Browser runner started by ${provider} at http://localhost:51133/`)
+  expect(url).toBe('http://localhost:51133/')
 })
 
 test('server-url https', async () => {
   process.env.TEST_HTTPS = '1'
-  const { stdout, stderr } = await runBrowserTests({
+  const { stdout, stderr, ctx } = await runBrowserTests({
     root: './fixtures/server-url',
+    watch: true, // otherwise the browser is closed before we can get the url
   })
   expect(stderr).toBe('')
-  expect(stdout).toContain(`Browser runner started by ${provider} at https://localhost:51122/`)
+  const url = ctx?.projects[0].browser?.vite.resolvedUrls?.local[0]
+  expect(url).toBe('https://localhost:51122/')
   expect(stdout).toContain('Test Files  1 passed')
 })
diff --git a/test/cli/fixtures/browser-multiple/basic.test.js b/test/cli/fixtures/browser-multiple/basic.test.js
@@ -0,0 +1,3 @@
+import { test } from 'vitest';
+
+test('passes')
diff --git a/test/cli/fixtures/browser-multiple/vitest.workspace.ts b/test/cli/fixtures/browser-multiple/vitest.workspace.ts
@@ -6,7 +6,8 @@ export default defineWorkspace([
     cacheDir: resolve(import.meta.dirname, 'basic-1'),
     test: {
       name: 'basic-1',
-      include: ['none'],
+      dir: import.meta.dirname,
+      include: ['./basic.test.js'],
       browser: {
         enabled: true,
         name: 'chromium',
@@ -19,7 +20,8 @@ export default defineWorkspace([
     cacheDir: resolve(import.meta.dirname, 'basic-2'),
     test: {
       name: 'basic-2',
-      include: ['none'],
+      dir: import.meta.dirname,
+      include: ['./basic.test.js'],
       browser: {
         enabled: true,
         name: 'chromium',

diff --git a/test/cli/test/browser-multiple.test.ts b/test/cli/test/browser-multiple.test.ts
@@ -8,15 +8,18 @@ it('automatically assigns the port', async () => {
   const workspace = resolve(import.meta.dirname, '../fixtures/browser-multiple/vitest.workspace.ts')
   const spy = vi.spyOn(console, 'log')
   onTestFinished(() => spy.mockRestore())
-  const { stderr, stdout } = await runVitest({
+  const { stderr, ctx } = await runVitest({
     root,
     workspace,
     dir: root,
-    watch: false,
+    watch: true,
   })
+  const urls = ctx?.projects.map(p => p.browser?.vite.resolvedUrls?.local[0])
 
   expect(spy).not.toHaveBeenCalled()
   expect(stderr).not.toContain('is in use, trying another one...')
-  expect(stdout).toContain('Browser runner started by playwright at http://localhost:63315/')
-  expect(stdout).toContain('Browser runner started by playwright at http://localhost:63316/')
+  expect(urls).toEqual([
+    'http://localhost:63315/',
+    'http://localhost:63316/',
+  ])
 })