From 4e09df4dc8851a0cdd935e05052db4e2668a8b54 Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Fri, 14 Apr 2023 10:12:26 +0200
Subject: [PATCH 1/3] test_runner: execute before hook on test

Execute the before hook for Test as well, and execute it on root before
executing any tests.

Fixes: https://github.com/nodejs/node/issues/47518
---
 doc/api/test.md                               | 25 ++++++++
 lib/internal/test_runner/test.js              | 14 +++-
 test/fixtures/test-runner/output/hooks.js     | 10 ++-
 .../test-runner/output/hooks.snapshot         | 64 ++++++++++++++++---
 4 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index 2f7c07aa673de1..cb03b0d323ea12 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1498,12 +1498,37 @@ Emitted when a test starts.
 added:
   - v18.0.0
   - v16.17.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/47586
+    description: The `before` function was added to TestContext
 -->
 
 An instance of `TestContext` is passed to each test function in order to
 interact with the test runner. However, the `TestContext` constructor is not
 exposed as part of the API.
 
+### `context.before([fn][, options])`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+* `fn` {Function|AsyncFunction} The hook function. The first argument
+  to this function is a [`TestContext`][] object. If the hook uses callbacks,
+  the callback function is passed as the second argument. **Default:** A no-op
+  function.
+* `options` {Object} Configuration options for the hook. The following
+  properties are supported:
+  * `signal` {AbortSignal} Allows aborting an in-progress hook.
+  * `timeout` {number} A number of milliseconds the hook will fail after.
+    If unspecified, subtests inherit this value from their parent.
+    **Default:** `Infinity`.
+
+This function is used to create a hook running before running a suite.
+before subtest of the current test.
+
+
 ### `context.beforeEach([fn][, options])`
 
 <!-- YAML
diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index c1203c91177f43..c5ceda91dd5442 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -127,6 +127,10 @@ class TestContext {
     return subtest.start();
   }
 
+  before(fn, options) {
+    this.#test.createHook('before', fn, options);
+  }
+
   after(fn, options) {
     this.#test.createHook('after', fn, options);
   }
@@ -414,6 +418,9 @@ class Test extends AsyncResource {
     validateOneOf(name, 'hook name', kHookNames);
     // eslint-disable-next-line no-use-before-define
     const hook = new TestHook(fn, options);
+    if (name === 'before') {
+      hook.run = runOnce(hook.run);
+    }
     ArrayPrototypePush(this.hooks[name], hook);
     return hook;
   }
@@ -525,6 +532,9 @@ class Test extends AsyncResource {
       if (this.parent?.hooks.beforeEach.length > 0) {
         await this.parent.runHook('beforeEach', { args, ctx });
       }
+      if (this.parent?.hooks.before.length > 0) {
+        await this.parent.runHook('before', this.parent.getRunArgs());
+      }
       const stopPromise = stopTest(this.timeout, this.signal);
       const runArgs = ArrayPrototypeSlice(args);
       ArrayPrototypeUnshift(runArgs, this.fn, ctx);
@@ -561,7 +571,7 @@ class Test extends AsyncResource {
       this.pass();
     } catch (err) {
       try { await after(); } catch { /* Ignore error. */ }
-      try { await afterEach(); } catch { /* test is already failing, let's the error */ }
+      try { await afterEach(); } catch { /* test is already failing, let's ignore the error */ }
       if (isTestFailureError(err)) {
         if (err.failureType === kTestTimeoutFailure) {
           this.#cancel(err);
@@ -793,7 +803,7 @@ class Suite extends Test {
 
       this.pass();
     } catch (err) {
-      try { await afterEach(); } catch { /* test is already failing, let's the error */ }
+      try { await afterEach(); } catch { /* test is already failing, let's ignore the error */ }
       if (isTestFailureError(err)) {
         this.fail(err);
       } else {
diff --git a/test/fixtures/test-runner/output/hooks.js b/test/fixtures/test-runner/output/hooks.js
index 16a58c5a17af57..e0be73a9ea1031 100644
--- a/test/fixtures/test-runner/output/hooks.js
+++ b/test/fixtures/test-runner/output/hooks.js
@@ -91,6 +91,7 @@ describe('afterEach throws and test fails', () => {
 test('test hooks', async (t) => {
   const testArr = [];
 
+  t.before((t) => testArr.push('before ' + t.name));
   t.after(common.mustCall((t) => testArr.push('after ' + t.name)));
   t.beforeEach((t) => testArr.push('beforeEach ' + t.name));
   t.afterEach((t) => testArr.push('afterEach ' + t.name));
@@ -105,7 +106,7 @@ test('test hooks', async (t) => {
   });
 
   assert.deepStrictEqual(testArr, [
-    'beforeEach 1', '1', 'afterEach 1',
+    'beforeEach 1', 'before test hooks', '1', 'afterEach 1',
     'beforeEach 2', '2', 'afterEach 2',
     'beforeEach nested',
     'nested beforeEach nested 1', 'nested1', 'nested afterEach nested 1',
@@ -114,6 +115,13 @@ test('test hooks', async (t) => {
   ]);
 });
 
+test('t.before throws', async (t) => {
+  t.after(common.mustCall());
+  t.before(() => { throw new Error('before'); });
+  await t.test('1', () => {});
+  await t.test('2', () => {});
+});
+
 test('t.beforeEach throws', async (t) => {
   t.after(common.mustCall());
   t.beforeEach(() => { throw new Error('beforeEach'); });
diff --git a/test/fixtures/test-runner/output/hooks.snapshot b/test/fixtures/test-runner/output/hooks.snapshot
index 50e866f3cdff5d..82ae27df8d4373 100644
--- a/test/fixtures/test-runner/output/hooks.snapshot
+++ b/test/fixtures/test-runner/output/hooks.snapshot
@@ -67,6 +67,7 @@ not ok 2 - before throws
     *
     *
     *
+    *
   ...
 # Subtest: after throws
     # Subtest: 1
@@ -307,6 +308,53 @@ ok 8 - test hooks
   ---
   duration_ms: *
   ...
+# Subtest: t.before throws
+    # Subtest: 1
+    not ok 1 - 1
+      ---
+      duration_ms: *
+      failureType: 'hookFailed'
+      error: 'failed running before hook'
+      code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+      ...
+    # Subtest: 2
+    not ok 2 - 2
+      ---
+      duration_ms: *
+      failureType: 'hookFailed'
+      error: 'failed running before hook'
+      code: 'ERR_TEST_FAILURE'
+      stack: |-
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+        *
+      ...
+    1..2
+not ok 9 - t.before throws
+  ---
+  duration_ms: *
+  failureType: 'subtestsFailed'
+  error: '2 subtests failed'
+  code: 'ERR_TEST_FAILURE'
+  ...
 # Subtest: t.beforeEach throws
     # Subtest: 1
     not ok 1 - 1
@@ -347,7 +395,7 @@ ok 8 - test hooks
         *
       ...
     1..2
-not ok 9 - t.beforeEach throws
+not ok 10 - t.beforeEach throws
   ---
   duration_ms: *
   failureType: 'subtestsFailed'
@@ -394,7 +442,7 @@ not ok 9 - t.beforeEach throws
         *
       ...
     1..2
-not ok 10 - t.afterEach throws
+not ok 11 - t.afterEach throws
   ---
   duration_ms: *
   failureType: 'subtestsFailed'
@@ -427,7 +475,7 @@ not ok 10 - t.afterEach throws
       duration_ms: *
       ...
     1..2
-not ok 11 - afterEach when test fails
+not ok 12 - afterEach when test fails
   ---
   duration_ms: *
   failureType: 'subtestsFailed'
@@ -474,7 +522,7 @@ not ok 11 - afterEach when test fails
         *
       ...
     1..2
-not ok 12 - afterEach throws and test fails
+not ok 13 - afterEach throws and test fails
   ---
   duration_ms: *
   failureType: 'subtestsFailed'
@@ -482,7 +530,7 @@ not ok 12 - afterEach throws and test fails
   code: 'ERR_TEST_FAILURE'
   ...
 # Subtest: t.after() is called if test body throws
-not ok 13 - t.after() is called if test body throws
+not ok 14 - t.after() is called if test body throws
   ---
   duration_ms: *
   failureType: 'testCodeFailure'
@@ -498,11 +546,11 @@ not ok 13 - t.after() is called if test body throws
     *
   ...
 # - after() called
-1..13
-# tests 35
+1..14
+# tests 38
 # suites 8
 # pass 14
-# fail 19
+# fail 22
 # cancelled 2
 # skipped 0
 # todo 0

From 013a47d4de692a5f84cf2031dcbb3956bd69091b Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Sun, 16 Apr 2023 23:24:44 +0200
Subject: [PATCH 2/3] add test & fix lint

---
 doc/api/test.md                                 | 3 +--
 test/fixtures/test-runner/output/hooks.js       | 4 ++++
 test/fixtures/test-runner/output/hooks.snapshot | 7 ++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index cb03b0d323ea12..bedd133d2ef8e1 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1501,7 +1501,7 @@ added:
 changes:
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/47586
-    description: The `before` function was added to TestContext
+    description: The `before` function was added to TestContext.
 -->
 
 An instance of `TestContext` is passed to each test function in order to
@@ -1528,7 +1528,6 @@ added: REPLACEME
 This function is used to create a hook running before running a suite.
 before subtest of the current test.
 
-
 ### `context.beforeEach([fn][, options])`
 
 <!-- YAML
diff --git a/test/fixtures/test-runner/output/hooks.js b/test/fixtures/test-runner/output/hooks.js
index e0be73a9ea1031..815d209f15abcd 100644
--- a/test/fixtures/test-runner/output/hooks.js
+++ b/test/fixtures/test-runner/output/hooks.js
@@ -4,6 +4,8 @@ const common = require('../../../common');
 const assert = require('assert');
 const { test, describe, it, before, after, beforeEach, afterEach } = require('node:test');
 
+before((t) => t.diagnostic('before 1 called'));
+
 describe('describe hooks', () => {
   const testArr = [];
   before(function() {
@@ -157,3 +159,5 @@ test('t.after() is called if test body throws', (t) => {
   });
   throw new Error('bye');
 });
+
+before((t) => t.diagnostic('before 2 called'));
diff --git a/test/fixtures/test-runner/output/hooks.snapshot b/test/fixtures/test-runner/output/hooks.snapshot
index 82ae27df8d4373..1007093e352a88 100644
--- a/test/fixtures/test-runner/output/hooks.snapshot
+++ b/test/fixtures/test-runner/output/hooks.snapshot
@@ -467,7 +467,6 @@ not ok 11 - t.afterEach throws
         *
         *
         *
-        *
       ...
     # Subtest: 2
     ok 2 - 2
@@ -500,7 +499,6 @@ not ok 12 - afterEach when test fails
         *
         *
         *
-        *
       ...
     # Subtest: 2
     not ok 2 - 2
@@ -541,12 +539,11 @@ not ok 14 - t.after() is called if test body throws
     *
     *
     *
-    *
-    *
-    *
   ...
 # - after() called
 1..14
+# before 1 called
+# before 2 called
 # tests 38
 # suites 8
 # pass 14

From 80ddbaf22fdbd3cb3922ca41d5c9acde78a8805a Mon Sep 17 00:00:00 2001
From: atlowChemi <chemi@testim.io>
Date: Sun, 16 Apr 2023 23:28:16 +0200
Subject: [PATCH 3/3] fix doc

---
 doc/api/test.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index bedd133d2ef8e1..04fdcdbcdfb11f 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1525,8 +1525,8 @@ added: REPLACEME
     If unspecified, subtests inherit this value from their parent.
     **Default:** `Infinity`.
 
-This function is used to create a hook running before running a suite.
-before subtest of the current test.
+This function is used to create a hook running before
+subtest of the current test.
 
 ### `context.beforeEach([fn][, options])`