From f5e46c9bf2f50d66a953fa133161fc829cecff06 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Sat, 10 Feb 2024 13:22:13 -0700 Subject: chore: move cli/tests/ -> tests/ (#22369) This looks like a massive PR, but it's only a move from cli/tests -> tests, and updates of relative paths for files. This is the first step towards aggregate all of the integration test files under tests/, which will lead to a set of integration tests that can run without the CLI binary being built. While we could leave these tests under `cli`, it would require us to keep a more complex directory structure for the various test runners. In addition, we have a lot of complexity to ignore various test files in the `cli` project itself (cargo publish exclusion rules, autotests = false, etc). And finally, the `tests/` folder will eventually house the `test_ffi`, `test_napi` and other testing code, reducing the size of the root repo directory. For easier review, the extremely large and noisy "move" is in the first commit (with no changes -- just a move), while the remainder of the changes to actual files is in the second commit. --- .../testdata/compile/dynamic_imports_tmp_lit/main.info.out | 10 ---------- cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.js | 14 -------------- .../compile/dynamic_imports_tmp_lit/other/data.json | 3 --- .../compile/dynamic_imports_tmp_lit/other/sub/data2.json | 3 --- .../testdata/compile/dynamic_imports_tmp_lit/sub/a.js | 1 - .../testdata/compile/dynamic_imports_tmp_lit/sub/b.ts | 1 - 6 files changed, 32 deletions(-) delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.info.out delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.js delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/data.json delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/sub/data2.json delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/a.js delete mode 100644 cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/b.ts (limited to 'cli/tests/testdata/compile/dynamic_imports_tmp_lit') diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.info.out b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.info.out deleted file mode 100644 index 57d730a64..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.info.out +++ /dev/null @@ -1,10 +0,0 @@ -local: [WILDCARD]main.js -type: JavaScript -dependencies: 4 unique -size: [WILDCARD] - -file:///[WILDCARD]/dynamic_imports_tmp_lit/main.js ([WILDCARD]) -├── file:///[WILDCARD]/dynamic_imports_tmp_lit/sub/a.js ([WILDCARD]) -├── file:///[WILDCARD]/dynamic_imports_tmp_lit/sub/b.ts ([WILDCARD]) -├── file:///[WILDCARD]/dynamic_imports_tmp_lit/other/data.json ([WILDCARD]) -└── file:///[WILDCARD]/dynamic_imports_tmp_lit/other/sub/data2.json ([WILDCARD]) diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.js b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.js deleted file mode 100644 index 3bda59772..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/main.js +++ /dev/null @@ -1,14 +0,0 @@ -const fileNames = [ - "a.js", - "b.ts", -]; - -for (const fileName of fileNames) { - await import(`./sub/${fileName}`); -} - -const jsonFileNames = ["data.json", "sub/data2.json"]; -for (const fileName of jsonFileNames) { - const mod = await import(`./other/${fileName}`, { with: { type: "json" } }); - console.log(mod.default); -} diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/data.json b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/data.json deleted file mode 100644 index 0131e01e4..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/data.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "data": 5 -} diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/sub/data2.json b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/sub/data2.json deleted file mode 100644 index 858a13cdd..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/other/sub/data2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "data": 1 -} diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/a.js b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/a.js deleted file mode 100644 index 7b2a34601..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/a.js +++ /dev/null @@ -1 +0,0 @@ -console.log("a"); diff --git a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/b.ts b/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/b.ts deleted file mode 100644 index 6d012e7f1..000000000 --- a/cli/tests/testdata/compile/dynamic_imports_tmp_lit/sub/b.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("b"); -- cgit v1.2.3