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. --- tests/testdata/run/import_meta/importmap.json | 12 +++++++ tests/testdata/run/import_meta/main.out | 13 +++++++ tests/testdata/run/import_meta/main.ts | 52 +++++++++++++++++++++++++++ tests/testdata/run/import_meta/other.ts | 7 ++++ 4 files changed, 84 insertions(+) create mode 100644 tests/testdata/run/import_meta/importmap.json create mode 100644 tests/testdata/run/import_meta/main.out create mode 100644 tests/testdata/run/import_meta/main.ts create mode 100644 tests/testdata/run/import_meta/other.ts (limited to 'tests/testdata/run/import_meta') diff --git a/tests/testdata/run/import_meta/importmap.json b/tests/testdata/run/import_meta/importmap.json new file mode 100644 index 000000000..d85fe3028 --- /dev/null +++ b/tests/testdata/run/import_meta/importmap.json @@ -0,0 +1,12 @@ +{ + "imports": { + "bare": "https://example.com/", + "https://example.com/rewrite": "https://example.com/rewritten", + + "1": "https://example.com/PASS-1", + "null": "https://example.com/PASS-null", + "undefined": "https://example.com/PASS-undefined", + "[object Object]": "https://example.com/PASS-object", + "npm:preact": "https://example.com/preact" + } +} diff --git a/tests/testdata/run/import_meta/main.out b/tests/testdata/run/import_meta/main.out new file mode 100644 index 000000000..5a86d6240 --- /dev/null +++ b/tests/testdata/run/import_meta/main.out @@ -0,0 +1,13 @@ +other remote [WILDCARD]other.ts false undefined undefined +other [WILDCARD]other.ts false [WILDCARD]other.ts [WILDCARD] +main [WILDCARD]main.ts true [WILDCARD]main.ts [WILDCARD] +Resolving ./foo.js file:///[WILDCARD]/foo.js +Resolving bare from import map https://example.com/ +Resolving https://example.com/rewrite from import map https://example.com/rewritten +Resolving without a value from import map https://example.com/PASS-undefined +Resolving 1 from import map https://example.com/PASS-1 +Resolving null from import map https://example.com/PASS-null +Resolving object from import map https://example.com/PASS-object +Resolving npm:cowsay npm:cowsay +Resolving npm:cowsay@1 npm:cowsay@1 +Resolving npm:preact from import map https://example.com/preact diff --git a/tests/testdata/run/import_meta/main.ts b/tests/testdata/run/import_meta/main.ts new file mode 100644 index 000000000..61880e2c1 --- /dev/null +++ b/tests/testdata/run/import_meta/main.ts @@ -0,0 +1,52 @@ +import { assertThrows } from "../../../../test_util/std/assert/mod.ts"; +import "http://localhost:4545/run/import_meta/other.ts"; +import "./other.ts"; + +console.log( + "main", + import.meta.url, + import.meta.main, + import.meta.filename, + import.meta.dirname, +); + +console.log("Resolving ./foo.js", import.meta.resolve("./foo.js")); +console.log("Resolving bare from import map", import.meta.resolve("bare")); +console.log( + "Resolving https://example.com/rewrite from import map", + import.meta.resolve("https://example.com/rewrite"), +); +console.log( + "Resolving without a value from import map", + import.meta.resolve(), +); +console.log( + "Resolving 1 from import map", + import.meta.resolve(1), +); +console.log( + "Resolving null from import map", + import.meta.resolve(null), +); +console.log( + "Resolving object from import map", + import.meta.resolve({}), +); +assertThrows(() => { + import.meta.resolve("too", "many", "arguments"); +}, TypeError); +assertThrows(() => { + import.meta.resolve("://malformed/url?asdf"); +}, TypeError); +console.log( + "Resolving npm:cowsay", + import.meta.resolve("npm:cowsay"), +); +console.log( + "Resolving npm:cowsay@1", + import.meta.resolve("npm:cowsay@1"), +); +console.log( + "Resolving npm:preact from import map", + import.meta.resolve("npm:preact"), +); diff --git a/tests/testdata/run/import_meta/other.ts b/tests/testdata/run/import_meta/other.ts new file mode 100644 index 000000000..5da6a4936 --- /dev/null +++ b/tests/testdata/run/import_meta/other.ts @@ -0,0 +1,7 @@ +console.log( + import.meta.url.startsWith("http") ? "other remote" : "other", + import.meta.url, + import.meta.main, + import.meta.filename, + import.meta.dirname, +); -- cgit v1.2.3