From 64ebd441e9f1b929c936aab1445afec10b8b7417 Mon Sep 17 00:00:00 2001
From: Matt Mastracci <matthew@mastracci.com>
Date: Wed, 7 Feb 2024 16:21:32 -0700
Subject: [PATCH] chore: use @test_util for node_compat tests (#22331)

---
 cli/tests/integration/node_compat_tests.rs |  3 +++
 cli/tests/node_compat/common.ts            |  6 +++---
 cli/tests/node_compat/deno.json            |  5 +++++
 cli/tests/node_compat/runner.ts            |  2 +-
 cli/tests/node_compat/test.ts              |  8 ++++----
 tools/node_compat/deno.json                |  3 +++
 tools/node_compat/setup.ts                 | 12 ++++++------
 7 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 cli/tests/node_compat/deno.json

diff --git a/cli/tests/integration/node_compat_tests.rs b/cli/tests/integration/node_compat_tests.rs
index 30d307417c..0ed84594b9 100644
--- a/cli/tests/integration/node_compat_tests.rs
+++ b/cli/tests/integration/node_compat_tests.rs
@@ -8,6 +8,9 @@ fn node_compat_tests() {
   let mut deno = util::deno_cmd()
     .current_dir(util::root_path())
     .arg("test")
+    .arg("--config")
+    .arg("cli/tests/config/deno.json")
+    .arg("--no-lock")
     .arg("--unstable")
     .arg("-A")
     .arg(util::tests_path().join("node_compat"))
diff --git a/cli/tests/node_compat/common.ts b/cli/tests/node_compat/common.ts
index b3663ec3c4..e079c6aaf1 100644
--- a/cli/tests/node_compat/common.ts
+++ b/cli/tests/node_compat/common.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { partition } from "../../../test_util/std/collections/partition.ts";
-import { join } from "../../../test_util/std/path/mod.ts";
-import * as JSONC from "../../../test_util/std/jsonc/mod.ts";
+import { partition } from "@test_util/std/collections/partition.ts";
+import { join } from "@test_util/std/path/mod.ts";
+import * as JSONC from "@test_util/std/jsonc/mod.ts";
 /**
  * The test suite matches the folders inside the `test` folder inside the
  * node repo
diff --git a/cli/tests/node_compat/deno.json b/cli/tests/node_compat/deno.json
new file mode 100644
index 0000000000..fe518960f3
--- /dev/null
+++ b/cli/tests/node_compat/deno.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "@test_util/": "../../../test_util/"
+  }
+}
diff --git a/cli/tests/node_compat/runner.ts b/cli/tests/node_compat/runner.ts
index 11ccefa82d..4695037cc9 100644
--- a/cli/tests/node_compat/runner.ts
+++ b/cli/tests/node_compat/runner.ts
@@ -1,7 +1,7 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 import "./polyfill_globals.js";
 import { createRequire } from "node:module";
-import { toFileUrl } from "../../../test_util/std/path/mod.ts";
+import { toFileUrl } from "@test_util/std/path/mod.ts";
 const file = Deno.args[0];
 if (!file) {
   throw new Error("No file provided");
diff --git a/cli/tests/node_compat/test.ts b/cli/tests/node_compat/test.ts
index a57fd11a52..13ff429b54 100644
--- a/cli/tests/node_compat/test.ts
+++ b/cli/tests/node_compat/test.ts
@@ -13,10 +13,10 @@
  * all share the same working directory.
  */
 
-import { magenta } from "../../../test_util/std/fmt/colors.ts";
-import { pooledMap } from "../../../test_util/std/async/pool.ts";
-import { dirname, fromFileUrl, join } from "../../../test_util/std/path/mod.ts";
-import { fail } from "../../../test_util/std/assert/mod.ts";
+import { magenta } from "@test_util/std/fmt/colors.ts";
+import { pooledMap } from "@test_util/std/async/pool.ts";
+import { dirname, fromFileUrl, join } from "@test_util/std/path/mod.ts";
+import { fail } from "@test_util/std/assert/mod.ts";
 import {
   config,
   getPathsFromTestSuites,
diff --git a/tools/node_compat/deno.json b/tools/node_compat/deno.json
index 6e9c891a03..87fe18d085 100644
--- a/tools/node_compat/deno.json
+++ b/tools/node_compat/deno.json
@@ -1,4 +1,7 @@
 {
+  "imports": {
+    "@test_util/": "../../test_util/"
+  },
   "tasks": {
     "setup": "deno run --allow-read --allow-write ./setup.ts",
     "test": "deno test -A ../../cli/tests/node_compat/test.ts --"
diff --git a/tools/node_compat/setup.ts b/tools/node_compat/setup.ts
index 2844cffdd9..4770fbc50e 100755
--- a/tools/node_compat/setup.ts
+++ b/tools/node_compat/setup.ts
@@ -3,12 +3,12 @@
 
 /** This copies the test files according to the config file `cli/tests/node_compat/config.jsonc` */
 
-import { walk } from "../../test_util/std/fs/walk.ts";
-import { sep } from "../../test_util/std/path/mod.ts";
-import { ensureFile } from "../../test_util/std/fs/ensure_file.ts";
-import { writeAll } from "../../test_util/std/streams/write_all.ts";
-import { withoutAll } from "../../test_util/std/collections/without_all.ts";
-import { relative } from "../../test_util/std/path/posix.ts";
+import { walk } from "@test_util/std/fs/walk.ts";
+import { sep } from "@test_util/std/path/mod.ts";
+import { ensureFile } from "@test_util/std/fs/ensure_file.ts";
+import { writeAll } from "@test_util/std/streams/write_all.ts";
+import { withoutAll } from "@test_util/std/collections/without_all.ts";
+import { relative } from "@test_util/std/path/posix.ts";
 
 import { config, ignoreList } from "../../cli/tests/node_compat/common.ts";