fix(coverage): browser + v8 in source tests missing (#7946)

Author: AriPerkkio

packages/browser/src/node/plugin.ts

@@ -382,11 +382,13 @@ export default (parentServer: ParentBrowserProject, base = '/'): Plugin[] => {
     {
       name: 'vitest:browser:in-source-tests',
       transform(code, id) {
+        const filename = cleanUrl(id)
         const project = parentServer.vitest.getProjectByName(parentServer.config.name)
-        if (!project._isCachedTestFile(id) || !code.includes('import.meta.vitest')) {
+
+        if (!project._isCachedTestFile(filename) || !code.includes('import.meta.vitest')) {
           return
         }
-        const s = new MagicString(code, { filename: cleanUrl(id) })
+        const s = new MagicString(code, { filename })
         s.prepend(
           `import.meta.vitest = __vitest_index__;\n`,
         )

packages/coverage-v8/src/browser.ts

@@ -71,9 +71,5 @@ function filterResult(coverage: ScriptCoverage['result'][number]): boolean {
     return false
   }
 
-  if (coverage.url.includes('?browserv=') || coverage.url.includes('&browserv=')) {
-    return false
-  }
-
   return true
 }

packages/coverage-v8/src/provider.ts

@@ -399,6 +399,9 @@ export class V8CoverageProvider extends BaseCoverageProvider<ResolvedCoverageOpt
         if (result.url.startsWith('/@fs')) {
           result.url = `${FILE_PROTOCOL}${removeStartsWith(result.url, '/@fs')}`
         }
+        else if (result.url.startsWith(project.config.root)) {
+          result.url = `${FILE_PROTOCOL}${result.url}`
+        }
         else {
           result.url = `${FILE_PROTOCOL}${project.config.root}${result.url}`
         }

test/coverage-test/fixtures/src/in-source.ts

@@ -0,0 +1,17 @@
+/// <reference types="vitest/importMeta" />
+
+export function add(a: number, b: number) {
+  if(a === 5  && b === 7) {
+    return 12;
+  }
+
+  return a + b
+}
+
+if (import.meta.vitest) {
+  const { test, expect } = import.meta.vitest
+
+  test('in source test running add function', () => {
+    expect(add(10, 19)).toBe(29)
+  })
+}

test/coverage-test/test/in-source.test.ts

@@ -0,0 +1,47 @@
+import { expect } from 'vitest'
+import { isV8Provider, readCoverageMap, runVitest, test } from '../utils'
+
+test('in-source tests work', async () => {
+  const { stdout } = await runVitest({
+    include: [],
+    includeSource: ['fixtures/src/in-source.ts'],
+    coverage: { all: false, reporter: 'json' },
+  })
+
+  expect(stdout).toContain('in source test running add function')
+
+  const coverageMap = await readCoverageMap()
+  const files = coverageMap.files()
+
+  expect(files).toMatchInlineSnapshot(`
+    [
+      "<process-cwd>/fixtures/src/in-source.ts",
+    ]
+  `)
+
+  const fileCoverage = coverageMap.fileCoverageFor('<process-cwd>/fixtures/src/in-source.ts')
+
+  // If-branch is not taken - makes sure source maps are correct in in-source testing too
+  expect(fileCoverage.getUncoveredLines()).toContain('5')
+
+  if (isV8Provider()) {
+    expect(fileCoverage).toMatchInlineSnapshot(`
+      {
+        "branches": "2/4 (50%)",
+        "functions": "1/1 (100%)",
+        "lines": "10/12 (83.33%)",
+        "statements": "10/12 (83.33%)",
+      }
+    `)
+  }
+  else {
+    expect(fileCoverage).toMatchInlineSnapshot(`
+      {
+        "branches": "3/6 (50%)",
+        "functions": "2/2 (100%)",
+        "lines": "6/7 (85.71%)",
+        "statements": "6/7 (85.71%)",
+      }
+    `)
+  }
+})

test/coverage-test/vitest.workspace.custom.ts

@@ -100,6 +100,7 @@ export default defineWorkspace([
         '**/temporary-files.test.ts',
         '**/test-reporter-conflicts.test.ts',
         '**/vue.test.ts',
+        '**/in-source.test.ts',
       ],
     },
   },
@@ -126,6 +127,7 @@ export default defineWorkspace([
         '**/temporary-files.test.ts',
         '**/test-reporter-conflicts.test.ts',
         '**/vue.test.ts',
+        '**/in-source.test.ts',
       ],
     },
   },