Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions denops/@denops-private/worker_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ function stubConsole() {

function stubMessage() {
const workerGlobal = globalThis as DedicatedWorkerGlobalScope;
// Use separate sandboxes so that stubs are restored before the defined
// properties are removed.
const defineSandbox = sinon.createSandbox();
const sandbox = sinon.createSandbox();
sandbox.define(workerGlobal, "postMessage", () => {});
defineSandbox.define(workerGlobal, "postMessage", () => {});
const postMessage = sandbox.stub(workerGlobal, "postMessage");
sandbox.define(workerGlobal, "onmessage", null);
defineSandbox.define(workerGlobal, "onmessage", null);
const onmessage = sandbox.stub(workerGlobal, "onmessage");
const fakeHostMessage = (data: unknown) => {
workerGlobal.onmessage?.(new MessageEvent("message", { data }));
Expand All @@ -64,6 +67,7 @@ function stubMessage() {
fakeHostMessage,
[Symbol.dispose]() {
sandbox.restore();
defineSandbox.restore();
},
};
}
Expand Down
8 changes: 5 additions & 3 deletions tests/denops/testutil/shared_server_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,15 @@ Deno.test("useSharedServer()", async (t) => {

await t.step("rejects if the server startup times out (flaky)", async () => {
await retry(async () => {
await assertRejects(
// NOTE: The message of the timeout error differs between Deno versions,
// so check the error name instead.
const error = await assertRejects(
async () => {
await using _server = await useSharedServer({ timeout: 0 });
},
Error,
"Signal timed out",
DOMException,
);
assertEquals(error.name, "TimeoutError");
});
});
});
Loading