test_runner: unify duplicate code

nodejs · Feb 28, 2023 · d9021c1 · d9021c1
1 parent 76bcf1a
commit d9021c1
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/lib/internal/test_runner/harness.js b/lib/internal/test_runner/harness.js
@@ -186,33 +186,26 @@ async function startSubtest(subtest) {
   await subtest.start();
 }
 
-function test(name, options, fn) {
-  const parent = testResources.get(executionAsyncId()) || getGlobalRoot();
-  const subtest = parent.createSubtest(Test, name, options, fn);
-  if (!(parent instanceof Suite)) {
-    return startSubtest(subtest);
-  }
-}
-
-function runInParentContext(Factory) {
+function runInParentContext(Factory, addShorthands = true) {
   function run(name, options, fn, overrides) {
     const parent = testResources.get(executionAsyncId()) || getGlobalRoot();
     const subtest = parent.createSubtest(Factory, name, options, fn, overrides);
-    if (parent === getGlobalRoot()) {
-      startSubtest(subtest);
+    if (!(parent instanceof Suite)) {
+      return startSubtest(subtest);
     }
   }
 
-  const cb = (name, options, fn) => {
-    run(name, options, fn);
-  };
+  const test = (name, options, fn) => run(name, options, fn);
+  if (!addShorthands) {
+    return test;
+  }
 
   ArrayPrototypeForEach(['skip', 'todo', 'only'], (keyword) => {
-    cb[keyword] = (name, options, fn) => {
+    test[keyword] = (name, options, fn) => {
       run(name, options, fn, { [keyword]: true });
     };
   });
-  return cb;
+  return test;
 }
 
 function hook(hook) {
@@ -224,7 +217,7 @@ function hook(hook) {
 
 module.exports = {
   createTestTree,
-  test,
+  test: runInParentContext(Test, false),
   describe: runInParentContext(Suite),
   it: runInParentContext(ItTest),
   before: hook('before'),