From a0f3ed8ac40e7af441250ad8c2db0ed20b394adc Mon Sep 17 00:00:00 2001
From: Raz Luvaton <16746759+rluvaton@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:38:23 +0300
Subject: [PATCH] test_runner: fix global before not called when no global test
 exists

PR-URL: https://github.com/nodejs/node/pull/48877
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
---
 lib/internal/test_runner/test.js              |  4 +
 .../output/hooks-with-no-global-test.js       | 84 +++++++++++++++++++
 .../output/hooks-with-no-global-test.snapshot | 44 ++++++++++
 test/parallel/test-runner-output.mjs          |  1 +
 4 files changed, 133 insertions(+)
 create mode 100644 test/fixtures/test-runner/output/hooks-with-no-global-test.js
 create mode 100644 test/fixtures/test-runner/output/hooks-with-no-global-test.snapshot

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
index becb4c07d7cf83..9c76a371462057 100644
--- a/lib/internal/test_runner/test.js
+++ b/lib/internal/test_runner/test.js
@@ -828,6 +828,10 @@ class Suite extends Test {
         return;
       }
 
+      if (this.parent.hooks.before.length > 0) {
+        await this.parent.runHook('before', this.parent.getRunArgs());
+      }
+
       await this.runHook('before', hookArgs);
 
       const stopPromise = stopTest(this.timeout, this.signal);
diff --git a/test/fixtures/test-runner/output/hooks-with-no-global-test.js b/test/fixtures/test-runner/output/hooks-with-no-global-test.js
new file mode 100644
index 00000000000000..844aa6ff3c2d59
--- /dev/null
+++ b/test/fixtures/test-runner/output/hooks-with-no-global-test.js
@@ -0,0 +1,84 @@
+'use strict';
+const { test, describe, it, before, after, beforeEach, afterEach } = require('node:test');
+const assert = require("assert");
+
+// This file should not have any global tests to reproduce bug #48844
+const testArr = [];
+
+before(() => testArr.push('global before'));
+after(() => {
+  testArr.push('global after');
+
+  try {
+    assert.deepStrictEqual(testArr, [
+      'global before',
+      'describe before',
+
+      'describe beforeEach',
+      'describe it 1',
+      'describe afterEach',
+
+      'describe beforeEach',
+      'describe test 2',
+      'describe afterEach',
+
+      'describe nested before',
+
+      'describe beforeEach',
+      'describe nested beforeEach',
+      'describe nested it 1',
+      'describe afterEach',
+      'describe nested afterEach',
+
+      'describe beforeEach',
+      'describe nested beforeEach',
+      'describe nested test 2',
+      'describe afterEach',
+      'describe nested afterEach',
+
+      'describe nested after',
+      'describe after',
+      'global after',
+    ]);
+  } catch (e) {
+    // TODO(rluvaton): remove the try catch after #48867 is fixed
+    console.error(e);
+    process.exit(1);
+  }
+});
+
+describe('describe hooks with no global tests', () => {
+  before(() => {
+    testArr.push('describe before');
+  });
+  after(()=> {
+    testArr.push('describe after');
+  });
+  beforeEach(() => {
+    testArr.push('describe beforeEach');
+  });
+  afterEach(() => {
+    testArr.push('describe afterEach');
+  });
+
+  it('1', () => testArr.push('describe it 1'));
+  test('2', () => testArr.push('describe test 2'));
+
+  describe('nested', () => {
+    before(() => {
+      testArr.push('describe nested before')
+    });
+    after(() => {
+      testArr.push('describe nested after')
+    });
+    beforeEach(() => {
+      testArr.push('describe nested beforeEach')
+    });
+    afterEach(() => {
+      testArr.push('describe nested afterEach')
+    });
+
+    it('nested 1', () => testArr.push('describe nested it 1'));
+    test('nested 2', () => testArr.push('describe nested test 2'));
+  });
+});
diff --git a/test/fixtures/test-runner/output/hooks-with-no-global-test.snapshot b/test/fixtures/test-runner/output/hooks-with-no-global-test.snapshot
new file mode 100644
index 00000000000000..722a3a4ca2ceac
--- /dev/null
+++ b/test/fixtures/test-runner/output/hooks-with-no-global-test.snapshot
@@ -0,0 +1,44 @@
+TAP version 13
+# Subtest: describe hooks with no global tests
+    # Subtest: 1
+    ok 1 - 1
+      ---
+      duration_ms: *
+      ...
+    # Subtest: 2
+    ok 2 - 2
+      ---
+      duration_ms: *
+      ...
+    # Subtest: nested
+        # Subtest: nested 1
+        ok 1 - nested 1
+          ---
+          duration_ms: *
+          ...
+        # Subtest: nested 2
+        ok 2 - nested 2
+          ---
+          duration_ms: *
+          ...
+        1..2
+    ok 3 - nested
+      ---
+      duration_ms: *
+      type: 'suite'
+      ...
+    1..3
+ok 1 - describe hooks with no global tests
+  ---
+  duration_ms: *
+  type: 'suite'
+  ...
+1..1
+# tests 4
+# suites 2
+# pass 4
+# fail 0
+# cancelled 0
+# skipped 0
+# todo 0
+# duration_ms *
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
index 0d670c37bc9319..76c511117ea091 100644
--- a/test/parallel/test-runner-output.mjs
+++ b/test/parallel/test-runner-output.mjs
@@ -36,6 +36,7 @@ const tests = [
   { name: 'test-runner/output/describe_it.js' },
   { name: 'test-runner/output/describe_nested.js' },
   { name: 'test-runner/output/hooks.js' },
+  { name: 'test-runner/output/hooks-with-no-global-test.js' },
   { name: 'test-runner/output/no_refs.js' },
   { name: 'test-runner/output/no_tests.js' },
   { name: 'test-runner/output/only_tests.js' },