From efda64beeafe90b4cae508e6b8d32a271f0ea418 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Mon, 5 Oct 2026 04:16:37 +0800 Subject: [PATCH] test(scripts): gate stylesheet completion on script execution --- moli-test-support/src/lib.rs | 2 +- moli-test-support/src/routes_core.rs | 26 +++++++++++++------------- moli-test-support/src/server_routes.rs | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/moli-test-support/src/lib.rs b/moli-test-support/src/lib.rs index d3460576157..7a0c51d5030 100644 --- a/moli-test-support/src/lib.rs +++ b/moli-test-support/src/lib.rs @@ -30,9 +30,9 @@ pub use cdp::discover_browser_websocket_url; struct FixtureRuntimeState { dynamic_stylesheet_dcl: Arc, dynamic_stylesheet_script_executed: Arc, + alternate_stylesheet_probe_executed: Arc, runtime_inline_module_executed: Arc, runtime_stylesheet_snapshot_applied: Arc, - alternate_stylesheet_probe_executed: Arc, runtime_owned_async_script_executed: Arc, parse_time_async_task_first_executed: Arc, parse_time_async_task_visibility_first_executed: Arc, diff --git a/moli-test-support/src/routes_core.rs b/moli-test-support/src/routes_core.rs index 0238596d2b8..1d53f6de387 100644 --- a/moli-test-support/src/routes_core.rs +++ b/moli-test-support/src/routes_core.rs @@ -4647,13 +4647,6 @@ pub(super) async fn asset_blocking_stylesheet_alternate_probe_script() -> Respon javascript_response(BLOCKING_STYLESHEET_ALTERNATE_PROBE_JS) } -pub(super) async fn asset_runtime_inline_module_executed( - Extension(state): Extension, -) -> StatusCode { - state.runtime_inline_module_executed.signal(); - StatusCode::NO_CONTENT -} - pub(super) async fn asset_blocking_stylesheet_alternate_probe_executed( Extension(state): Extension, ) -> StatusCode { @@ -4661,6 +4654,13 @@ pub(super) async fn asset_blocking_stylesheet_alternate_probe_executed( StatusCode::NO_CONTENT } +pub(super) async fn asset_runtime_inline_module_executed( + Extension(state): Extension, +) -> StatusCode { + state.runtime_inline_module_executed.signal(); + StatusCode::NO_CONTENT +} + pub(super) async fn runtime_stylesheet_snapshot_applied( Extension(state): Extension, ) -> StatusCode { @@ -5712,18 +5712,18 @@ async fn script_gated_stylesheet(event: &FixtureEvent) -> Response { css_response(BLOCKING_STYLESHEET_SLOW_CSS) } -pub(super) async fn asset_runtime_inline_module_gated_css( - Extension(state): Extension, -) -> Response { - script_gated_stylesheet(&state.runtime_inline_module_executed).await -} - pub(super) async fn asset_blocking_stylesheet_alternate_gated_css( Extension(state): Extension, ) -> Response { script_gated_stylesheet(&state.alternate_stylesheet_probe_executed).await } +pub(super) async fn asset_runtime_inline_module_gated_css( + Extension(state): Extension, +) -> Response { + script_gated_stylesheet(&state.runtime_inline_module_executed).await +} + pub(super) async fn asset_runtime_stylesheet_snapshot_gated_css( Extension(state): Extension, ) -> Response { diff --git a/moli-test-support/src/server_routes.rs b/moli-test-support/src/server_routes.rs index f50ad8f6ad6..7bdffdfcc83 100644 --- a/moli-test-support/src/server_routes.rs +++ b/moli-test-support/src/server_routes.rs @@ -2420,14 +2420,6 @@ pub(super) fn build_router() -> Router { "/assets/blocking_stylesheet_alternate_probe.js", get(asset_blocking_stylesheet_alternate_probe_script), ) - .route( - "/assets/runtime_inline_module_executed", - get(asset_runtime_inline_module_executed), - ) - .route( - "/assets/runtime_inline_module_gated.css", - get(asset_runtime_inline_module_gated_css), - ) .route( "/assets/blocking_stylesheet_alternate_probe_executed", get(asset_blocking_stylesheet_alternate_probe_executed), @@ -2436,6 +2428,14 @@ pub(super) fn build_router() -> Router { "/assets/blocking_stylesheet_alternate_gated.css", get(asset_blocking_stylesheet_alternate_gated_css), ) + .route( + "/assets/runtime_inline_module_executed", + get(asset_runtime_inline_module_executed), + ) + .route( + "/assets/runtime_inline_module_gated.css", + get(asset_runtime_inline_module_gated_css), + ) .route( "/assets/dynamic_blocking_stylesheet_runtime.js", get(asset_dynamic_blocking_stylesheet_runtime_script),