From 1dd1aba2448c6c8a5a0370c4066a68aca06b859b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 29 Dec 2023 16:18:08 +0100
Subject: [PATCH] fix(node): support nested tests in "node:test" (#21717)

Closes https://github.com/denoland/deno/issues/21679
---
 cli/tests/testdata/node/test.js  |  7 +++++++
 cli/tests/testdata/node/test.out | 21 +++++++++++++--------
 ext/node/polyfills/testing.ts    |  5 ++++-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/cli/tests/testdata/node/test.js b/cli/tests/testdata/node/test.js
index 9bb5aa885b..0f0f9b6b6f 100644
--- a/cli/tests/testdata/node/test.js
+++ b/cli/tests/testdata/node/test.js
@@ -54,6 +54,13 @@ test("async throw fail", async () => {
   throw new Error("thrown from async throw fail");
 });
 
+test("nested test", async (t) => {
+  await t.test("nested 1", async (t) => {
+    await t.test("nested 2", () => {
+    });
+  });
+});
+
 test("async skip fail", async (t) => {
   t.skip();
   throw new Error("thrown from async throw fail");
diff --git a/cli/tests/testdata/node/test.out b/cli/tests/testdata/node/test.out
index 3c54a15e89..2579f605d2 100644
--- a/cli/tests/testdata/node/test.out
+++ b/cli/tests/testdata/node/test.out
@@ -1,5 +1,5 @@
 [WILDCARD]
-running 62 tests from ./node/test.js
+running 63 tests from ./node/test.js
 sync pass todo ...
 ------- output -------
 Warning: Not implemented: test.TestContext.todo
@@ -43,6 +43,11 @@ Warning: Not implemented: test.TestContext.skip
 async skip pass ... ok [WILDCARD]
 async pass ... ok [WILDCARD]
 async throw fail ... FAILED [WILDCARD]
+nested test ...
+  nested 1 ...
+    nested 2 ... ok [WILDCARD]
+  nested 1 ... ok [WILDCARD]
+nested test ... ok [WILDCARD]
 async skip fail ...
 ------- output -------
 Warning: Not implemented: test.TestContext.skip
@@ -123,12 +128,12 @@ error: Error: thrown from async throw fail
   throw new Error("thrown from async throw fail");
 [WILDCARD]
 
-async skip fail => ./node/test.js:57:1
+async skip fail => ./node/test.js:64:1
 error: Error: thrown from async throw fail
   throw new Error("thrown from async throw fail");
 [WILDCARD]
 
-async assertion fail => ./node/test.js:62:1
+async assertion fail => ./node/test.js:69:1
 error: AssertionError: Values are not strictly equal:
 
 
@@ -140,7 +145,7 @@ error: AssertionError: Values are not strictly equal:
 
     at [WILDCARD]
 
-reject fail => ./node/test.js:71:1
+reject fail => ./node/test.js:78:1
 error: Error: rejected from reject fail
   return Promise.reject(new Error("rejected from reject fail"));
                         ^
@@ -160,11 +165,11 @@ sync fail todo => ./node/test.js:20:1
 sync fail todo with message => ./node/test.js:25:1
 sync throw fail => ./node/test.js:42:1
 async throw fail => ./node/test.js:53:1
-async skip fail => ./node/test.js:57:1
-async assertion fail => ./node/test.js:62:1
-reject fail => ./node/test.js:71:1
+async skip fail => ./node/test.js:64:1
+async assertion fail => ./node/test.js:69:1
+reject fail => ./node/test.js:78:1
 ./node/test.js (uncaught error)
 
-FAILED | 8 passed | 51 failed | 4 ignored [WILDCARD]
+FAILED | 9 passed (2 steps) | 51 failed | 4 ignored [WILDCARD]
 
 error: Test failed
diff --git a/ext/node/polyfills/testing.ts b/ext/node/polyfills/testing.ts
index 83e8f6f0b4..57ef8e795d 100644
--- a/ext/node/polyfills/testing.ts
+++ b/ext/node/polyfills/testing.ts
@@ -56,7 +56,10 @@ class NodeTestContext {
     const prepared = prepareOptions(name, options, fn, {});
     return this.#denoContext.step({
       name: prepared.name,
-      fn: prepared.fn,
+      fn: async (denoTestContext) => {
+        const newNodeTextContext = new NodeTestContext(denoTestContext);
+        await prepared.fn(newNodeTextContext);
+      },
       ignore: prepared.options.todo || prepared.options.skip,
     }).then(() => undefined);
   }