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/run/workspaces/member_outside_root_dir/deno.json | 9 --------- .../run/workspaces/member_outside_root_dir/foo/bar/hello.ts | 1 - .../run/workspaces/member_outside_root_dir/foo/deno.json | 8 -------- .../run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts | 1 - .../testdata/run/workspaces/member_outside_root_dir/foo/mod.ts | 5 ----- .../testdata/run/workspaces/member_outside_root_dir/main.out | 1 - .../testdata/run/workspaces/member_outside_root_dir/main.ts | 4 ---- 7 files changed, 29 deletions(-) delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/deno.json delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/main.out delete mode 100644 cli/tests/testdata/run/workspaces/member_outside_root_dir/main.ts (limited to 'cli/tests/testdata/run/workspaces/member_outside_root_dir') diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/deno.json b/cli/tests/testdata/run/workspaces/member_outside_root_dir/deno.json deleted file mode 100644 index 25feefad8..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/deno.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "workspaces": [ - "foo", - "../other_folder" - ], - "imports": { - "chalk": "npm:chalk" - } -} diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts b/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts deleted file mode 100644 index c8a7e57c4..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts +++ /dev/null @@ -1 +0,0 @@ -export const hello = "hello from foo"; diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json b/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json deleted file mode 100644 index 46d84f06f..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "qwerqwer", - "version": "0.0.0", - "imports": { - "~/": "./", - "foo/": "./bar/" - } -} diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts b/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts deleted file mode 100644 index 4e03777d1..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts +++ /dev/null @@ -1 +0,0 @@ -export const buzz = "buzz from foo"; diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts b/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts deleted file mode 100644 index d7b16dcc0..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { hello } from "foo/hello.ts"; -import { buzz } from "~/fizz/buzz.ts"; - -console.log(hello); -console.log(buzz); diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.out b/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.out deleted file mode 100644 index 205d95aea..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.out +++ /dev/null @@ -1 +0,0 @@ -error: Workspace member '../other_folder' is outside root configuration directory[WILDCARD] \ No newline at end of file diff --git a/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.ts b/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.ts deleted file mode 100644 index 182fd8517..000000000 --- a/cli/tests/testdata/run/workspaces/member_outside_root_dir/main.ts +++ /dev/null @@ -1,4 +0,0 @@ -import chalk from "chalk"; -import "./foo/mod.ts"; - -console.log(chalk); -- cgit v1.2.3