Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/internal/test_runner/runner.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@ function getRunArgs(path, { forceExit,
inspectPort,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
only,
hasFiles,
testFiles,
Expand DownExpand Up@@ -224,8 +224,8 @@ function getRunArgs(path, { forceExit,
if (testSkipPatterns != null) {
ArrayPrototypeForEach(testSkipPatterns, (pattern) => ArrayPrototypePush(runArgs, `--test-skip-pattern=${pattern}`));
}
if (testTagFilterExpressions != null) {
ArrayPrototypeForEach(testTagFilterExpressions, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
if (testTagFilters != null) {
ArrayPrototypeForEach(testTagFilters, (value) => ArrayPrototypePush(runArgs, `--experimental-test-tag-filter=${value}`));
}
if (only === true) {
ArrayPrototypePush(runArgs, '--test-only');
Expand DownExpand Up@@ -284,6 +284,14 @@ class FileTest extends Test {
this.timeout = null;
}

willBeFilteredByTags() {
// File wrappers have no tags of their own. Tag filtering applies to the
// tests inside the file, which run in a child process (or in-process
// import); filtering the wrapper would prevent the file from running at
// all.
return false;
}

#skipReporting() {
return this.#reportedChildren > 0 && (!this.error || this.error.failureType === kSubtestsFailed);
}
Expand DownExpand Up@@ -864,7 +872,6 @@ function run(options = kEmptyObject) {
});
}

let testTagFilterExpressions = null;
if (testTagFilters != null) {
if (!ArrayIsArray(testTagFilters)) {
testTagFilters = [testTagFilters];
Expand All@@ -876,10 +883,8 @@ function run(options = kEmptyObject) {
testTagFilters = ArrayPrototypeMap(testTagFilters, (value, i) => (
validateAndCanonicalizeTagFilter(value, `options.testTagFilters[${i}]`)
));
testTagFilterExpressions = testTagFilters;
}
}
testTagFilterExpressions ??= options.testTagFilterExpressions;

validateOneOf(isolation, 'options.isolation', ['process', 'none']);
validateBoolean(coverage, 'options.coverage');
Expand DownExpand Up@@ -982,7 +987,6 @@ function run(options = kEmptyObject) {
testNamePatterns,
testSkipPatterns,
testTagFilters,
testTagFilterExpressions,
hasFiles: files != null,
globPatterns,
only,
Expand Down
6 changes: 5 additions & 1 deletion lib/internal/test_runner/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,7 +656,7 @@ class Test extends AsyncResource {
}

if (isFilteringByTags) {
this.filteredByTag = !evaluateTagFilters(config.testTagFilters, this.tagSet);
this.filteredByTag = this.willBeFilteredByTags();
if (!this.filteredByTag) {
for (let t = this.parent; t !== null && t.filteredByTag; t = t.parent) {
t.filteredByTag = false;
Expand DownExpand Up@@ -894,6 +894,10 @@ class Test extends AsyncResource {
return false;
}

willBeFilteredByTags() {
return !evaluateTagFilters(this.config.testTagFilters, this.tagSet);
}

/**
* Returns a name of the test prefixed by name of all its ancestors in ascending order, separated by a space
* Ex."grandparent parent test"
Expand Down
18 changes: 5 additions & 13 deletions lib/internal/test_runner/utils.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,7 +273,6 @@ function parseCommandLine() {
let testNamePatterns = mapPatternFlagToRegExArray('--test-name-pattern');
let testSkipPatterns = mapPatternFlagToRegExArray('--test-skip-pattern');
let testTagFilters = null;
let testTagFilterExpressions = null;

if (isChildProcessV8) {
kBuiltinReporters.set('v8-serializer', 'internal/test_runner/reporter/v8-serializer');
Expand DownExpand Up@@ -309,19 +308,14 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
// Validate at parent startup so a malformed flag fails fast,
// independent of isolation mode. Under isolation='process' the
// validated strings go unused at the parent (children re-validate
// and apply the filter); the validation here only surfaces input
// errors early.
const validated = ArrayPrototypeMap(
// File wrappers are exempt from tag filtering, so holding the filters
// in the parent is safe under any isolation mode; under
// isolation='process' the canonical values are re-emitted to the
// child processes, which apply the filter themselves.
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
);
if (isolation === 'none') {
testTagFilters = validated;
}
}

if (isolation === 'none') {
Expand DownExpand Up@@ -365,7 +359,6 @@ function parseCommandLine() {
const tagFilterFlag = getOptionValue('--experimental-test-tag-filter');
if (tagFilterFlag?.length > 0) {
emitExperimentalWarning('Test tags');
testTagFilterExpressions = tagFilterFlag;
testTagFilters = ArrayPrototypeMap(
tagFilterFlag,
(value, i) => validateAndCanonicalizeTagFilter(value, `--experimental-test-tag-filter[${i}]`),
Expand DownExpand Up@@ -433,7 +426,6 @@ function parseCommandLine() {
sourceMaps,
testNamePatterns,
testSkipPatterns,
testTagFilterExpressions,
testTagFilters,
timeout,
updateSnapshots,
Expand Down
14 changes: 11 additions & 3 deletions test/parallel/test-runner-tags-events.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,14 +83,22 @@ describe('tag-bearing event payloads', { concurrency: false }, () => {
});

it('test:pass fires only for selected tagged tests when filtered', async () => {
// isolation='none' so the parent applies the filter directly. Under
// 'process', the FileTest wrapper (which has no tags) would itself be
// filtered out by the include filter - same wart as --test-name-pattern.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'none' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});

it('filtering under process isolation runs the file and filters inside it', async () => {
// The FileTest wrapper has no tags and must not be filtered out itself;
// the filter is re-emitted to the child process and applied there.
const stream = run({ files: [fixture], testTagFilters: ['db'], isolation: 'process' });
stream.on('test:fail', common.mustNotCall());
// 3 db-tagged tests pass + the db suite itself.
stream.on('test:pass', common.mustCall(4));
// eslint-disable-next-line no-unused-vars
for await (const _ of stream);
});
});
Loading