diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2022-07-20 16:56:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-20 16:56:53 +0200 |
commit | d17b3906bf3a0871d54e9fdc009891e378dc45f5 (patch) | |
tree | 446551bf2f53908d01a4a9b6d35905065369068b /cli/tests/unit | |
parent | 73504d76b29eddc1a563e74bb379682e23347b3c (diff) |
chore: use import.meta.resolve() in tests (#15256)
Diffstat (limited to 'cli/tests/unit')
-rw-r--r-- | cli/tests/unit/broadcast_channel_test.ts | 5 | ||||
-rw-r--r-- | cli/tests/unit/fetch_test.ts | 10 | ||||
-rw-r--r-- | cli/tests/unit/wasm_test.ts | 4 | ||||
-rw-r--r-- | cli/tests/unit/worker_permissions_test.ts | 5 | ||||
-rw-r--r-- | cli/tests/unit/worker_types.ts | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/cli/tests/unit/broadcast_channel_test.ts b/cli/tests/unit/broadcast_channel_test.ts index acdcd8afc..d56324cc0 100644 --- a/cli/tests/unit/broadcast_channel_test.ts +++ b/cli/tests/unit/broadcast_channel_test.ts @@ -6,11 +6,10 @@ Deno.test("broadcastchannel worker", async () => { const intercom = new BroadcastChannel("intercom"); let count = 0; - const url = new URL( + const url = import.meta.resolve( "../testdata/workers/broadcast_channel.ts", - import.meta.url, ); - const worker = new Worker(url.href, { type: "module", name: "worker" }); + const worker = new Worker(url, { type: "module", name: "worker" }); worker.onmessage = () => intercom.postMessage(++count); const promise = deferred(); diff --git a/cli/tests/unit/fetch_test.ts b/cli/tests/unit/fetch_test.ts index 72660c547..6408d06d3 100644 --- a/cli/tests/unit/fetch_test.ts +++ b/cli/tests/unit/fetch_test.ts @@ -1464,7 +1464,7 @@ Deno.test( Deno.test({ permissions: { read: false } }, async function fetchFilePerm() { await assertRejects(async () => { - await fetch(new URL("../testdata/subdir/json_1.json", import.meta.url)); + await fetch(import.meta.resolve("../testdata/subdir/json_1.json")); }, Deno.errors.PermissionDenied); }); @@ -1472,7 +1472,7 @@ Deno.test( { permissions: { read: false } }, async function fetchFilePermDoesNotExist() { await assertRejects(async () => { - await fetch(new URL("./bad.json", import.meta.url)); + await fetch(import.meta.resolve("./bad.json")); }, Deno.errors.PermissionDenied); }, ); @@ -1483,7 +1483,7 @@ Deno.test( await assertRejects( async () => { await fetch( - new URL("../testdata/subdir/json_1.json", import.meta.url), + import.meta.resolve("../testdata/subdir/json_1.json"), { method: "POST", }, @@ -1500,7 +1500,7 @@ Deno.test( async function fetchFileDoesNotExist() { await assertRejects( async () => { - await fetch(new URL("./bad.json", import.meta.url)); + await fetch(import.meta.resolve("./bad.json")); }, TypeError, ); @@ -1511,7 +1511,7 @@ Deno.test( { permissions: { read: true } }, async function fetchFile() { const res = await fetch( - new URL("../testdata/subdir/json_1.json", import.meta.url), + import.meta.resolve("../testdata/subdir/json_1.json"), ); assert(res.ok); const fixture = await Deno.readTextFile( diff --git a/cli/tests/unit/wasm_test.ts b/cli/tests/unit/wasm_test.ts index 1b31249d4..2bf0a7480 100644 --- a/cli/tests/unit/wasm_test.ts +++ b/cli/tests/unit/wasm_test.ts @@ -79,8 +79,8 @@ Deno.test(async function wasmInstantiateStreaming() { Deno.test( { permissions: { read: true } }, async function wasmFileStreaming() { - const url = new URL("../testdata/unreachable.wasm", import.meta.url); - assert(url.href.startsWith("file://")); + const url = import.meta.resolve("../testdata/unreachable.wasm"); + assert(url.startsWith("file://")); const { module } = await WebAssembly.instantiateStreaming(fetch(url)); assertEquals(WebAssembly.Module.exports(module), [{ diff --git a/cli/tests/unit/worker_permissions_test.ts b/cli/tests/unit/worker_permissions_test.ts index 2c21d6fa6..681290c81 100644 --- a/cli/tests/unit/worker_permissions_test.ts +++ b/cli/tests/unit/worker_permissions_test.ts @@ -7,10 +7,9 @@ Deno.test( const promise = deferred<boolean[]>(); const worker = new Worker( - new URL( + import.meta.resolve( "../testdata/workers/env_read_check_worker.js", - import.meta.url, - ).href, + ), { type: "module", deno: { permissions: { env: ["test", "OTHER"] } } }, ); diff --git a/cli/tests/unit/worker_types.ts b/cli/tests/unit/worker_types.ts index 9e32db3d1..081f5ead7 100644 --- a/cli/tests/unit/worker_types.ts +++ b/cli/tests/unit/worker_types.ts @@ -5,7 +5,7 @@ Deno.test( { permissions: { read: true } }, function utimeSyncFileSuccess() { const w = new Worker( - new URL("../testdata/workers/worker_types.ts", import.meta.url).href, + import.meta.resolve("../testdata/workers/worker_types.ts"), { type: "module" }, ); assert(w); |