diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs index 080eea83dfc..904d4d027f0 100644 --- a/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs +++ b/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs @@ -1546,7 +1546,7 @@ fn worker_event_handler_only_boolean_false_cancels_synthetic_event() { const w = new Worker(""); const run = returned => { w.onerror = () => returned; - const event = { type: "error", cancelable: true, defaultPrevented: false }; + const event = new Event("error", {cancelable: true}); return [w.dispatchEvent(event), event.defaultPrevented]; }; const observations = [run(true), run(false), run(0), run("")]; diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/message_port_delivery.rs b/moli-renderer-v8/src/runtime/page_vm/tests/message_port_delivery.rs index ad5c144a6e4..2e4ed2db9ac 100644 --- a/moli-renderer-v8/src/runtime/page_vm/tests/message_port_delivery.rs +++ b/moli-renderer-v8/src/runtime/page_vm/tests/message_port_delivery.rs @@ -3,7 +3,7 @@ use super::*; use crate::page_task_queue::PageMessagePortDeliveryTargetEffect; #[tokio::test(flavor = "current_thread")] -async fn message_port_delivery_body_leaves_reactions_for_selected_callback_completion() { +async fn message_port_callback_cleanup_runs_before_dispatch_and_selected_task_completion() { run_page_vm_async_test(async move { let loader = crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader"); @@ -14,12 +14,19 @@ async fn message_port_delivery_body_leaves_reactions_for_selected_callback_compl r#" globalThis.__messagePortBodyBoundary = []; globalThis.__messagePortBodyBoundaryChannel = new MessageChannel(); -__messagePortBodyBoundaryChannel.port1.onmessage = event => { +const port = __messagePortBodyBoundaryChannel.port1; +const later = () => __messagePortBodyBoundary.push("unexpected later listener"); +port.onmessage = event => { __messagePortBodyBoundary.push("message:" + event.data); Promise.resolve().then(() => { __messagePortBodyBoundary.push("microtask:" + event.data); + if (event.currentTarget !== port || event.eventPhase !== Event.AT_TARGET) { + __messagePortBodyBoundary.push("callback state cleared before cleanup"); + } + port.removeEventListener("message", later); }); }; +port.addEventListener("message", later); __messagePortBodyBoundaryChannel.port2.postMessage("one"); "queued" "#, @@ -41,8 +48,8 @@ __messagePortBodyBoundaryChannel.port2.postMessage("one"); page_vm .vm_mut() .eval("__messagePortBodyBoundary.join('|')")?, - "message:one", - "the body-only executor must leave Promise reactions pending" + "message:one|microtask:one", + "Web IDL callback cleanup precedes later event listeners" ); page_vm.finish_selected_page_callback_task(&loader).await?; @@ -51,7 +58,7 @@ __messagePortBodyBoundaryChannel.port2.postMessage("one"); .vm_mut() .eval("__messagePortBodyBoundary.join('|')")?, "message:one|microtask:one", - "the selected callback completion must own the single task checkpoint" + "the task checkpoint must not repeat the callback cleanup microtask" ); Ok::<_, anyhow::Error>(()) }) diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_dispatch.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_dispatch.rs index 6362cf6b43f..7c91515a07e 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_dispatch.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_dispatch.rs @@ -195,14 +195,14 @@ fn simple_event_dispatch_observes_registration_identity_and_current_handler() { ), ( "capture-add", - &["before", "after"][..], + &["before", "after", "original", "replacement"][..], &["after", "original", "replacement"][..], - true, + false, false, ), ( "capture-readd", - &["before", "after"][..], + &["before", "after", "original"][..], &["after", "original"][..], true, true,