test_runner: run afterEach on runtime skip

Signed-off-by: Igor <igorshevelenkov4@gmail.com>
PR-URL: #61525
Fixes: #61462
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Pietro Marchini <pietro.marchini94@gmail.com>
Reviewed-By: Jacob Smith <jacob@frende.me>

Author: igor-shevelenkov

lib/internal/test_runner/test.js

@@ -1152,13 +1152,15 @@ class Test extends AsyncResource {
       ctx.plan(this.expectedAssertions);
     }
 
+    const wasSkippedBeforeRun = this.skipped;
+
     const after = async () => {
       if (this.hooks.after.length > 0) {
         await this.runHook('after', hookArgs);
       }
     };
     const afterEach = runOnce(async () => {
-      if (this.parent?.hooks.afterEach.length > 0 && !this.skipped) {
+      if (this.parent?.hooks.afterEach.length > 0 && !wasSkippedBeforeRun) {
         await this.parent.runHook('afterEach', hookArgs);
       }
     }, kRunOnceOptions);

test/parallel/test-runner-aftereach-runtime-skip.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('node:assert');
+const { beforeEach, afterEach, test } = require('node:test');
+
+let beforeEachTotal = 0;
+let afterEachRuntimeSkip = 0;
+let afterEachTotal = 0;
+
+beforeEach(common.mustCall(() => {
+  beforeEachTotal++;
+}, 2));
+
+afterEach(common.mustCall((t) => {
+  afterEachTotal++;
+  if (t.name === 'runtime skip') {
+    afterEachRuntimeSkip++;
+  }
+}, 2));
+
+test('normal test', (t) => {
+  t.assert.ok(true);
+});
+
+test('runtime skip', (t) => {
+  t.skip('skip after setup');
+});
+
+test('static skip', { skip: true }, common.mustNotCall());
+
+process.on('exit', () => {
+  assert.strictEqual(beforeEachTotal, 2);
+  assert.strictEqual(afterEachRuntimeSkip, 1);
+  assert.strictEqual(afterEachTotal, 2);
+});