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/run/onload/imported.ts | 13 ---------- cli/tests/testdata/run/onload/main.out | 15 ------------ cli/tests/testdata/run/onload/main.ts | 34 -------------------------- cli/tests/testdata/run/onload/nest_imported.ts | 12 --------- 4 files changed, 74 deletions(-) delete mode 100644 cli/tests/testdata/run/onload/imported.ts delete mode 100644 cli/tests/testdata/run/onload/main.out delete mode 100644 cli/tests/testdata/run/onload/main.ts delete mode 100644 cli/tests/testdata/run/onload/nest_imported.ts (limited to 'cli/tests/testdata/run/onload') diff --git a/cli/tests/testdata/run/onload/imported.ts b/cli/tests/testdata/run/onload/imported.ts deleted file mode 100644 index 971ddaea3..000000000 --- a/cli/tests/testdata/run/onload/imported.ts +++ /dev/null @@ -1,13 +0,0 @@ -// deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../../test_util/std/assert/mod.ts"; -import "./nest_imported.ts"; - -const handler = (e: Event) => { - assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable); - console.log(`got ${e.type} event in event handler (imported)`); -}; - -window.addEventListener("load", handler); -window.addEventListener("beforeunload", handler); -window.addEventListener("unload", handler); -console.log("log from imported script"); diff --git a/cli/tests/testdata/run/onload/main.out b/cli/tests/testdata/run/onload/main.out deleted file mode 100644 index b25d33fa8..000000000 --- a/cli/tests/testdata/run/onload/main.out +++ /dev/null @@ -1,15 +0,0 @@ -log from nest_imported script -log from imported script -log from main -got load event in event handler (nest_imported) -got load event in event handler (imported) -got load event in event handler (main) -got load event in onload function -got beforeunload event in event handler (nest_imported) -got beforeunload event in event handler (imported) -got beforeunload event in event handler (main) -got beforeunload event in onbeforeunload function -got unload event in event handler (nest_imported) -got unload event in event handler (imported) -got unload event in event handler (main) -got unload event in onunload function diff --git a/cli/tests/testdata/run/onload/main.ts b/cli/tests/testdata/run/onload/main.ts deleted file mode 100644 index 191c4d872..000000000 --- a/cli/tests/testdata/run/onload/main.ts +++ /dev/null @@ -1,34 +0,0 @@ -// deno-lint-ignore-file no-window-prefix no-prototype-builtins -import { assert } from "../../../../../test_util/std/assert/mod.ts"; -import "./imported.ts"; - -assert(window.hasOwnProperty("onload")); -assert(window.onload === null); - -const eventHandler = (e: Event) => { - assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable); - console.log(`got ${e.type} event in event handler (main)`); -}; - -window.addEventListener("load", eventHandler); - -window.addEventListener("beforeunload", eventHandler); - -window.addEventListener("unload", eventHandler); - -window.onload = (e: Event) => { - assert(!e.cancelable); - console.log(`got ${e.type} event in onload function`); -}; - -window.onbeforeunload = (e: BeforeUnloadEvent) => { - assert(e.cancelable); - console.log(`got ${e.type} event in onbeforeunload function`); -}; - -window.onunload = (e: Event) => { - assert(!e.cancelable); - console.log(`got ${e.type} event in onunload function`); -}; - -console.log("log from main"); diff --git a/cli/tests/testdata/run/onload/nest_imported.ts b/cli/tests/testdata/run/onload/nest_imported.ts deleted file mode 100644 index e89699854..000000000 --- a/cli/tests/testdata/run/onload/nest_imported.ts +++ /dev/null @@ -1,12 +0,0 @@ -// deno-lint-ignore-file no-window-prefix -import { assert } from "../../../../../test_util/std/assert/mod.ts"; - -const handler = (e: Event) => { - assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable); - console.log(`got ${e.type} event in event handler (nest_imported)`); -}; - -window.addEventListener("load", handler); -window.addEventListener("beforeunload", handler); -window.addEventListener("unload", handler); -console.log("log from nest_imported script"); -- cgit v1.2.3