fixup!: rename fail → xfail

Author: JakobJingleheimer

lib/internal/test_runner/harness.js

@@ -377,7 +377,7 @@ function runInParentContext(Factory) {
 
     return run(name, options, fn, overrides);
   };
-  ArrayPrototypeForEach(['fail', 'skip', 'todo', 'only'], (keyword) => {
+  ArrayPrototypeForEach(['xfail', 'skip', 'todo', 'only'], (keyword) => {
     test[keyword] = (name, options, fn) => {
       const overrides = {
         __proto__: null,

lib/internal/test_runner/reporter/tap.js

@@ -33,12 +33,12 @@ async function * tapReporter(source) {
   for await (const { type, data } of source) {
     switch (type) {
       case 'test:fail': {
-        yield reportTest(data.nesting, data.testNumber, 'not ok', data.name, data.fail, data.skip, data.todo);
+        yield reportTest(data.nesting, data.testNumber, 'not ok', data.name, data.skip, data.todo, data.xfail);
         const location = data.file ? `${data.file}:${data.line}:${data.column}` : null;
         yield reportDetails(data.nesting, data.details, location);
         break;
       } case 'test:pass':
-        yield reportTest(data.nesting, data.testNumber, 'ok', data.name, data.expectFail, data.skip, data.todo);
+        yield reportTest(data.nesting, data.testNumber, 'ok', data.name, data.skip, data.todo, data.xfail);
         yield reportDetails(data.nesting, data.details, null);
         break;
       case 'test:plan':
@@ -65,22 +65,22 @@ async function * tapReporter(source) {
   }
 }
 
-function reportTest(nesting, testNumber, status, name, fail, skip, todo) {
+function reportTest(nesting, testNumber, status, name, skip, todo, xfail) {
   let line = `${indent(nesting)}${status} ${testNumber}`;
 
   if (name) {
     line += ` ${tapEscape(`- ${name}`)}`;
   }
-console.trace('fail:', fail)
+
   if (skip !== undefined) {
     line += ` # SKIP${typeof skip === 'string' && skip.length ? ` ${tapEscape(skip)}` : ''}`;
   } else if (todo !== undefined) {
     line += ` # TODO${typeof todo === 'string' && todo.length ? ` ${tapEscape(todo)}` : ''}`;
   }
   // `skip` should trump, and `todo` + `fail` is a mistake, but it will already fail, so nothing to
   // do when this is after `todo`.
-  else if (fail !== undefined) {
-    line += ` # EXPECTED FAIL${typeof fail === 'string' && fail.length ? ` ${tapEscape(fail)}` : ''}`;
+  else if (xfail !== undefined) {
+    line += ' # EXPECTED FAIL';
   }
 
   line += '\n';

lib/internal/test_runner/test.js

@@ -351,11 +351,6 @@ class TestContext {
     this.#test.runOnlySubtests = !!value;
   }
 
-  fail(err) {
-    console.log('err:', err);
-    this.#test.fail(err);
-  }
-
   skip(message) {
     this.#test.skip(message);
   }
@@ -512,7 +507,7 @@ class Test extends AsyncResource {
     super('Test');
 
     let { fn, name, parent } = options;
-    const { concurrency, entryFile, fail, loc, only, timeout, todo, skip, signal, plan } = options;
+    const { concurrency, entryFile, xfail, loc, only, timeout, todo, skip, signal, plan } = options;
 
     if (typeof fn !== 'function') {
       fn = noop;
@@ -651,7 +646,7 @@ class Test extends AsyncResource {
     this.plan = null;
     this.expectedAssertions = plan;
     this.cancelled = false;
-    this.expectFail = fail !== undefined && fail !== false;
+    this.xfail = xfail !== undefined && xfail !== false;
     this.skipped = skip !== undefined && skip !== false;
     this.isTodo = (todo !== undefined && todo !== false) || this.parent?.isTodo;
     this.startTime = null;
@@ -955,7 +950,7 @@ class Test extends AsyncResource {
       return;
     }
 
-    if (this.expectFail === true) {
+    if (this.xfail === true) {
       this.passed = true;
     } else {
       this.passed = false;

test/fixtures/test-runner/output/describe_it.js

@@ -5,19 +5,19 @@ const { describe, it, test } = require('node:test');
 const util = require('util');
 
 
-it.fail('sync expect to fail', () => {
+it.xfail('sync expect fail', () => {
   throw new Error('should pass');
 });
 
-it('sync expect to fail', { fail: true }, () => {
+it('sync expect fail', { xfail: true }, () => {
   throw new Error('should pass');
 });
 
-it.fail('sync expect to fail', async () => {
+it.xfail('sync expect fail', async () => {
   throw new Error('should pass');
 });
 
-it('sync expect to fail', { fail: true }, async () => {
+it('sync expect fail', { xfail: true }, async () => {
   throw new Error('should pass');
 });
 
@@ -32,7 +32,7 @@ it.todo('sync todo', () => {
   throw new Error('should not count as a failure');
 });
 
-it.todo('sync todo with expect fail', { fail: true }, () => {
+it.todo('sync todo with expect fail', { xfail: true }, () => {
   throw new Error('should not count as an expected failure');
 });
 
@@ -43,7 +43,7 @@ it('sync todo with message', { todo: 'this is a failing todo' }, () => {
 it.skip('sync skip pass', () => {
 });
 
-it.skip('sync skip expect fail', { fail: true }, () => {
+it.skip('sync skip expect fail', { xfail: true }, () => {
   throw new Error('should not fail');
 });