From e3276fbb71093faf4e8850f68ed2e080a9bda222 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Wed, 3 May 2023 22:10:51 +0100 Subject: fix(test): disable preventDefault() for beforeunload event (#18911) Fixes #18910. --- cli/tools/bench.rs | 9 +++------ cli/tools/test.rs | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'cli/tools') diff --git a/cli/tools/bench.rs b/cli/tools/bench.rs index aa5bd044d..3d5f99aba 100644 --- a/cli/tools/bench.rs +++ b/cli/tools/bench.rs @@ -498,12 +498,9 @@ async fn bench_specifier( sender.send(BenchEvent::Result(desc.id, result))?; } - loop { - if !worker.dispatch_beforeunload_event(located_script_name!())? { - break; - } - worker.run_event_loop(false).await?; - } + // Ignore `defaultPrevented` of the `beforeunload` event. We don't allow the + // event loop to continue beyond what's needed to await results. + worker.dispatch_beforeunload_event(located_script_name!())?; worker.dispatch_unload_event(located_script_name!())?; Ok(()) } diff --git a/cli/tools/test.rs b/cli/tools/test.rs index 847260352..50e220a46 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -1033,12 +1033,9 @@ pub async fn test_specifier( sender.send(TestEvent::Result(desc.id, result, elapsed as u64))?; } - loop { - if !worker.dispatch_beforeunload_event(located_script_name!())? { - break; - } - worker.run_event_loop(false).await?; - } + // Ignore `defaultPrevented` of the `beforeunload` event. We don't allow the + // event loop to continue beyond what's needed to await results. + worker.dispatch_beforeunload_event(located_script_name!())?; worker.dispatch_unload_event(located_script_name!())?; if let Some(coverage_collector) = coverage_collector.as_mut() { -- cgit v1.2.3