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/info/json_output/main.out | 91 ---------------------------- cli/tests/testdata/info/json_output/main.ts | 11 ---- 2 files changed, 102 deletions(-) delete mode 100644 cli/tests/testdata/info/json_output/main.out delete mode 100644 cli/tests/testdata/info/json_output/main.ts (limited to 'cli/tests/testdata/info/json_output') diff --git a/cli/tests/testdata/info/json_output/main.out b/cli/tests/testdata/info/json_output/main.out deleted file mode 100644 index 5a89d5cab..000000000 --- a/cli/tests/testdata/info/json_output/main.out +++ /dev/null @@ -1,91 +0,0 @@ -{ - "roots": [ - "file://[WILDCARD]/info/json_output/main.ts" - ], - "modules": [ - { - "kind": "esm", - "dependencies": [ - { - "specifier": "../../subdir/mod1.ts", - "code": { - "specifier": "file://[WILDCARD]/subdir/mod1.ts", - "span": { - "start": { - "line": 0, - "character": 52 - }, - "end": { - "line": 0, - "character": 74 - } - } - } - } - ], - "local": "[WILDCARD]main.ts", - [WILDCARD] - "mediaType": "TypeScript", - "specifier": "file://[WILDCARD]/json_output/main.ts" - }, - { - "kind": "esm", - "dependencies": [ - { - "specifier": "./subdir2/mod2.ts", - "code": { - "specifier": "file://[WILDCARD]/subdir/subdir2/mod2.ts", - "span": { - "start": { - "line": 0, - "character": 40 - }, - "end": { - "line": 0, - "character": 59 - } - } - } - } - ], - "local": "[WILDCARD]mod1.ts", - [WILDCARD] - "mediaType": "TypeScript", - "specifier": "file://[WILDCARD]/subdir/mod1.ts" - }, - { - "kind": "esm", - "local": "[WILDCARD]print_hello.ts", - [WILDCARD] - "mediaType": "TypeScript", - "specifier": "file://[WILDCARD]/subdir/print_hello.ts" - }, - { - "kind": "esm", - "dependencies": [ - { - "specifier": "../print_hello.ts", - "code": { - "specifier": "file://[WILDCARD]/subdir/print_hello.ts", - "span": { - "start": { - "line": 0, - "character": 27 - }, - "end": { - "line": 0, - "character": 46 - } - } - } - } - ], - "local": "[WILDCARD]mod2.ts", - [WILDCARD] - "mediaType": "TypeScript", - "specifier": "file://[WILDCARD]/subdir/subdir2/mod2.ts" - } - ], - "redirects": {}, - "npmPackages": {} -} diff --git a/cli/tests/testdata/info/json_output/main.ts b/cli/tests/testdata/info/json_output/main.ts deleted file mode 100644 index 927bc55ed..000000000 --- a/cli/tests/testdata/info/json_output/main.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { printHello3, returnsFoo2, returnsHi } from "../../subdir/mod1.ts"; - -printHello3(); - -if (returnsHi() !== "Hi") { - throw Error("Unexpected"); -} - -if (returnsFoo2() !== "Foo") { - throw Error("Unexpected"); -} -- cgit v1.2.3