From 3333d67335091b061c4f538fe888b4f833e18f07 Mon Sep 17 00:00:00 2001
From: Aapo Alasuutari <aapo.alasuutari@gmail.com>
Date: Tue, 5 Mar 2024 22:49:21 +0200
Subject: [PATCH] chore(tests): Remove vestiges of cli/tests folder (#22712)

---
 .dprint.json                |  2 +-
 .editorconfig               |  2 +-
 tests/node_compat/test.ts   |  4 ++--
 tools/node_compat/README.md | 11 +++++------
 tools/node_compat/deno.json |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.dprint.json b/.dprint.json
index 76c84b68b1..8a62f2f5a5 100644
--- a/.dprint.json
+++ b/.dprint.json
@@ -26,7 +26,7 @@
     "cli/tsc/dts/lib.dom*.d.ts",
     "cli/tsc/dts/lib.es*.d.ts",
     "cli/tsc/dts/typescript.d.ts",
-    "cli/tests/node_compat/test",
+    "tests/node_compat/test",
     "tests/testdata/file_extensions/ts_with_js_extension.js",
     "tests/testdata/fmt/badly_formatted.json",
     "tests/testdata/fmt/badly_formatted.md",
diff --git a/.editorconfig b/.editorconfig
index ad45cafb09..78b3cdf459 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,6 @@ trim_trailing_whitespace = true
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 
-[cli/tests/node_compat/test/**]
+[tests/node_compat/test/**]
 insert_final_newline = unset
 trim_trailing_whitespace = unset
diff --git a/tests/node_compat/test.ts b/tests/node_compat/test.ts
index 214d494465..bafb14db2c 100644
--- a/tests/node_compat/test.ts
+++ b/tests/node_compat/test.ts
@@ -24,7 +24,7 @@ import {
 } from "./common.ts";
 
 // If the test case is invoked like
-// deno test -A cli/tests/node_compat/test.ts -- <test-names>
+// deno test -A tests/node_compat/test.ts -- <test-names>
 // Use the <test-names> as filters
 const filters = Deno.args;
 const hasFilters = filters.length > 0;
@@ -108,7 +108,7 @@ async function runTest(t: Deno.TestContext, path: string): Promise<void> {
         }
         const stderrOutput = decoder.decode(stderr);
         const repeatCmd = magenta(
-          `./target/debug/deno test -A cli/tests/node_compat/test.ts -- ${path}`,
+          `./target/debug/deno test -A tests/node_compat/test.ts -- ${path}`,
         );
         const msg = `"${magenta(path)}" failed:
 
diff --git a/tools/node_compat/README.md b/tools/node_compat/README.md
index e8f4a034e2..cece27d41e 100644
--- a/tools/node_compat/README.md
+++ b/tools/node_compat/README.md
@@ -11,18 +11,17 @@ Node.js compat testing in Deno repository.
   - This script sets up the Node.js compat tests.
 - `//tools/node_compat/versions/`
   - Node.js source tarballs and extracted test cases are stored here.
-- `//cli/tests/node_compat/config.jsonc`
+- `//tests/node_compat/config.jsonc`
   - This json file stores the settings about which Node.js compat test to run
     with Deno.
-- `//cli/tests/node_compat/test`
+- `//tests/node_compat/test`
   - The actual test cases are stored here.
 
 ## Steps to add new test cases from Node.js test cases
 
-1. Update `tests` property of `//cli/tests/node_compat/config.jsonc`. For
-   example, if you want to add `test/parallel/test-foo.js` from Node.js test
-   cases, then add `test-foo.js` entry in `tests.parallel` array property in
-   `config.jsonc`
+1. Update `tests` property of `//tests/node_compat/config.jsonc`. For example,
+   if you want to add `test/parallel/test-foo.js` from Node.js test cases, then
+   add `test-foo.js` entry in `tests.parallel` array property in `config.jsonc`
 1. Run `deno task setup` in `tools/node_compat` dir.
 
 The above command copies the updated items from Node.js tarball to the Deno
diff --git a/tools/node_compat/deno.json b/tools/node_compat/deno.json
index f2c33c3d54..86ca5fddeb 100644
--- a/tools/node_compat/deno.json
+++ b/tools/node_compat/deno.json
@@ -5,6 +5,6 @@
   },
   "tasks": {
     "setup": "deno run --allow-read --allow-write ./setup.ts",
-    "test": "deno test -A ../../cli/tests/node_compat/test.ts --"
+    "test": "deno test -A ../../tests/node_compat/test.ts --"
   }
 }