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. --- cli/tests/testdata/compile/dynamic_imports/import1.ts | 3 --- cli/tests/testdata/compile/dynamic_imports/import2.ts | 1 - cli/tests/testdata/compile/dynamic_imports/import_path | 1 - cli/tests/testdata/compile/dynamic_imports/main.out | 5 ----- cli/tests/testdata/compile/dynamic_imports/main.ts | 6 ------ .../compile/dynamic_imports/main_unanalyzable.ts | 18 ------------------ 6 files changed, 34 deletions(-) delete mode 100644 cli/tests/testdata/compile/dynamic_imports/import1.ts delete mode 100644 cli/tests/testdata/compile/dynamic_imports/import2.ts delete mode 100644 cli/tests/testdata/compile/dynamic_imports/import_path delete mode 100644 cli/tests/testdata/compile/dynamic_imports/main.out delete mode 100644 cli/tests/testdata/compile/dynamic_imports/main.ts delete mode 100644 cli/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts (limited to 'cli/tests/testdata/compile/dynamic_imports') diff --git a/cli/tests/testdata/compile/dynamic_imports/import1.ts b/cli/tests/testdata/compile/dynamic_imports/import1.ts deleted file mode 100644 index 2d9dde2a4..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/import1.ts +++ /dev/null @@ -1,3 +0,0 @@ -import "./import2.ts"; - -console.log("import1.ts"); diff --git a/cli/tests/testdata/compile/dynamic_imports/import2.ts b/cli/tests/testdata/compile/dynamic_imports/import2.ts deleted file mode 100644 index 22321a5a7..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/import2.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("import2.ts"); diff --git a/cli/tests/testdata/compile/dynamic_imports/import_path b/cli/tests/testdata/compile/dynamic_imports/import_path deleted file mode 100644 index 98222a208..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/import_path +++ /dev/null @@ -1 +0,0 @@ -./import1.ts diff --git a/cli/tests/testdata/compile/dynamic_imports/main.out b/cli/tests/testdata/compile/dynamic_imports/main.out deleted file mode 100644 index 4304fb06f..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/main.out +++ /dev/null @@ -1,5 +0,0 @@ -Starting the main module -Dynamic importing -import2.ts -import1.ts -Dynamic import done. diff --git a/cli/tests/testdata/compile/dynamic_imports/main.ts b/cli/tests/testdata/compile/dynamic_imports/main.ts deleted file mode 100644 index b889e2203..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/main.ts +++ /dev/null @@ -1,6 +0,0 @@ -console.log("Starting the main module"); - -setTimeout(() => { - console.log("Dynamic importing"); - import("./import1.ts").then(() => console.log("Dynamic import done.")); -}, 0); diff --git a/cli/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts b/cli/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts deleted file mode 100644 index ee8ff2c4b..000000000 --- a/cli/tests/testdata/compile/dynamic_imports/main_unanalyzable.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { join } from "../../../../../test_util/std/path/mod.ts"; - -console.log("Starting the main module"); - -// We load the dynamic import path from the file system, to make sure any -// improvements in static analysis can't defeat the purpose of this test, which -// is to make sure the `--include` flag works to add non-analyzed imports to the -// module graph. -const IMPORT_PATH_FILE_PATH = join( - Deno.cwd(), - "tests/testdata/compile/dynamic_imports/import_path", -); - -setTimeout(async () => { - console.log("Dynamic importing"); - const importPath = (await Deno.readTextFile(IMPORT_PATH_FILE_PATH)).trim(); - import(importPath).then(() => console.log("Dynamic import done.")); -}, 0); -- cgit v1.2.3