diff --git a/lib/internal/fs/glob.js b/lib/internal/fs/glob.js index c5bbdb9813c0d1..01d331d3f0c39e 100644 --- a/lib/internal/fs/glob.js +++ b/lib/internal/fs/glob.js @@ -927,13 +927,15 @@ class Glob { * @param {string} path the path to check * @param {string} pattern the glob pattern to match * @param {boolean} windows whether the path is on a Windows system, defaults to `isWindows` + * @param {object} [options] the options for the minimatch module * @returns {boolean} */ -function matchGlobPattern(path, pattern, windows = isWindows) { +function matchGlobPattern(path, pattern, windows = isWindows, options = kEmptyObject) { validateString(path, 'path'); validateString(pattern, 'pattern'); return lazyMinimatch().minimatch(path, pattern, { kEmptyObject, + ...options, nocase: isMacOS || isWindows, windowsPathsNoEscape: true, nonegate: true, diff --git a/lib/internal/test_runner/coverage.js b/lib/internal/test_runner/coverage.js index 8fa9c872568d1e..4b964b7ed50a58 100644 --- a/lib/internal/test_runner/coverage.js +++ b/lib/internal/test_runner/coverage.js @@ -44,6 +44,11 @@ const kIgnoreRegex = /\/\* node:coverage ignore next (?\d+ )?\*\//; const kLineEndingRegex = /\r?\n$/u; const kLineSplitRegex = /(?<=\r?\n)/u; const kStatusRegex = /\/\* node:coverage (?enable|disable) \*\//; +const kMatchGlobPatternOptions = { __proto__: null, dot: true }; + +function matchCoverageGlob(path, pattern) { + return matchGlobPattern(path, pattern, undefined, kMatchGlobPatternOptions); +} class CoverageLine { constructor(line, startOffset, src, length = src?.length) { @@ -481,8 +486,8 @@ class TestCoverage { if (excludeGlobs?.length > 0) { for (let i = 0; i < excludeGlobs.length; ++i) { if ( - matchGlobPattern(relativePath, excludeGlobs[i]) || - matchGlobPattern(absolutePath, excludeGlobs[i]) + matchCoverageGlob(relativePath, excludeGlobs[i]) || + matchCoverageGlob(absolutePath, excludeGlobs[i]) ) return true; } } @@ -491,8 +496,8 @@ class TestCoverage { if (includeGlobs?.length > 0) { for (let i = 0; i < includeGlobs.length; ++i) { if ( - matchGlobPattern(relativePath, includeGlobs[i]) || - matchGlobPattern(absolutePath, includeGlobs[i]) + matchCoverageGlob(relativePath, includeGlobs[i]) || + matchCoverageGlob(absolutePath, includeGlobs[i]) ) return false; } return true; diff --git a/test/fixtures/test-runner/coverage-default-exclusion/test/.dotfile.cjs b/test/fixtures/test-runner/coverage-default-exclusion/test/.dotfile.cjs new file mode 100644 index 00000000000000..ec0a4c24fffb3a --- /dev/null +++ b/test/fixtures/test-runner/coverage-default-exclusion/test/.dotfile.cjs @@ -0,0 +1,7 @@ +const test = require('node:test'); +const assert = require('node:assert'); +const { foo } = require('../logic-file.js'); + +test('foo returns 1 from a dotfile test', () => { + assert.strictEqual(foo(), 1); +}); diff --git a/test/parallel/test-runner-coverage-default-exclusion.mjs b/test/parallel/test-runner-coverage-default-exclusion.mjs index 44e5f7600d3270..2ef6d81bf1dd9b 100644 --- a/test/parallel/test-runner-coverage-default-exclusion.mjs +++ b/test/parallel/test-runner-coverage-default-exclusion.mjs @@ -114,4 +114,34 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => { assert(result.stdout.toString().includes(report)); assert.strictEqual(result.status, 0); }); + + it('should exclude dotfile test files from coverage by default', async () => { + const report = [ + '# start of coverage report', + '# --------------------------------------------------------------', + '# file | line % | branch % | funcs % | uncovered lines', + '# --------------------------------------------------------------', + '# logic-file.js | 66.67 | 100.00 | 50.00 | 5-7', + '# --------------------------------------------------------------', + '# all files | 66.67 | 100.00 | 50.00 | ', + '# --------------------------------------------------------------', + '# end of coverage report', + ].join('\n'); + + const args = [ + '--no-experimental-strip-types', + '--test', + '--experimental-test-coverage', + '--test-reporter=tap', + 'test/.dotfile.cjs', + ]; + const result = spawnSync(process.execPath, args, { + env: { ...process.env, NODE_TEST_TMPDIR: tmpdir.path }, + cwd: tmpdir.path + }); + + assert.strictEqual(result.stderr.toString(), ''); + assert(result.stdout.toString().includes(report)); + assert.strictEqual(result.status, 0); + }); });