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/import_maps/config.json | 15 --------------- cli/tests/testdata/import_maps/import_map.json | 15 --------------- cli/tests/testdata/import_maps/import_map_invalid.json | 7 ------- cli/tests/testdata/import_maps/import_map_remote.json | 9 --------- cli/tests/testdata/import_maps/lodash/lodash.ts | 1 - cli/tests/testdata/import_maps/lodash/other_file.ts | 1 - cli/tests/testdata/import_maps/moment/moment.ts | 1 - cli/tests/testdata/import_maps/moment/other_file.ts | 1 - cli/tests/testdata/import_maps/print_hello.ts | 3 --- cli/tests/testdata/import_maps/scope/scoped.ts | 2 -- cli/tests/testdata/import_maps/scoped_moment.ts | 1 - cli/tests/testdata/import_maps/test.ts | 6 ------ cli/tests/testdata/import_maps/test_remote.ts | 5 ----- cli/tests/testdata/import_maps/vue.ts | 1 - 14 files changed, 68 deletions(-) delete mode 100644 cli/tests/testdata/import_maps/config.json delete mode 100644 cli/tests/testdata/import_maps/import_map.json delete mode 100644 cli/tests/testdata/import_maps/import_map_invalid.json delete mode 100644 cli/tests/testdata/import_maps/import_map_remote.json delete mode 100644 cli/tests/testdata/import_maps/lodash/lodash.ts delete mode 100644 cli/tests/testdata/import_maps/lodash/other_file.ts delete mode 100644 cli/tests/testdata/import_maps/moment/moment.ts delete mode 100644 cli/tests/testdata/import_maps/moment/other_file.ts delete mode 100644 cli/tests/testdata/import_maps/print_hello.ts delete mode 100644 cli/tests/testdata/import_maps/scope/scoped.ts delete mode 100644 cli/tests/testdata/import_maps/scoped_moment.ts delete mode 100644 cli/tests/testdata/import_maps/test.ts delete mode 100644 cli/tests/testdata/import_maps/test_remote.ts delete mode 100644 cli/tests/testdata/import_maps/vue.ts (limited to 'cli/tests/testdata/import_maps') diff --git a/cli/tests/testdata/import_maps/config.json b/cli/tests/testdata/import_maps/config.json deleted file mode 100644 index b296a63c7..000000000 --- a/cli/tests/testdata/import_maps/config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "importMap": "./import_map.json", - "imports": { - "moment": "./moment/moment.ts", - "moment/": "./moment/", - "lodash": "./lodash/lodash.ts", - "lodash/": "./lodash/", - "https://www.unpkg.com/vue/dist/vue.runtime.esm.js": "./vue.ts" - }, - "scopes": { - "scope/": { - "moment": "./scoped_moment.ts" - } - } -} diff --git a/cli/tests/testdata/import_maps/import_map.json b/cli/tests/testdata/import_maps/import_map.json deleted file mode 100644 index 40d1d4ec2..000000000 --- a/cli/tests/testdata/import_maps/import_map.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "imports": { - "print_hello": "./print_hello.ts", - "moment": "./moment/moment.ts", - "moment/": "./moment/", - "lodash": "./lodash/lodash.ts", - "lodash/": "./lodash/", - "https://www.unpkg.com/vue/dist/vue.runtime.esm.js": "./vue.ts" - }, - "scopes": { - "scope/": { - "moment": "./scoped_moment.ts" - } - } -} diff --git a/cli/tests/testdata/import_maps/import_map_invalid.json b/cli/tests/testdata/import_maps/import_map_invalid.json deleted file mode 100644 index a09d280c5..000000000 --- a/cli/tests/testdata/import_maps/import_map_invalid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "imports": { - "https://www.unpkg.com/vue/dist/vue.runtime.esm.js": "./vue.ts" - }, - "scopes": { - } -} diff --git a/cli/tests/testdata/import_maps/import_map_remote.json b/cli/tests/testdata/import_maps/import_map_remote.json deleted file mode 100644 index 51f90f69c..000000000 --- a/cli/tests/testdata/import_maps/import_map_remote.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "imports": { - "moment": "./moment/moment.ts", - "moment/": "./moment/", - "lodash": "./lodash/lodash.ts", - "lodash/": "./lodash/", - "https://www.unpkg.com/vue/dist/vue.runtime.esm.js": "./vue.ts" - } -} diff --git a/cli/tests/testdata/import_maps/lodash/lodash.ts b/cli/tests/testdata/import_maps/lodash/lodash.ts deleted file mode 100644 index 2ec04ed3c..000000000 --- a/cli/tests/testdata/import_maps/lodash/lodash.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from remapped lodash!"); diff --git a/cli/tests/testdata/import_maps/lodash/other_file.ts b/cli/tests/testdata/import_maps/lodash/other_file.ts deleted file mode 100644 index 714adae3f..000000000 --- a/cli/tests/testdata/import_maps/lodash/other_file.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from remapped lodash dir!"); diff --git a/cli/tests/testdata/import_maps/moment/moment.ts b/cli/tests/testdata/import_maps/moment/moment.ts deleted file mode 100644 index 2b54a431e..000000000 --- a/cli/tests/testdata/import_maps/moment/moment.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from remapped moment!"); diff --git a/cli/tests/testdata/import_maps/moment/other_file.ts b/cli/tests/testdata/import_maps/moment/other_file.ts deleted file mode 100644 index 24f3a0226..000000000 --- a/cli/tests/testdata/import_maps/moment/other_file.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from remapped moment dir!"); diff --git a/cli/tests/testdata/import_maps/print_hello.ts b/cli/tests/testdata/import_maps/print_hello.ts deleted file mode 100644 index 794257390..000000000 --- a/cli/tests/testdata/import_maps/print_hello.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function printHello() { - console.log("Hello, world!"); -} diff --git a/cli/tests/testdata/import_maps/scope/scoped.ts b/cli/tests/testdata/import_maps/scope/scoped.ts deleted file mode 100644 index 9a0b5d8e3..000000000 --- a/cli/tests/testdata/import_maps/scope/scoped.ts +++ /dev/null @@ -1,2 +0,0 @@ -import "moment"; -console.log("Hello from scoped!"); diff --git a/cli/tests/testdata/import_maps/scoped_moment.ts b/cli/tests/testdata/import_maps/scoped_moment.ts deleted file mode 100644 index 9f67f88d4..000000000 --- a/cli/tests/testdata/import_maps/scoped_moment.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from scoped moment!"); diff --git a/cli/tests/testdata/import_maps/test.ts b/cli/tests/testdata/import_maps/test.ts deleted file mode 100644 index 9b09e9953..000000000 --- a/cli/tests/testdata/import_maps/test.ts +++ /dev/null @@ -1,6 +0,0 @@ -import "moment"; -import "moment/other_file.ts"; -import "lodash"; -import "lodash/other_file.ts"; -import "https://www.unpkg.com/vue/dist/vue.runtime.esm.js"; -import "./scope/scoped.ts"; diff --git a/cli/tests/testdata/import_maps/test_remote.ts b/cli/tests/testdata/import_maps/test_remote.ts deleted file mode 100644 index 206bdbd5f..000000000 --- a/cli/tests/testdata/import_maps/test_remote.ts +++ /dev/null @@ -1,5 +0,0 @@ -import "moment"; -import "moment/other_file.ts"; -import "lodash"; -import "lodash/other_file.ts"; -import "https://www.unpkg.com/vue/dist/vue.runtime.esm.js"; diff --git a/cli/tests/testdata/import_maps/vue.ts b/cli/tests/testdata/import_maps/vue.ts deleted file mode 100644 index 76dbe1917..000000000 --- a/cli/tests/testdata/import_maps/vue.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello from remapped Vue!"); -- cgit v1.2.3