Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(cdp): require committed session routes
ldm0cb8c7bef66e9
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rsindex 95c716886..1dd957da5 100644--- a/moli-protocol/src/conn.rs+++ b/moli-protocol/src/conn.rs@@ -1163,11 +1163,6 @@ pub struct CdpConnection {// choice vary between otherwise identical processes.auto_attach_owner_sessions: IndexMap<Option<String>, AutoAttachOwnerPolicy>,target_control: TargetControlPlane,- /// Allows old unit-test fixtures that install only the target-side half of- /// a session binding to remain usable while production routing is checked- /// separately against the committed control-plane registry.- #[cfg(test)]- allow_incomplete_session_fixture_routes: bool,default_target_lifecycle: DefaultTargetLifecycle,service_worker_auto_attach_related_owners: Vec<ServiceWorkerAutoAttachRelatedOwner>,service_worker_pause_on_start_owner_sessions: HashSet<Option<String>>,@@ -1476,8 +1471,6 @@ impl CdpConnection {target_discovery_filter: None,auto_attach_owner_sessions: IndexMap::new(),target_control: TargetControlPlane::default(),- #[cfg(test)]- allow_incomplete_session_fixture_routes: true,default_target_lifecycle: DefaultTargetLifecycle::default(),service_worker_auto_attach_related_owners: Vec::new(),service_worker_pause_on_start_owner_sessions: HashSet::new(),diff --git a/moli-protocol/src/conn/bidi_channel_work.rs b/moli-protocol/src/conn/bidi_channel_work.rsindex a450141ba..8e71ce3ef 100644--- a/moli-protocol/src/conn/bidi_channel_work.rs+++ b/moli-protocol/src/conn/bidi_channel_work.rs@@ -165,7 +165,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-owner".to_owned());browser_context.set_active_target_id("TID-owner");browser_context.attach_active_session("SID-owner".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.runtime_session_owner_slot_mut(Some("SID-owner")).expect("test runtime slot").set_page_attachment_id_for_test(1);@@ -209,6 +209,7 @@ mod tests {.as_deref(),Some("SID-owner"));+ conn.rollback_attached_session_without_event("SID-owner");assert!(!owner.is_current(&conn),diff --git a/moli-protocol/src/conn/browser_context/network_owner.rs b/moli-protocol/src/conn/browser_context/network_owner.rsindex ef444b498..e7f8e35a8 100644--- a/moli-protocol/src/conn/browser_context/network_owner.rs+++ b/moli-protocol/src/conn/browser_context/network_owner.rs@@ -896,7 +896,7 @@ mod tests {browser_context.assign_attached_session_to_target("TID-background", "SID-attached".to_owned()));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn}@@ -911,7 +911,7 @@ mod tests {Some("SID-background".to_owned()),"https://background.example/".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let (active_fetch_id, active_network_request_id) = conn.allocate_pending_subresource_fetch_request_ids_for_owner(diff --git a/moli-protocol/src/conn/browser_context/page_owner.rs b/moli-protocol/src/conn/browser_context/page_owner.rsindex f0cd35ec5..62e782a0e 100644--- a/moli-protocol/src/conn/browser_context/page_owner.rs+++ b/moli-protocol/src/conn/browser_context/page_owner.rs@@ -1157,8 +1157,8 @@ mod tests {);let inactive_runtime = inactive.renderer_runtime();- conn.browser_context = Some(active);- conn.inactive_browser_contexts.push(inactive);+ conn.install_browser_context_fixture_for_test(active);+ conn.push_inactive_browser_context_fixture_for_test(inactive);assert!(conn.set_page_domain_enabled_for_session_owner(Some("SID-inactive-a"), true));assert!(inactive_runtime.javascript_dialog_handler_enabled());diff --git a/moli-protocol/src/conn/browser_context/runtime_owner.rs b/moli-protocol/src/conn/browser_context/runtime_owner.rsindex 960deb040..5aa5c3f71 100644--- a/moli-protocol/src/conn/browser_context/runtime_owner.rs+++ b/moli-protocol/src/conn/browser_context/runtime_owner.rs@@ -410,7 +410,7 @@ impl CdpConnection {session_id.to_owned(),None,&target_id,- Some(route.clone()),+ route.clone(),false,false,);@@ -457,7 +457,6 @@ mod tests {#[tokio::test]async fn runtime_listener_enable_uses_shared_worker_target_session() {let mut conn = CdpConnection::new();- conn.require_committed_session_routes_for_test();let mut browser_context = BrowserContext::new("BID-shared".to_owned());browser_context.insert_shared_worker_target(SharedWorkerTargetState::new(RendererOwnerLocalHostId::new_for_testing(1),@@ -467,7 +466,7 @@ mod tests {"https://example.test/shared-worker.js".to_owned(),"shared-worker".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let outcome = conn.enable_runtime_listener_for_target("TID-shared-worker")diff --git a/moli-protocol/src/conn/browser_context/target_session_owner.rs b/moli-protocol/src/conn/browser_context/target_session_owner.rsindex 281182d79..59c4fddfc 100644--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs@@ -2471,7 +2471,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-session-id".to_owned());browser_context.set_active_target_id("TID-session-id");browser_context.attach_active_session("SID-1".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);assert_eq!(conn.gen_session_id(), "SID-2");assert_eq!(@@ -2586,7 +2586,7 @@ mod tests {"TID-background","SID-background-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);assert_eq!(conn.target_renderer_runtime_inspector_session_id_for_session(None),@@ -3435,7 +3435,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-page-residence".to_owned());browser_context.set_active_target_id("TID-page-residence");browser_context.attach_active_session("SID-page-residence");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.runtime_session_owner_slot_mut(Some("SID-page-residence")).expect("active target runtime slot").set_page_attachment_id_for_test(41);@@ -3475,7 +3475,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-pending-residence".to_owned());browser_context.set_active_target_id("TID-pending-residence");browser_context.attach_active_session("SID-pending-residence".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);assert_eq!(conn.target_page_residence_identity_for_session(Some("SID-pending-residence")),@@ -3509,7 +3509,7 @@ mod tests {let mut conn = CdpConnection::default();let mut browser_context = BrowserContext::new("BID-implicit-page-residence".to_owned());browser_context.set_active_target_id("TID-original");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.runtime_session_owner_slot_mut(None).expect("implicit active runtime slot").set_page_attachment_id_for_test(1);@@ -3555,7 +3555,7 @@ mod tests {.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled = true;- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.with_target_owner_state_for_session_mut(Some("SID-active"), |owner_state| {owner_state.target_crash_state.mark_crashed();@@ -3609,7 +3609,7 @@ mod tests {"SID-lifecycle-only".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);for session_id in ["SID-primary", "SID-lifecycle-only"] {conn.with_target_devtools_session_state_for_session_mut(Some(session_id), |state| {@@ -3667,7 +3667,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(41);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.with_target_devtools_session_state_for_session_mut(Some("SID-runtime-b"), |state| {state.runtime_session_state.runtime_frontend_enabled = true@@ -3722,7 +3722,7 @@ mod tests {"TID-service-worker","SID-service-worker".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);assert_eq!(conn.session_route(Some("SID-service-worker")),@@ -3789,8 +3789,8 @@ mod tests {));- conn.browser_context = Some(active);- conn.inactive_browser_contexts.push(inactive);+ conn.install_browser_context_fixture_for_test(active);+ conn.push_inactive_browser_context_fixture_for_test(inactive);conn.runtime_session_owner_slot_mut(Some("SID-active")).expect("active runtime slot should be mutable")@@ -3897,7 +3897,7 @@ mod tests {.is_none(),"a background target with default protocol settings should not allocate background overrides");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let observer = conn.runtime_session_owner_slot(Some("SID-background-dialog"))diff --git a/moli-protocol/src/conn/command_owner_scope.rs b/moli-protocol/src/conn/command_owner_scope.rsindex 944d427af..6ae83e8fb 100644--- a/moli-protocol/src/conn/command_owner_scope.rs+++ b/moli-protocol/src/conn/command_owner_scope.rs@@ -121,7 +121,7 @@ mod tests {let mut conn = CdpConnection::default();let mut browser_context = BrowserContext::new("BID-scope".to_owned());browser_context.set_active_target_id("TID-original");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let scope = CommandOwnerScope::capture(&conn, None);conn.browser_context@@ -168,7 +168,7 @@ mod tests {browser_context.assign_attached_session_to_target("TID-owner", "SID-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let owner = conn.command_owner_scope_for_devtools_context(&page_context("SID-attached", "TID-owner"))@@ -191,7 +191,7 @@ mod tests {"about:blank".to_owned(),)));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let protocol_neutral = conn.command_owner_scope_for_devtools_context(&page_context(diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rsindex c274aa179..0b12045e6 100644--- a/moli-protocol/src/conn/dispatch_tests.rs+++ b/moli-protocol/src/conn/dispatch_tests.rs@@ -296,7 +296,7 @@ fn connection_with_background_pending_fetch_action(request_id: &str) -> CdpConne.fetch_owner.pending_state_mut().insert_pending_fetch_request_id_for_test(request_id.to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn}@@ -708,7 +708,7 @@ async fn bidi_fetch_control_resolves_background_request_owner() {Some("SID-background".to_owned()),"https://example.test/background".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.register_pending_fetch_navigation_request_for_owner(&crate::conn::CommandOwnerScope::for_session("SID-background"),@@ -1190,7 +1190,8 @@ async fn devtools_runtime_call_function_popup_activity_drains_from_protocol_neutlet mut browser_context = BrowserContext::new("BID-neutral-popup".to_owned());browser_context.set_active_target_id("TID-neutral-popup-opener".to_owned());browser_context.attach_active_session("SID-neutral-popup-opener");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async("data:text/html,<p>neutral popup opener</p>")@@ -1372,7 +1373,7 @@ async fn devtools_command_preserves_target_close_detached_typed_sidecar() {let mut browser_context = BrowserContext::new("BID-close-sidecar".to_owned());browser_context.set_active_target_id("TID-close-sidecar".to_owned());browser_context.attach_active_session("SID-close-sidecar".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let context = DevToolsCommandContext {protocol: DevToolsProtocol::WebDriverBidi,@@ -2761,7 +2762,7 @@ async fn devtools_get_realms_succeeds_when_page_loaded_before_session_attach() {let mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-late-realms".to_owned());browser_context.set_active_target_id("TID-late-realms".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<title>late-realms</title>")@@ -2925,7 +2926,7 @@ async fn devtools_runtime_evaluate_reports_no_document_without_resolver_fallbackbrowser_context.set_active_target_id("TID-no-page-runtime".to_owned());browser_context.attach_active_session("SID-no-page-runtime".to_owned());browser_context.set_target_url("about:blank".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let (evaluate_result, _) = conn.execute_devtools_command(DevToolsCommand::EvaluateScript(@@ -3065,7 +3066,7 @@ async fn element_screenshot_reports_unsupported_without_initial_document_repair(browser_context.set_active_target_id("TID-no-page-element-shot".to_owned());browser_context.attach_active_session("SID-no-page-element-shot".to_owned());browser_context.set_target_url("about:blank".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let (screenshot_result, _) = conn.execute_devtools_command(DevToolsCommand::CaptureScreenshot(@@ -5714,8 +5715,8 @@ async fn devtools_storage_cookie_commands_scope_to_target_browser_context() {default_context.set_active_target_id("TID-default".to_owned());let mut custom_context = BrowserContext::new("BID-custom".to_owned());custom_context.set_active_target_id("TID-custom".to_owned());- conn.browser_context = Some(default_context);- conn.inactive_browser_contexts.push(custom_context);+ conn.install_browser_context_fixture_for_test(default_context);+ conn.push_inactive_browser_context_fixture_for_test(custom_context);let base_context = DevToolsCommandContext {protocol: DevToolsProtocol::WebDriverBidi,@@ -6830,7 +6831,7 @@ fn command_dispatch_completes_unknown_domains_without_legacy_fallback() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let raw = serde_json::to_string(&json!({"id": 9,"method": "Nope.command",@@ -6959,7 +6960,7 @@ async fn command_dispatch_completes_live_browser_permission_without_legacy_fallblet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-browser-permission-live".to_owned());browser_context.set_active_target_id("TID-browser-permission-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>browser permission</p>").await@@ -7164,7 +7165,7 @@ fn command_dispatch_completes_additional_page_sync_commands_without_legacy_fallblet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-page-sync".to_owned());browser_context.set_active_target_id("TID-page-sync");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let download_raw = serde_json::to_string(&json!({"id": 411,@@ -7335,7 +7336,8 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()let mut browser_context = BrowserContext::new("BID-page-preload-live".to_owned());browser_context.set_active_target_id("TID-page-preload-live".to_owned());browser_context.attach_active_session("SID-page-preload-live");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async("data:text/html,<p>preload</p>")@@ -7500,7 +7502,7 @@ async fn command_dispatch_completes_target_activate_without_legacy_fallback() {let mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-target-activate".to_owned());browser_context.set_active_target_id("TID-target-activate".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 56,@@ -7525,7 +7527,7 @@ async fn command_dispatch_completes_target_set_auto_attach_without_legacy_fallbalet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-target-auto-attach".to_owned());browser_context.set_active_target_id("TID-target-auto-attach".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 57,@@ -7559,7 +7561,7 @@ async fn command_dispatch_completes_page_bring_to_front_without_legacy_fallback(let mut browser_context = BrowserContext::new("BID-page-bring".to_owned());browser_context.set_active_target_id("TID-page-bring".to_owned());browser_context.attach_active_session("SID-page-bring".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 5701,@@ -7589,7 +7591,7 @@ async fn command_dispatch_completes_target_detach_without_legacy_fallback() {let mut browser_context = BrowserContext::new("BID-target-detach".to_owned());browser_context.set_active_target_id("TID-target-detach".to_owned());browser_context.attach_active_session("SID-target-detach".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 58,@@ -7632,7 +7634,7 @@ async fn command_dispatch_completes_target_close_without_legacy_fallback() {let mut browser_context = BrowserContext::new("BID-target-close".to_owned());browser_context.set_active_target_id("TID-target-close".to_owned());browser_context.attach_active_session("SID-target-close".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 59,@@ -7682,7 +7684,7 @@ async fn command_dispatch_completes_target_dispose_browser_context_without_legaclet mut browser_context = BrowserContext::new("BID-target-dispose".to_owned());browser_context.set_active_target_id("TID-target-dispose".to_owned());browser_context.attach_active_session("SID-target-dispose".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 60,@@ -7725,7 +7727,7 @@ async fn command_dispatch_completes_target_send_message_without_legacy_fallback(let mut browser_context = BrowserContext::new("BID-target-send".to_owned());browser_context.set_active_target_id("TID-target-send".to_owned());browser_context.attach_active_session("SID-target-send".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let nested = serde_json::to_string(&json!({"id": 6101,@@ -7819,7 +7821,7 @@ async fn command_dispatch_completes_live_storage_set_cookies_without_legacy_falllet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-storage-live".to_owned());browser_context.set_active_target_id("TID-storage-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>storage</p>").await@@ -7867,7 +7869,7 @@ async fn command_dispatch_completes_live_network_extra_headers_without_legacy_falet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-network-live".to_owned());browser_context.set_active_target_id("TID-network-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>network</p>").await@@ -7904,7 +7906,7 @@ async fn command_dispatch_completes_live_network_blocked_urls_without_legacy_fallet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-network-blocked-live".to_owned());browser_context.set_active_target_id("TID-network-blocked-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>network blocked</p>").await@@ -7941,7 +7943,7 @@ async fn command_dispatch_completes_live_network_set_cookie_without_legacy_fallblet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-network-cookie-live".to_owned());browser_context.set_active_target_id("TID-network-cookie-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>network cookie</p>").await@@ -7986,7 +7988,7 @@ async fn command_dispatch_completes_live_network_emulation_without_legacy_fallbalet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-network-emulated-live".to_owned());browser_context.set_active_target_id("TID-network-emulated-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>network emulated</p>").await@@ -8029,7 +8031,7 @@ async fn command_dispatch_completes_live_network_user_agent_without_legacy_fallblet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-network-ua-live".to_owned());browser_context.set_active_target_id("TID-network-ua-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>network ua</p>").await@@ -8066,7 +8068,7 @@ async fn command_dispatch_completes_live_emulation_user_agent_without_legacy_fallet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-emulation-ua-live".to_owned());browser_context.set_active_target_id("TID-emulation-ua-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>emulation ua</p>").await@@ -8127,7 +8129,7 @@ async fn pending_emulation_user_agent_loader_keeps_active_owner_route_across_com.background_target_mut("TID-emulation-ua-background").expect("background target").replace_loaded_page(Some(background_page));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 688,@@ -8204,7 +8206,7 @@ async fn pending_emulation_viewport_keeps_original_page_when_active_target_chang.background_target_mut("TID-emulation-viewport-replacement").expect("replacement target").replace_loaded_page(Some(replacement_page));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let raw = serde_json::to_string(&json!({"id": 690,@@ -8288,7 +8290,7 @@ async fn pending_emulation_timezone_keeps_background_owner_route_across_completi.background_target_mut("TID-emulation-timezone-background").expect("background target").replace_loaded_page(Some(background_page));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let background_route = conn.target_session_route_for_target_id("TID-emulation-timezone-background")@@ -8356,7 +8358,7 @@ async fn command_dispatch_completes_live_emulation_locale_without_legacy_fallbaclet mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-emulation-locale-live".to_owned());browser_context.set_active_target_id("TID-emulation-locale-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>emulation locale</p>").await@@ -8393,7 +8395,7 @@ async fn command_dispatch_completes_live_security_tls_without_legacy_fallback()let mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-security-tls-live".to_owned());browser_context.set_active_target_id("TID-security-tls-live".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>security tls</p>").await@@ -8455,7 +8457,7 @@ async fn pending_security_tls_keeps_background_owner_route_across_completion() {.background_target_mut("TID-security-background").expect("background target").replace_loaded_page(Some(background_page));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let background_session =attach_page_session_for_test(&mut conn, "TID-security-background").await;@@ -8525,7 +8527,8 @@ async fn command_dispatch_completes_live_fetch_enable_without_legacy_fallback()let mut ctx = crate::testing::TestContext::new();let mut browser_context = BrowserContext::new("BID-fetch-live".to_owned());browser_context.set_active_target_id("TID-fetch-live".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async("data:text/html,<p>fetch</p>")@@ -8564,7 +8567,7 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {let mut conn = CdpConnection::new();let mut browser_context = BrowserContext::new("BID-bidi-intercept".to_owned());browser_context.set_active_target_id("TID-bidi-intercept".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let context = DevToolsCommandContext {protocol: DevToolsProtocol::WebDriverBidi,session_id: Some(DevToolsSessionId::from("BIDI-SID")),@@ -8766,7 +8769,8 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback().active_page_target_mut().fetch_owner.configure(None, true, Vec::new());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async("data:text/html,<p>fetch disable</p>")diff --git a/moli-protocol/src/conn/downloads.rs b/moli-protocol/src/conn/downloads.rsindex 6a6579b83..9022b7113 100644--- a/moli-protocol/src/conn/downloads.rs+++ b/moli-protocol/src/conn/downloads.rs@@ -1547,7 +1547,7 @@ mod tests {.network_policy.push_extra_header(("X-Target".to_owned(), "target".to_owned()));assert!(browser_context.insert_page_target_host(background));- connection.browser_context = Some(browser_context);+ connection.install_browser_context_fixture_for_test(browser_context);let owner = connection.pending_download_owner_context(&CommandOwnerScope::for_session("SID-background"))diff --git a/moli-protocol/src/conn/inspector_route.rs b/moli-protocol/src/conn/inspector_route.rsindex 38f16f281..f45748407 100644--- a/moli-protocol/src/conn/inspector_route.rs+++ b/moli-protocol/src/conn/inspector_route.rs@@ -282,7 +282,7 @@ mod tests {"SID-background-attached".to_owned(),));let mut conn = CdpConnection::default();- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let filtered = conn.filter_renderer_inspector_batches_for_target_owner(&CommandOwnerScope::for_session("SID-active-primary"),@@ -331,7 +331,8 @@ mod tests {.runtime_slot.current_renderer_attachment().expect("installed page should have a renderer attachment");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let accepted_state = V8InspectorSessionState::from_bytes(vec![1, 2, 3]);let mut accepted = batch(DevToolsSessionKey::Primary);diff --git a/moli-protocol/src/conn/runtime_eval.rs b/moli-protocol/src/conn/runtime_eval.rsindex e45b2e17f..b47bea945 100644--- a/moli-protocol/src/conn/runtime_eval.rs+++ b/moli-protocol/src/conn/runtime_eval.rs@@ -6832,7 +6832,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn}@@ -6846,7 +6846,7 @@ mod tests {browser_context.assign_attached_session_to_target("TID-active", "SID-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.register_runtime_remote_object_ids_for_session_owner(Some("SID-active"),@@ -6983,7 +6983,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-navigation-termination".to_owned());browser_context.set_active_target_id("TID-navigation-termination".to_owned());browser_context.attach_active_session("SID-navigation-termination".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let old_attachment = RendererAgentAttachmentId::allocate();let terminal_attachment = RendererAgentAttachmentId::allocate();@@ -7071,7 +7071,7 @@ mod tests {"TID-navigation-sessions","SID-navigation-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let old_attachment = RendererAgentAttachmentId::allocate();let terminal_attachment = RendererAgentAttachmentId::allocate();@@ -7178,7 +7178,7 @@ mod tests {let mut conn = CdpConnection::default();let mut browser_context = BrowserContext::new("BID-navigation-sessionless".to_owned());browser_context.set_active_target_id("TID-navigation-sessionless".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let old_attachment = RendererAgentAttachmentId::allocate();let terminal_attachment = RendererAgentAttachmentId::allocate();@@ -7236,7 +7236,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-attachment-race".to_owned());browser_context.set_active_target_id("TID-attachment-race".to_owned());browser_context.attach_active_session("SID-attachment-race".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let live_attachment = RendererAgentAttachmentId::allocate();let stale_attachment = RendererAgentAttachmentId::allocate();@@ -7295,7 +7295,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-duplicate-response".to_owned());browser_context.set_active_target_id("TID-duplicate-response".to_owned());browser_context.attach_active_session("SID-duplicate-response".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let attachment_id = RendererAgentAttachmentId::allocate();let correlation = register_devtools_session_response_for_test(@@ -7336,7 +7336,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-interleaved-response".to_owned());browser_context.set_active_target_id("TID-interleaved-response".to_owned());browser_context.attach_active_session("SID-interleaved-response".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let attachment_id = RendererAgentAttachmentId::allocate();let first = register_devtools_session_response_for_test(@@ -7399,7 +7399,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-session-output".to_owned());browser_context.set_active_target_id("TID-session-output".to_owned());browser_context.attach_active_session("SID-session-output".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let attachment_id = RendererAgentAttachmentId::allocate();let frontend = ParsedCdpCommand::parse_str(@@ -7481,7 +7481,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-session-projection".to_owned());browser_context.set_active_target_id("TID-session-projection".to_owned());browser_context.attach_active_session("SID-session-projection".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let session_id = Some("SID-session-projection");let attachment_id = RendererAgentAttachmentId::allocate();@@ -7682,7 +7682,8 @@ mod tests {let mut ctx = TestContext::new();let mut browser_context = BrowserContext::new("BID-runtime-node-snapshot".to_owned());browser_context.set_active_target_id("TID-runtime-node-snapshot".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><body><article id='target'>live</article></body></html>",None,@@ -7948,7 +7949,7 @@ mod tests {Some("SID-bg".to_owned()),"about:blank#bg".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.register_pending_inspector_await(1, Some("SID-active"));conn.register_pending_inspector_await(2, Some("SID-bg"));@@ -8027,7 +8028,7 @@ mod tests {Some("SID-bg".to_owned()),"about:blank#bg".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.register_pending_inspector_await(1, Some("SID-active"));conn.register_pending_inspector_await(1, Some("SID-bg"));@@ -8113,7 +8114,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-duplicate-owner".to_owned());browser_context.set_active_target_id("TID-duplicate-owner".to_owned());browser_context.attach_active_session("SID-duplicate-owner".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let original = conn.try_register_renderer_call_for_session_owner(@@ -8163,7 +8164,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.try_register_renderer_call_for_session_owner(Some("SID-listener-cancel"),@@ -8205,7 +8206,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-command-cancel".to_owned());browser_context.set_active_target_id("TID-command-cancel".to_owned());browser_context.attach_active_session("SID-command-cancel".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.try_register_renderer_call_for_session_owner(Some("SID-command-cancel"),@@ -8235,7 +8236,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-terminal".to_owned());browser_context.set_active_target_id("TID-terminal".to_owned());browser_context.attach_active_session("SID-terminal".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let attachment = RendererAgentAttachmentId::allocate();let prepared = conn@@ -8318,7 +8319,7 @@ mod tests {Some("SID-bg".to_owned()),"about:blank#bg".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.try_register_pending_inspector_await_with_object_group_for_owner(77,diff --git a/moli-protocol/src/conn/target/control.rs b/moli-protocol/src/conn/target/control.rsindex f298b8e13..18a2ac44b 100644--- a/moli-protocol/src/conn/target/control.rs+++ b/moli-protocol/src/conn/target/control.rs@@ -276,25 +276,20 @@ impl TargetControlPlane {&mut self,session_id: String,owner_session_id: Option<&str>,- target_id: Option<&str>,- route: Option<CdpSessionRoute>,+ target_id: &str,+ route: CdpSessionRoute,waiting_for_debugger: bool,) {self.ensure_owner(owner_session_id);- if let Some(target_id) = target_id {- self.sessions- .commit_attached_session(PreparedAttachSession::new(- session_id,- owner_session_id,- target_id,- route,- true,- waiting_for_debugger,- ));- } else {- self.sessions- .register_auto_attached_session(session_id, owner_session_id, None);- }+ self.sessions+ .commit_attached_session(PreparedAttachSession::new(+ session_id,+ owner_session_id,+ target_id,+ route,+ true,+ waiting_for_debugger,+ ));}pub(crate) fn commit_attached_session(@@ -302,7 +297,7 @@ impl TargetControlPlane {session_id: String,owner_session_id: Option<&str>,target_id: &str,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,) -> CommittedAttachSession {@@ -322,7 +317,7 @@ impl TargetControlPlane {session_id: String,owner_session_id: Option<&str>,target_id: &str,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,target_info: DevToolsTargetInfo,@@ -658,7 +653,7 @@ mod tests {"SID-page".to_owned(),Some("SID-tab"),"TID-page",- Some(route.clone()),+ route.clone(),true,true,target_info("TID-page", DevToolsTargetKind::Page),@@ -679,7 +674,7 @@ mod tests {assert_eq!(committed.session_id(), "SID-page");assert_eq!(committed.owner_session_id(), Some("SID-tab"));assert_eq!(committed.target_id(), "TID-page");- assert_eq!(committed.route(), Some(&route));+ assert_eq!(committed.route(), &route);assert!(committed.auto_attached());assert!(committed.waiting_for_debugger());@@ -698,7 +693,7 @@ mod tests {"SID-page".to_owned(),Some("SID-owner"),"TID-page",- Some(route.clone()),+ route,false,false,target_info("TID-page", DevToolsTargetKind::Page),@@ -719,7 +714,6 @@ mod tests {assert_eq!(detached.session_id(), "SID-page");assert_eq!(detached.owner_session_id(), Some("SID-owner"));assert_eq!(detached.target_id(), "TID-page");- assert_eq!(detached.route(), Some(&route));assert!(!detached.auto_attached());assert!(!detached.was_waiting_for_debugger());@@ -739,11 +733,11 @@ mod tests {session_id.to_owned(),None,"TID-page",- Some(CdpSessionRoute::PageTarget {+ CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-page".to_owned(),session_key: moli_page_types::DevToolsSessionKey::Primary,- }),+ },false,false,target_info("TID-page", DevToolsTargetKind::Page),@@ -775,11 +769,11 @@ mod tests {session_id.to_owned(),None,"TID-page",- Some(CdpSessionRoute::PageTarget {+ CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-page".to_owned(),session_key: moli_page_types::DevToolsSessionKey::Primary,- }),+ },false,false,target_info("TID-page", DevToolsTargetKind::Page),@@ -814,11 +808,11 @@ mod tests {"SID-page".to_owned(),Some("SID-tab"),"TID-page",- Some(CdpSessionRoute::PageTarget {+ CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-page".to_owned(),session_key: moli_page_types::DevToolsSessionKey::Attached("SID-page".to_owned()),- }),+ },true,false,target_info("TID-page", DevToolsTargetKind::Page),diff --git a/moli-protocol/src/conn/target/route.rs b/moli-protocol/src/conn/target/route.rsindex ab4979ed0..3c70bc756 100644--- a/moli-protocol/src/conn/target/route.rs+++ b/moli-protocol/src/conn/target/route.rs@@ -80,6 +80,18 @@ impl CdpSessionRoute {}}+ #[cfg(test)]+ pub(crate) fn target_id(&self) -> Option<&str> {+ match self {+ Self::TabTarget { tab_target_id, .. } => Some(tab_target_id),+ Self::PageTarget { target_id, .. }+ | Self::SharedWorkerTarget { target_id, .. }+ | Self::DedicatedWorkerTarget { target_id, .. }+ | Self::ServiceWorkerTarget { target_id, .. } => Some(target_id),+ Self::Browser | Self::BrowserContext { .. } => None,+ }+ }+/// Whether Chromium installs a handler for this CDP domain on the routed/// DevToolsAgentHost.///@@ -173,23 +185,9 @@ impl CdpConnection {pub(crate) fn session_route(&self, session_id: Option<&str>) -> Option<CdpSessionRoute> {let session_id = session_id?;- let committed = self- .target_control+ self.target_control.attached_session_route(session_id)- .cloned();- if committed.is_some() {- return committed;- }- #[cfg(test)]- if self.allow_incomplete_session_fixture_routes {- return self.bound_session_route_for_test(session_id, None);- }- None- }-- #[cfg(test)]- pub(crate) fn require_committed_session_routes_for_test(&mut self) {- self.allow_incomplete_session_fixture_routes = false;+ .cloned()}pub(crate) fn target_session_route_for_target_id(@@ -303,7 +301,7 @@ mod tests {browser_context.set_active_target_id("TID-a");browser_context.attach_active_session("SID-a");assert!(browser_context.insert_page_target_host(PageTargetHost::empty("TID-b".to_owned())));- connection.browser_context = Some(browser_context);+ connection.install_browser_context_fixture_for_test(browser_context);let route = CdpSessionRoute::PageTarget {browser_context_id: "BID-route".to_owned(),@@ -314,7 +312,7 @@ mod tests {"SID-a".to_owned(),None,"TID-a",- Some(route.clone()),+ route.clone(),false,false,);@@ -338,7 +336,6 @@ mod tests {#[test]fn target_binding_is_not_globally_routable_before_session_commit() {let mut connection = CdpConnection::new();- connection.require_committed_session_routes_for_test();let mut browser_context = BrowserContext::new_with_page_for_test("BID-route", "TID-page");browser_context.attach_active_session("SID-prepared");connection.browser_context = Some(browser_context);diff --git a/moli-protocol/src/conn/target/session.rs b/moli-protocol/src/conn/target/session.rsindex 02480a682..4cdff7439 100644--- a/moli-protocol/src/conn/target/session.rs+++ b/moli-protocol/src/conn/target/session.rs@@ -7,7 +7,7 @@ pub(crate) struct PreparedAttachSession {session_id: String,owner_session_id: Option<String>,target_id: String,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,}@@ -17,7 +17,7 @@ impl PreparedAttachSession {session_id: String,owner_session_id: Option<&str>,target_id: &str,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,) -> Self {@@ -37,7 +37,7 @@ pub(crate) struct CommittedAttachSession {session_id: String,owner_session_id: Option<String>,target_id: String,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,}@@ -47,7 +47,6 @@ pub(crate) struct DetachedTargetSession {session_id: String,owner_session_id: Option<String>,target_id: String,- route: Option<CdpSessionRoute>,auto_attached: bool,waiting_for_debugger: bool,}@@ -58,7 +57,6 @@ impl DetachedTargetSession {session_id: session_id.to_owned(),owner_session_id: None,target_id: target_id.to_owned(),- route: None,auto_attached: false,waiting_for_debugger: false,}@@ -77,11 +75,6 @@ impl DetachedTargetSession {&self.target_id}- #[cfg(test)]- pub(crate) fn route(&self) -> Option<&CdpSessionRoute> {- self.route.as_ref()- }-#[cfg(test)]pub(crate) fn auto_attached(&self) -> bool {self.auto_attached@@ -106,8 +99,8 @@ impl CommittedAttachSession {&self.target_id}- pub(crate) fn route(&self) -> Option<&CdpSessionRoute> {- self.route.as_ref()+ pub(crate) fn route(&self) -> &CdpSessionRoute {+ &self.route}pub(crate) fn auto_attached(&self) -> bool {@@ -160,7 +153,7 @@ struct AutoAttachedTargetSession {struct AttachedTargetSession {owner_session_id: Option<String>,target_id: String,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,auto_attached: bool,waiting_for_debugger: bool,}@@ -239,7 +232,7 @@ impl TargetSessionRegistry {session_id.clone(),owner_session_id.as_deref(),target_id,- None,+ test_route_for_target(&session_id, target_id),true,false,));@@ -289,7 +282,6 @@ impl TargetSessionRegistry {session_id: session_id.to_owned(),owner_session_id: session.owner_session_id,target_id: session.target_id,- route: session.route,auto_attached: session.auto_attached,waiting_for_debugger: session.waiting_for_debugger,})@@ -346,13 +338,15 @@ impl TargetSessionRegistry {}pub(crate) fn attached_session_route(&self, session_id: &str) -> Option<&CdpSessionRoute> {- self.attached_sessions.get(session_id)?.route.as_ref()+ self.attached_sessions+ .get(session_id)+ .map(|session| &session.route)}pub(crate) fn browser_session_count(&self) -> usize {self.attached_sessions.values()- .filter(|session| session.route == Some(CdpSessionRoute::Browser))+ .filter(|session| session.route == CdpSessionRoute::Browser).count()}@@ -415,7 +409,7 @@ impl TargetSessionRegistry {let is_root_browser_session = self.attached_sessions.get(&session_id)- .is_some_and(|session| session.route == Some(CdpSessionRoute::Browser));+ .is_some_and(|session| session.route == CdpSessionRoute::Browser);if is_root_browser_session || !visited.insert(session_id.clone()) {continue;}@@ -556,9 +550,21 @@ fn sorted_index_values(values: Option<&HashSet<String>>) -> Vec<String> {values}+#[cfg(test)]+fn test_route_for_target(session_id: &str, target_id: &str) -> CdpSessionRoute {+ CdpSessionRoute::PageTarget {+ browser_context_id: "BID-test".to_owned(),+ target_id: target_id.to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Attached(session_id.to_owned()),+ }+}+#[cfg(test)]mod tests {- use super::{PreparedAttachSession, PreparedAutoAttachSession, TargetSessionRegistry};+ use super::{+ PreparedAttachSession, PreparedAutoAttachSession, TargetSessionRegistry,+ test_route_for_target,+ };use crate::conn::CdpSessionRoute;#[test]@@ -650,7 +656,7 @@ mod tests {session_id.to_owned(),owner_session_id,target_id,- Some(CdpSessionRoute::PageTarget {+ CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: target_id.to_owned(),session_key: if auto_attached {@@ -658,7 +664,7 @@ mod tests {} else {moli_page_types::DevToolsSessionKey::Primary},- }),+ },auto_attached,false,));@@ -721,7 +727,7 @@ mod tests {"SID-tab".to_owned(),Some("SID-browser"),"TAB-TID-page",- Some(route.clone()),+ route.clone(),false,false,));@@ -729,7 +735,7 @@ mod tests {assert_eq!(committed.session_id, "SID-tab");assert_eq!(committed.owner_session_id.as_deref(), Some("SID-browser"));assert_eq!(committed.target_id, "TAB-TID-page");- assert_eq!(committed.route.as_ref(), Some(&route));+ assert_eq!(committed.route, route);assert!(!committed.auto_attached);assert!(!committed.waiting_for_debugger);assert_eq!(@@ -751,11 +757,11 @@ mod tests {"SID-page".to_owned(),Some("SID-tab"),"TID-page",- Some(CdpSessionRoute::PageTarget {+ CdpSessionRoute::PageTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-page".to_owned(),session_key: moli_page_types::DevToolsSessionKey::Primary,- }),+ },true,true,));@@ -781,7 +787,7 @@ mod tests {"SID-waiting".to_owned(),Some("SID-owner"),"TID-waiting",- None,+ test_route_for_target("SID-waiting", "TID-waiting"),true,true,));@@ -789,7 +795,7 @@ mod tests {"SID-running".to_owned(),Some("SID-owner"),"TID-running",- None,+ test_route_for_target("SID-running", "TID-running"),true,false,));@@ -807,7 +813,7 @@ mod tests {session_id.to_owned(),Some("SID-owner"),"TID-page",- None,+ test_route_for_target(session_id, "TID-page"),true,true,));diff --git a/moli-protocol/src/conn/target/session_binding.rs b/moli-protocol/src/conn/target/session_binding.rsindex 28954c817..8f4339dd6 100644--- a/moli-protocol/src/conn/target/session_binding.rs+++ b/moli-protocol/src/conn/target/session_binding.rs@@ -1,3 +1,5 @@+#[cfg(test)]+use crate::conn::BrowserContext;use crate::conn::CdpConnection;use crate::devtools_runtime::DevToolsTargetInfo;@@ -8,6 +10,116 @@ use super::{};impl CdpConnection {+ /// Commits target-side session declarations built by low-level test+ /// fixtures into the same control-plane registry used by production+ /// attachment transactions.+ ///+ /// Older tests construct `BrowserContext` and worker targets directly,+ /// before either object is owned by a `CdpConnection`. The test harness+ /// calls this once at its fixture boundary. Runtime route lookup remains+ /// strict: it never searches target state when the committed registry has+ /// no entry.+ #[cfg(test)]+ pub(crate) fn commit_declared_session_fixtures_for_test(&mut self) {+ let mut declared = Vec::new();+ for browser_context in self.browser_contexts() {+ let browser_context_id = browser_context.id.clone();+ for target in browser_context.page_targets.iter() {+ let target_id = target.target_id().to_owned();+ if let Some(session_id) = target.devtools_sessions.primary_session_id() {+ declared.push((+ session_id.to_owned(),+ target_id.clone(),+ CdpSessionRoute::PageTarget {+ browser_context_id: browser_context_id.clone(),+ target_id: target_id.clone(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ ));+ }+ for session_id in target.devtools_sessions.attached_session_ids() {+ declared.push((+ session_id.to_owned(),+ target_id.clone(),+ CdpSessionRoute::PageTarget {+ browser_context_id: browser_context_id.clone(),+ target_id: target_id.clone(),+ session_key: moli_page_types::DevToolsSessionKey::Attached(+ session_id.to_owned(),+ ),+ },+ ));+ }+ }+ for target in browser_context.shared_worker_targets.values() {+ for session_id in target.session_ids() {+ declared.push((+ session_id,+ target.target_id.clone(),+ CdpSessionRoute::SharedWorkerTarget {+ browser_context_id: browser_context_id.clone(),+ target_id: target.target_id.clone(),+ },+ ));+ }+ }+ for target in browser_context.dedicated_worker_targets.values() {+ for session_id in target.inner.session_ids() {+ declared.push((+ session_id,+ target.inner.target_id.clone(),+ CdpSessionRoute::DedicatedWorkerTarget {+ browser_context_id: browser_context_id.clone(),+ target_id: target.inner.target_id.clone(),+ },+ ));+ }+ }+ for target in browser_context.service_worker_targets.values() {+ for session_id in target.session_ids() {+ declared.push((+ session_id,+ target.target_id.clone(),+ CdpSessionRoute::ServiceWorkerTarget {+ browser_context_id: browser_context_id.clone(),+ target_id: target.target_id.clone(),+ },+ ));+ }+ }+ }++ for (session_id, target_id, route) in declared {+ if self+ .target_control+ .attached_session_route(&session_id)+ .is_some()+ {+ continue;+ }+ self.target_control+ .commit_attached_session(session_id, None, &target_id, route, false, false);+ }+ }++ #[cfg(test)]+ pub(crate) fn install_browser_context_fixture_for_test(+ &mut self,+ browser_context: BrowserContext,+ ) {+ self.browser_context = Some(browser_context);+ self.commit_declared_session_fixtures_for_test();+ }++ #[cfg(test)]+ pub(crate) fn push_inactive_browser_context_fixture_for_test(+ &mut self,+ browser_context: BrowserContext,+ ) {+ self.inactive_browser_contexts.push(browser_context);+ self.commit_declared_session_fixtures_for_test();+ }+pub(crate) async fn clear_devtools_network_session_policy_async(&mut self,session_id: &str,@@ -80,7 +192,7 @@ impl CdpConnection {session_id,None,"browser",- Some(CdpSessionRoute::Browser),+ CdpSessionRoute::Browser,false,false,);@@ -156,143 +268,53 @@ impl CdpConnection {}#[cfg(test)]- pub(crate) fn register_auto_attached_session(+ pub(crate) fn register_auto_attached_session_route_for_test(&mut self,session_id: String,owner_session_id: Option<&str>,+ route: CdpSessionRoute,) {- let route = self.bound_session_route_for_test(&session_id, None);- let target_id = route.as_ref().and_then(|route| match route {- CdpSessionRoute::TabTarget { tab_target_id, .. } => Some(tab_target_id.clone()),- CdpSessionRoute::PageTarget { target_id, .. }- | CdpSessionRoute::SharedWorkerTarget { target_id, .. }- | CdpSessionRoute::DedicatedWorkerTarget { target_id, .. }- | CdpSessionRoute::ServiceWorkerTarget { target_id, .. } => Some(target_id.clone()),- CdpSessionRoute::Browser | CdpSessionRoute::BrowserContext { .. } => None,+ let target_id = route.target_id().unwrap_or_else(|| {+ panic!("test auto-attached session route must identify a target: {route:?}")});self.target_control.commit_auto_attached_session_for_target(session_id,owner_session_id,- target_id.as_deref(),- route,+ target_id,+ route.clone(),false,);}#[cfg(test)]- pub(crate) fn register_auto_attached_session_for_target(+ pub(crate) fn mark_session_auto_attached_for_test(&mut self,session_id: String,owner_session_id: Option<&str>,- target_id: Option<&str>,) {- let route = self.bound_session_route_for_test(&session_id, target_id);- self.target_control.commit_auto_attached_session_for_target(- session_id,- owner_session_id,- target_id,- route,- false,- );+ let route = self+ .session_route(Some(&session_id))+ .unwrap_or_else(|| panic!("test session {session_id} must have a committed route"));+ self.register_auto_attached_session_route_for_test(session_id, owner_session_id, route);}#[cfg(test)]- pub(crate) fn register_bound_session_for_test(&mut self, session_id: &str) {- let route = self- .bound_session_route_for_test(session_id, None)- .unwrap_or_else(|| panic!("test session {session_id} must own a concrete route"));- let target_id = match &route {- CdpSessionRoute::TabTarget { tab_target_id, .. } => tab_target_id.as_str(),- CdpSessionRoute::PageTarget { target_id, .. }- | CdpSessionRoute::SharedWorkerTarget { target_id, .. }- | CdpSessionRoute::DedicatedWorkerTarget { target_id, .. }- | CdpSessionRoute::ServiceWorkerTarget { target_id, .. } => target_id.as_str(),- CdpSessionRoute::Browser => "browser",- CdpSessionRoute::BrowserContext { browser_context_id } => browser_context_id.as_str(),- };+ pub(crate) fn register_session_route_for_test(+ &mut self,+ session_id: &str,+ route: CdpSessionRoute,+ ) {+ let target_id = route.target_id().unwrap_or("browser").to_owned();self.target_control.commit_attached_session(session_id.to_owned(),None,- target_id,- Some(route.clone()),+ &target_id,+ route,false,false,);}- #[cfg(test)]- pub(crate) fn bound_session_route_for_test(- &self,- session_id: &str,- wanted_target_id: Option<&str>,- ) -> Option<CdpSessionRoute> {- if let Some(tab_target_id) = self.tab_target_id_for_session_id(session_id)- && wanted_target_id.is_none_or(|target_id| target_id == tab_target_id)- {- return Some(CdpSessionRoute::TabTarget {- browser_context_id: self.browser_context_id_for_tab_target_id(tab_target_id)?,- tab_target_id: tab_target_id.to_owned(),- });- }- self.browser_contexts().find_map(|browser_context| {- if let Some((target, session_key)) =- browser_context.page_targets.iter().find_map(|target| {- (wanted_target_id.is_none_or(|target_id| target_id == target.target_id()))- .then(|| {- target- .devtools_sessions- .key_for_wire_session_id(session_id)- .map(|session_key| (target, session_key))- })- .flatten()- })- {- return Some(CdpSessionRoute::PageTarget {- browser_context_id: browser_context.id.clone(),- target_id: target.target_id().to_owned(),- session_key,- });- }- browser_context- .shared_worker_targets- .values()- .find(|target| {- target.is_session(session_id)- && wanted_target_id.is_none_or(|wanted| wanted == target.target_id)- })- .map(|target| CdpSessionRoute::SharedWorkerTarget {- browser_context_id: browser_context.id.clone(),- target_id: target.target_id.clone(),- })- .or_else(|| {- browser_context- .dedicated_worker_targets- .values()- .find(|target| {- target.is_session(session_id)- && wanted_target_id.is_none_or(|wanted| wanted == target.target_id)- })- .map(|target| CdpSessionRoute::DedicatedWorkerTarget {- browser_context_id: browser_context.id.clone(),- target_id: target.target_id.clone(),- })- })- .or_else(|| {- browser_context- .service_worker_targets- .values()- .find(|target| {- target.is_session(session_id)- && wanted_target_id.is_none_or(|wanted| wanted == target.target_id)- })- .map(|target| CdpSessionRoute::ServiceWorkerTarget {- browser_context_id: browser_context.id.clone(),- target_id: target.target_id.clone(),- })- })- })- }-pub(crate) fn commit_prepared_attach_event_plan(&mut self,prepared: PreparedTargetAttach,@@ -328,7 +350,7 @@ impl CdpConnection {session_id,owner_session_id.as_deref(),&target_id,- Some(route),+ route,auto_attached,waiting_for_debugger,target_info.clone(),@@ -657,7 +679,7 @@ impl CdpConnection {session_id,owner_session_id,target_id,- Some(CdpSessionRoute::Browser),+ CdpSessionRoute::Browser,false,false,target_info,@@ -882,10 +904,10 @@ impl CdpConnection {&self,session_id: &str,) -> TargetAutoAttachedSessionDetachPlan {- TargetAutoAttachedSessionDetachPlan::from_session_route(- session_id,- self.session_route(Some(session_id)),- )+ let route = self.session_route(Some(session_id)).unwrap_or_else(|| {+ panic!("committed auto-attached session {session_id} must retain its route")+ });+ TargetAutoAttachedSessionDetachPlan::from_session_route(session_id, route)}pub(crate) fn rollback_auto_attached_session_detach_plan_without_event(diff --git a/moli-protocol/src/conn/target/transaction.rs b/moli-protocol/src/conn/target/transaction.rsindex d4e4352db..8af7348cf 100644--- a/moli-protocol/src/conn/target/transaction.rs+++ b/moli-protocol/src/conn/target/transaction.rs@@ -450,17 +450,8 @@ pub(crate) struct TargetAttachRollbackPlan {impl TargetAttachRollbackPlan {pub(crate) fn from_prepared_attach_session(prepared: &TargetAttachSessionCommit) -> Self {- Self::from_session_route(prepared.session_id(), Some(prepared.route().clone()))- }-- pub(crate) fn from_session_route(- session_id: impl Into<String>,- route: Option<CdpSessionRoute>,- ) -> Self {- let session_id = session_id.into();- let cleanup_plan = route- .as_ref()- .and_then(|route| SessionDisposalPlan::for_session_route(&session_id, route));+ let session_id = prepared.session_id().to_owned();+ let cleanup_plan = SessionDisposalPlan::for_session_route(&session_id, prepared.route());Self {session_id,cleanup_plan,@@ -485,12 +476,9 @@ pub(crate) enum TargetAutoAttachedSessionDetachPlan {impl TargetAutoAttachedSessionDetachPlan {pub(crate) fn from_session_route(session_id: impl Into<String>,- route: Option<CdpSessionRoute>,+ route: CdpSessionRoute,) -> Self {let session_id = session_id.into();- let Some(route) = route else {- return Self::Rollback { session_id };- };if matches!(route, CdpSessionRoute::Browser) {return Self::Rollback { session_id };}@@ -826,10 +814,10 @@ mod tests {fn target_auto_attached_session_detach_plan_preserves_route_cleanup_boundary() {let plan = TargetAutoAttachedSessionDetachPlan::from_session_route("SID-worker",- Some(CdpSessionRoute::SharedWorkerTarget {+ CdpSessionRoute::SharedWorkerTarget {browser_context_id: "BID-1".to_owned(),target_id: "TID-worker".to_owned(),- }),+ },);assert_eq!(plan.session_id(), "SID-worker");@@ -848,13 +836,13 @@ mod tests {}#[test]- fn target_auto_attached_session_detach_plan_rolls_back_missing_or_browser_route() {- for route in [None, Some(CdpSessionRoute::Browser)] {- let plan =- TargetAutoAttachedSessionDetachPlan::from_session_route("SID-browser", route);- assert_eq!(plan.session_id(), "SID-browser");- assert!(plan.cleanup_plan().is_none());- }+ fn target_auto_attached_session_detach_plan_rolls_back_browser_route() {+ let plan = TargetAutoAttachedSessionDetachPlan::from_session_route(+ "SID-browser",+ CdpSessionRoute::Browser,+ );+ assert_eq!(plan.session_id(), "SID-browser");+ assert!(plan.cleanup_plan().is_none());}#[test]diff --git a/moli-protocol/src/conn/tests/cookie_surfaces/boundary.rs b/moli-protocol/src/conn/tests/cookie_surfaces/boundary.rsindex fb7c04296..71dbfd7d5 100644--- a/moli-protocol/src/conn/tests/cookie_surfaces/boundary.rs+++ b/moli-protocol/src/conn/tests/cookie_surfaces/boundary.rs@@ -5,7 +5,7 @@ fn browser_context_document_cookie_facade_snapshot_preview_does_not_bump_cookie_let mut conn = CdpConnection::new();let mut bc = BrowserContext::new_with_page_for_test("BID-cookie-facade", "TID-cookie-facade");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -56,7 +56,7 @@ fn browser_context_cookie_boundary_snapshot_aligns_facade_and_storage_generationlet mut bc =BrowserContext::new_with_page_for_test("BID-cookie-boundary", "TID-cookie-boundary");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -100,7 +100,7 @@ fn connection_cookie_boundary_snapshot_for_sites_keeps_facade_but_filters_storaglet mut bc =BrowserContext::new_with_page_for_test("BID-cookie-boundary", "TID-cookie-boundary");bc.set_target_url("https://sub.example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -170,7 +170,7 @@ fn browser_context_preview_cookie_boundary_operation_projects_hypothetical_storalet mut bc =BrowserContext::new_with_page_for_test("BID-cookie-boundary", "TID-cookie-boundary");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -280,7 +280,7 @@ fn connection_apply_cookie_boundary_operation_reports_replaced_and_resulting_boulet mut bc =BrowserContext::new_with_page_for_test("BID-cookie-boundary", "TID-cookie-boundary");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -325,7 +325,7 @@ fn browser_context_site_data_manager_surface_wraps_cookie_boundary_with_reservedlet mut bc =BrowserContext::new_with_page_for_test("BID-site-data-manager", "TID-site-data-manager");bc.set_target_url("https://sub.example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,@@ -399,7 +399,7 @@ fn browser_context_site_data_manager_operation_wraps_cookie_boundary_preview_andlet mut bc =BrowserContext::new_with_page_for_test("BID-site-data-manager", "TID-site-data-manager");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);crate::domains::storage::set_cookies_for_browser_context(&mut conn,diff --git a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/facade/freshness.rs b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/facade/freshness.rsindex 8138c5f57..c4f7c86c2 100644--- a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/facade/freshness.rs+++ b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/facade/freshness.rs@@ -4,7 +4,7 @@ fn browser_context_document_cookie_facade_snapshot_tracks_shared_cookie_store_gelet mut conn = CdpConnection::new();let mut bc = BrowserContext::new_with_page_for_test("BID-cookie-facade", "TID-cookie-facade");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let before = conn.browser_context@@ -64,7 +64,7 @@ async fn browser_context_document_cookie_facade_snapshot_projects_cookie_get_frelet mut conn = CdpConnection::new();let mut bc = BrowserContext::new_with_page_for_test("BID-cookie-facade", "TID-cookie-facade");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let navigation = conn.build_loaded_navigation_from_buffered_response_async(diff --git a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rsindex 19561f03a..19d83a9ae 100644--- a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs+++ b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs@@ -126,7 +126,7 @@ async fn browser_context_document_cookie_facade_snapshot_projects_probe_telemetrlet mut conn = CdpConnection::new();let mut bc = BrowserContext::new_with_page_for_test("BID-cookie-facade", "TID-cookie-facade");bc.set_target_url("https://example.com/app".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let navigation = conn.build_loaded_navigation_from_buffered_response_async(diff --git a/moli-protocol/src/conn/tests/message.rs b/moli-protocol/src/conn/tests/message.rsindex c2a44b068..57bef0f7c 100644--- a/moli-protocol/src/conn/tests/message.rs+++ b/moli-protocol/src/conn/tests/message.rs@@ -55,7 +55,7 @@ async fn session_scoped_unknown_domain_error_keeps_session_id() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let unknown_domain = conn.process_message_messages_only_for_test(@@ -78,7 +78,7 @@ async fn session_scoped_unknown_method_error_keeps_session_id() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let unknown_method = conn.process_message_messages_only_for_test(@@ -101,9 +101,13 @@ async fn browser_and_tab_sessions_do_not_fall_through_to_the_active_page() {conn.install_default_browser_target();conn.register_browser_session("SID-browser".to_owned());let default_tab_target_id = conn.default_tab_target_id().to_owned();- assert!(- conn.assign_session_to_tab_target(&default_tab_target_id, "SID-tab".to_owned(), false,)- );+ conn.attach_tab_target_session_event_plan(+ "SID-tab".to_owned(),+ None,+ &default_tab_target_id,+ false,+ )+ .expect("default tab target should accept a committed session");for session_id in ["SID-browser", "SID-tab"] {let response = conn@@ -131,7 +135,7 @@ async fn session_scoped_handler_error_keeps_session_id_even_when_domain_uses_plalet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let invalid_dialog = conn.process_message_messages_only_for_test(@@ -154,7 +158,7 @@ async fn puppeteer_bootstrap_domains_are_session_scoped_noops() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let audits = conn.process_message_messages_only_for_test(diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rsindex 1e621343d..494ebca8e 100644--- a/moli-protocol/src/conn/tests/mod.rs+++ b/moli-protocol/src/conn/tests/mod.rs@@ -424,12 +424,12 @@ fn background_navigation_completion_sender_routes_explicit_session_owners() {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active");active.attach_active_session("SID-active");- conn.browser_context = Some(active);+ conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive");inactive.attach_active_session("SID-inactive");- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let (sender, _receiver) = tokio::sync::mpsc::unbounded_channel();conn.set_background_navigation_completion_sender(sender);@@ -459,13 +459,13 @@ fn navigation_gate_resolves_websocket_events_to_their_session_target() {let navigation_a = target_a.start_document_navigation_for_active_target("LOADER-A".to_owned()).expect("target A should accept a navigation request");- conn.browser_context = Some(target_a);+ conn.install_browser_context_fixture_for_test(target_a);assert!(conn.arm_background_navigation_completion(&navigation_a, None));let mut target_b = BrowserContext::new("BID-B".to_owned());target_b.set_active_target_id("TID-B");target_b.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(target_b);+ conn.push_inactive_browser_context_fixture_for_test(target_b);let target_b_websocket = BackgroundProtocolEvent::immediate(json!({"method": "Network.webSocketClosed",@@ -497,7 +497,7 @@ fn navigation_background_event_queue_drains_current_token() {let token = browser_context.start_document_navigation_for_active_target("LOADER-1".to_owned()).expect("active target should produce navigation token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let message = build_event("Page.frameStartedLoading",json!({ "frameId": "TID-nav" }),@@ -829,7 +829,8 @@ async fn moli_diagnostics_preserves_runtime_observable_diagnostics() {.active_page_target_mut().runtime_slot.replace_loaded_page(Some(page));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 44_100,@@ -1398,7 +1399,7 @@ fn navigation_background_event_queue_drops_stale_token() {let current = browser_context.start_document_navigation_for_active_target("LOADER-2".to_owned()).expect("active target should produce current token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let stale_message = build_event("Page.frameStartedLoading",json!({ "frameId": "TID-nav", "loaderId": "LOADER-1" }),@@ -1436,7 +1437,7 @@ fn navigation_background_event_queue_preserves_order_for_current_token() {let current = browser_context.start_document_navigation_for_active_target("LOADER-2".to_owned()).expect("active target should produce current navigation token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let stale_message = build_event("Page.frameStartedLoading",@@ -1483,7 +1484,7 @@ fn navigation_background_event_sender_preserves_typed_sidecar_for_current_token(let current = browser_context.start_document_navigation_for_active_target("LOADER-typed".to_owned()).expect("active target should produce current navigation token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let message = build_event("Page.frameStartedNavigating",json!({@@ -1533,7 +1534,7 @@ async fn materialized_navigation_completion_drops_stale_token() {let _current = browser_context.start_document_navigation_for_active_target("LOADER-2".to_owned()).expect("active target should produce current token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let state =materialized_navigation_test_state(Some(7), "LOADER-1", "https://example.test/stale");let navigation =@@ -1585,7 +1586,7 @@ async fn materialized_navigation_completion_drops_stale_token_without_navigate_ilet _ = browser_context.start_document_navigation_for_active_target("LOADER-2".to_owned()).expect("active target should produce current navigation token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let state =materialized_navigation_test_state(None, "LOADER-1", "https://example.test/stale-no-id");let navigation =@@ -1619,7 +1620,7 @@ async fn materialized_navigation_completion_drains_current_token() {let current = browser_context.start_document_navigation_for_active_target("LOADER-1".to_owned()).expect("active target should produce current token");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let state =materialized_navigation_test_state(Some(8), "LOADER-1", "https://example.test/current");let navigation =diff --git a/moli-protocol/src/conn/tests/resource_runtime.rs b/moli-protocol/src/conn/tests/resource_runtime.rsindex 01de1371d..445650b65 100644--- a/moli-protocol/src/conn/tests/resource_runtime.rs+++ b/moli-protocol/src/conn/tests/resource_runtime.rs@@ -94,7 +94,7 @@ async fn buffered_navigation_for_inactive_session_carries_its_target_engine() {target_context.start_document_navigation_for_active_target("LOADER-target".to_owned()).expect("target should accept its synthetic navigation");- conn.inactive_browser_contexts.push(target_context);+ conn.push_inactive_browser_context_fixture_for_test(target_context);let requested_url = Url::parse("https://target.example/fulfilled").unwrap();let navigation = NavigationDispatchState {@@ -157,7 +157,7 @@ fn current_navigation_initiator_url_uses_loaded_browser_context_url_when_availablet mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.set_target_url("about:blank".into());- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(conn.current_navigation_initiator_url().is_none());conn.browser_context@@ -512,7 +512,7 @@ fn page_request_client_for_navigation_inputs_inherits_service_worker_bypass() {network.network_enabled = true;network.bypass_service_worker = true;}- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let inputs = conn.navigation_load_inputs_for_session_owner(Some("SID-1"));let request_client = conn@@ -530,8 +530,8 @@ fn connection_snapshot_cookies_collects_active_and_inactive_contexts() {active.upsert_cookie_for_test(stored_cookie("active", "1"));let inactive = BrowserContext::new("BID-inactive".to_owned());inactive.upsert_cookie_for_test(stored_cookie("inactive", "1"));- conn.browser_context = Some(active);- conn.inactive_browser_contexts.push(inactive);+ conn.install_browser_context_fixture_for_test(active);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let mut names = conn.snapshot_cookies()@@ -550,8 +550,8 @@ fn connection_profile_backed_cookie_snapshot_ignores_ephemeral_contexts() {profile_backed.upsert_cookie_for_test(stored_cookie("profile", "1"));let ephemeral = conn.new_ephemeral_browser_context("BID-ephemeral".to_owned());ephemeral.upsert_cookie_for_test(stored_cookie("ephemeral", "1"));- conn.browser_context = Some(ephemeral);- conn.inactive_browser_contexts.push(profile_backed);+ conn.install_browser_context_fixture_for_test(ephemeral);+ conn.push_inactive_browser_context_fixture_for_test(profile_backed);let cookies = conn.snapshot_profile_backed_cookies()@@ -566,7 +566,7 @@ fn connection_profile_backed_cookie_snapshot_is_none_without_profile_backed_contlet mut conn = CdpConnection::new_with_initial_cookies(vec![stored_cookie("sid", "seeded")]);let ephemeral = conn.new_ephemeral_browser_context("BID-ephemeral".to_owned());assert!(ephemeral.snapshot_cookies().is_empty());- conn.browser_context = Some(ephemeral);+ conn.install_browser_context_fixture_for_test(ephemeral);assert!(conn.snapshot_profile_backed_cookies().is_none());}@@ -587,7 +587,7 @@ async fn build_loaded_navigation_from_buffered_response_updates_request_cookie_alet before = bc.test_last_cookie_access_index("example.com", "/app", "sid").expect("cookie should exist before synthetic navigation");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let navigation = conn.build_loaded_navigation_from_buffered_response_async(@@ -637,7 +637,7 @@ async fn rebuild_buffered_response_preserving_request_report_avoids_second_acces"sid=1; Path=/app; Secure".to_owned(),)],);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let navigation = conn.build_loaded_navigation_from_buffered_response_async(@@ -878,8 +878,8 @@ async fn browser_context_storage_buckets_reuse_within_context_and_isolate_betweelet mut conn = CdpConnection::new();let context_a = conn.new_ephemeral_browser_context("BID-1".into());let context_b = conn.new_ephemeral_browser_context("BID-2".into());- conn.browser_context = Some(context_a);- conn.inactive_browser_contexts.push(context_b);+ conn.install_browser_context_fixture_for_test(context_a);+ conn.push_inactive_browser_context_fixture_for_test(context_b);let first_url = Url::parse("https://context-storage-buckets.example/app/one").unwrap();let second_url = Url::parse("https://context-storage-buckets.example/app/two").unwrap();@@ -1108,14 +1108,14 @@ async fn loader_uses_active_browser_context_user_agent_override() {.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-A".into());- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");second.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-B".into());- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);assert_eq!(conn.ensure_resource_request_client()@@ -1138,11 +1138,11 @@ async fn loader_uses_active_browser_context_http_proxy_override() {let mut conn = CdpConnection::new();let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");first.active_page_target_mut().http_proxy_override = Some("http://proxy-a.test:8080".into());- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");second.active_page_target_mut().http_proxy_override = Some("http://proxy-b.test:8080".into());- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);assert_eq!(conn.ensure_resource_request_client()@@ -1165,11 +1165,11 @@ async fn loader_uses_active_browser_context_http_no_proxy_override() {let mut conn = CdpConnection::new();let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");first.active_page_target_mut().http_no_proxy_override = Some("localhost,127.0.0.1".into());- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");second.active_page_target_mut().http_no_proxy_override = Some("::1,.example.com".into());- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);assert_eq!(conn.ensure_resource_request_client()@@ -1192,11 +1192,11 @@ async fn loader_uses_active_browser_context_tls_verify_host_override() {let mut conn = CdpConnection::new();let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");first.active_page_target_mut().tls_verify_host_override = Some(false);- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");second.active_page_target_mut().tls_verify_host_override = Some(true);- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);assert!(!conn@@ -1222,21 +1222,21 @@ async fn removing_an_inactive_browser_context_keeps_the_previously_active_contex.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-A".into());- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");second.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-B".into());- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);let mut third = BrowserContext::new_with_page_for_test("BID-C", "TID-C");third.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-C".into());- conn.inactive_browser_contexts.push(third);+ conn.push_inactive_browser_context_fixture_for_test(third);assert!(conn.activate_browser_context_by_id_async("BID-B").await);assert_eq!(conn.browser_context.as_ref().unwrap().id, "BID-B");@@ -1275,14 +1275,14 @@ async fn manual_browser_context_restore_reselects_original_context_after_switch(.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-A".into());- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");second.active_page_target_mut().network_policy.set_user_agent_override("Moli/Context-B".into());- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);let previously_active_browser_context_id =conn.browser_context.as_ref().map(|bc| bc.id.clone());@@ -1321,11 +1321,11 @@ async fn session_scoped_process_message_restores_previously_active_context_afterlet mut conn = CdpConnection::new();let first = BrowserContext::new_with_page_for_test("BID-A", "TID-A");- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");second.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);let response = conn.process_message_messages_only_for_test(@@ -1360,11 +1360,11 @@ async fn session_scoped_process_message_async_restores_previously_active_contextlet mut conn = CdpConnection::new();let first = BrowserContext::new_with_page_for_test("BID-A", "TID-A");- conn.browser_context = Some(first);+ conn.install_browser_context_fixture_for_test(first);let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");second.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(second);+ conn.push_inactive_browser_context_fixture_for_test(second);let response = conn.process_message_messages_only_for_test(@@ -1401,7 +1401,7 @@ async fn direct_network_enable_routes_to_inactive_active_owner_without_activatinlet mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -1440,7 +1440,8 @@ async fn direct_runtime_evaluate_routes_to_inactive_active_owner_without_activat[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><title>runtime-direct-owner</title>",Some("SID-B"),@@ -1491,7 +1492,8 @@ async fn direct_runtime_evaluate_document_replacement_lifecycle_uses_inactive_ow[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><body>before</body>",Some("SID-document-replacement"),@@ -1560,7 +1562,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss().active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(901);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_id = moli_core::PageId::new_for_testing(901);let frame = moli_core::page::RendererFrameToken { page_id };@@ -1679,6 +1681,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss());conn.browser_context = None;+ conn.rollback_attached_session_without_event("SID-lifecycle-wait");assert_eq!(conn.devtools_document_lifecycle_wait_state(&context, &key),DevToolsDocumentLifecycleWaitState::Unavailable@@ -1691,7 +1694,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss().active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(902);- conn.browser_context = Some(replacement_context);+ conn.install_browser_context_fixture_for_test(replacement_context);let (_, accepted) = conn.bind_renderer_document_lifecycle_for_owner(&crate::conn::CommandOwnerScope::for_session("SID-lifecycle-wait"),moli_core::page::RendererPageCreationArtifacts {@@ -1751,7 +1754,7 @@ fn devtools_target_context_resolves_background_page_without_ambient_route() {background.runtime_slot.start_document_navigation("TID-background".to_owned(), "LID-background".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let context = crate::devtools_runtime::DevToolsCommandContext {protocol: crate::devtools_runtime::DevToolsProtocol::WebDriverBidi,@@ -1784,7 +1787,8 @@ async fn direct_runtime_evaluate_same_document_navigation_updates_inactive_owner.runtime_session_state.runtime_frontend_enabled = true;inactive.set_target_url(initial_url.clone());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(&initial_url, Some("SID-same-document")).await;@@ -1862,7 +1866,8 @@ async fn direct_runtime_evaluate_javascript_dialog_uses_inactive_background_owne.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-dialog-background")).await;@@ -1968,7 +1973,8 @@ async fn direct_runtime_evaluate_popup_creates_target_in_inactive_background_own.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-popup-background")).await;@@ -2041,7 +2047,7 @@ async fn direct_runtime_evaluate_self_popup_does_not_navigate_active_target_for_active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active");active.set_target_url("https://active.example/current".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let page_url = "data:text/html,<!doctype html><title>self-popup</title>";let background = PageTargetHost::with_url(@@ -2058,7 +2064,8 @@ async fn direct_runtime_evaluate_self_popup_does_not_navigate_active_target_for_.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-self-popup-background")).await;@@ -2118,7 +2125,8 @@ async fn direct_runtime_evaluate_file_chooser_uses_inactive_background_owner() {.page_session_state.page_file_chooser_opened_event_enabled = true;}- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-file-background")).await;@@ -2183,7 +2191,8 @@ async fn direct_runtime_evaluate_routes_to_inactive_attached_owner_without_activ[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><title>runtime-direct-aux</title>",Some("SID-attached"),@@ -2224,7 +2233,7 @@ async fn direct_network_enable_disable_routes_to_inactive_attached_owner_withoutinactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-primary");assert!(inactive.assign_attached_session_to_target("TID-B", "SID-attached".to_owned()));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2291,7 +2300,7 @@ async fn direct_page_preload_routes_to_inactive_active_owner_without_activating_let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2349,7 +2358,7 @@ async fn direct_page_preload_routes_to_inactive_background_owner_without_activatTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2405,7 +2414,7 @@ async fn direct_network_enable_routes_to_inactive_background_owner_without_activTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2452,7 +2461,7 @@ async fn direct_attached_network_enable_for_background_target_does_not_enable_pr"SID-attached-background".to_owned()));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2490,7 +2499,7 @@ async fn direct_network_enable_routes_to_active_background_owner_without_activatTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.browser_context = Some(active);+ conn.install_browser_context_fixture_for_test(active);let response = conn.process_message_messages_only_for_test(@@ -2590,7 +2599,8 @@ async fn direct_network_enable_for_loaded_background_owner_starts_at_network_tailet mut inactive = BrowserContext::new("BID-B".into());inactive.insert_page_target_host(background);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-background")).await;assert!(@@ -2662,7 +2672,7 @@ async fn direct_background_command_does_not_emit_active_observable_output_under_TargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.browser_context = Some(active);+ conn.install_browser_context_fixture_for_test(active);let response = conn.process_message_messages_only_for_test(@@ -2684,7 +2694,8 @@ async fn direct_console_routes_to_inactive_active_owner_without_activating_slot(let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-B")).await;ctx.wait_for_scheduler_message("inactive console fixture load", |message| {@@ -2805,7 +2816,7 @@ async fn direct_console_routes_to_inactive_background_owner_without_activating_sTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -2908,7 +2919,8 @@ async fn direct_console_routes_to_loaded_background_owner_and_advances_backgrounlet mut inactive = BrowserContext::new("BID-B".into());inactive.insert_page_target_host(background);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-background")).await;ctx.wait_for_scheduler_message("background console fixture load", |message| {@@ -3000,7 +3012,7 @@ async fn direct_log_enable_routes_to_inactive_active_owner_without_activating_slinactive.set_target_url("data:text/html,log-direct-test".to_owned());inactive.attach_active_session("SID-B");inactive.replace_loaded_page(Some(page));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -3054,7 +3066,7 @@ async fn direct_log_enable_routes_to_inactive_background_owner_without_activatinTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -3107,7 +3119,7 @@ async fn direct_log_enable_routes_to_loaded_background_owner_without_replaying_clet mut inactive = BrowserContext::new("BID-B".into());inactive.insert_page_target_host(background);- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -3165,7 +3177,8 @@ async fn direct_log_disable_routes_to_inactive_active_owner_without_activating_s[moli_page_types::DevToolsSessionKey::Primary].page_session_state.log_enabled = true;- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-B")).await;ctx.sent.clear();@@ -3224,7 +3237,7 @@ async fn direct_log_disable_routes_to_inactive_background_owner_without_activati.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.log_enabled = true;- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);let response = conn.process_message_messages_only_for_test(@@ -3263,7 +3276,7 @@ async fn direct_network_policy_routes_to_inactive_active_owner_without_activatinlet mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);for raw in [r#"{"id":0,"method":"Network.enable","sessionId":"SID-B"}"#,@@ -3372,7 +3385,7 @@ async fn direct_network_policy_invalid_params_return_owner_plan_error_without_aclet mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B".to_owned());inactive.attach_active_session("SID-B");- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);for raw in [r#"{"id":1,"method":"Network.setCacheDisabled","sessionId":"SID-B","params":{}}"#,@@ -3430,7 +3443,7 @@ async fn direct_network_policy_routes_to_inactive_background_owner_without_activTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);for raw in [r#"{"id":0,"method":"Network.enable","sessionId":"SID-background"}"#,diff --git a/moli-protocol/src/domains/accessibility/tests.rs b/moli-protocol/src/domains/accessibility/tests.rsindex 0b69ff08a..9a798a17f 100644--- a/moli-protocol/src/domains/accessibility/tests.rs+++ b/moli-protocol/src/domains/accessibility/tests.rs@@ -36,7 +36,7 @@ async fn load_page_async(ctx: &mut TestContext, html: &str) {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");let data_url = format!("data:text/html,{html}");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(None);ctx.install_navigation_fixture_for_session_owner(&data_url, None).await;@@ -422,7 +422,7 @@ async fn accessibility_loaded_page_methods_target_background_owner_without_activbc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><body><p>Intro</p><button>Owner</button></body></html>",Some("SID-background"),@@ -534,13 +534,14 @@ async fn accessibility_loaded_page_methods_target_inactive_owner_without_activatlet mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><body><button>Inactive</button></body></html>",Some("SID-inactive"),diff --git a/moli-protocol/src/domains/activity/main_document.rs b/moli-protocol/src/domains/activity/main_document.rsindex ba45bf1e7..e3eb32a65 100644--- a/moli-protocol/src/domains/activity/main_document.rs+++ b/moli-protocol/src/domains/activity/main_document.rs@@ -968,7 +968,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_id = moli_core::PageId::new_for_testing(71);let frame = RendererFrameToken { page_id };@@ -1110,7 +1110,7 @@ mod tests {.active_page_target_mut().runtime_slot.enable_primary_network_events();- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let state = navigation_state();let final_url = Url::parse("https://example.test/download").unwrap();@@ -1303,7 +1303,7 @@ mod tests {.page_session_state.page_domain_enabled = true;let mut conn = CdpConnection::new();- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let state = navigation_state();let activity = MainDocumentNavigationActivity::new(state.clone(),@@ -1396,7 +1396,7 @@ mod tests {browser_context.commit_document_navigation_if_matches(&old_token);let mut conn = CdpConnection::new();- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let activity = MainDocumentNavigationActivity::new(navigation_state(),final_url.clone(),@@ -1448,7 +1448,7 @@ mod tests {browser_context.commit_document_navigation_if_matches(&token);let mut conn = CdpConnection::new();- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let activity = MainDocumentNavigationActivity::new(navigation_state(),final_url,diff --git a/moli-protocol/src/domains/activity/output_ingress/renderer.rs b/moli-protocol/src/domains/activity/output_ingress/renderer.rsindex 8a202db83..69597eb6f 100644--- a/moli-protocol/src/domains/activity/output_ingress/renderer.rs+++ b/moli-protocol/src/domains/activity/output_ingress/renderer.rs@@ -274,7 +274,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let owner = CommandOwnerScope::capture(&conn, None);assert_eq!(diff --git a/moli-protocol/src/domains/activity/runtime_command_barrier.rs b/moli-protocol/src/domains/activity/runtime_command_barrier.rsindex 3582f829e..42cce5b2e 100644--- a/moli-protocol/src/domains/activity/runtime_command_barrier.rs+++ b/moli-protocol/src/domains/activity/runtime_command_barrier.rs@@ -515,7 +515,7 @@ mod tests {.active_page_target_mut().runtime_slot.replace_loaded_page(Some(page));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn}diff --git a/moli-protocol/src/domains/audits.rs b/moli-protocol/src/domains/audits.rsindex 00a9ac0f2..c600d3d65 100644--- a/moli-protocol/src/domains/audits.rs+++ b/moli-protocol/src/domains/audits.rs@@ -86,7 +86,8 @@ mod tests {browser_context.set_active_target_id("TID-audits".to_owned());browser_context.set_target_url("data:text/html,audits-test".to_owned());browser_context.attach_active_session("SID-audits".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-audits"),diff --git a/moli-protocol/src/domains/autofill.rs b/moli-protocol/src/domains/autofill.rsindex c21fc306c..b5a6bec89 100644--- a/moli-protocol/src/domains/autofill.rs+++ b/moli-protocol/src/domains/autofill.rs@@ -168,7 +168,8 @@ mod tests {browser_context.set_active_target_id("TID-1".to_owned());browser_context.set_target_url("data:text/html,autofill-test".to_owned());browser_context.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-1"),diff --git a/moli-protocol/src/domains/browser.rs b/moli-protocol/src/domains/browser.rsindex 776b37763..2825e8caf 100644--- a/moli-protocol/src/domains/browser.rs+++ b/moli-protocol/src/domains/browser.rs@@ -22,6 +22,12 @@ pub(crate) fn is_valid_download_behavior(behavior: &str) -> bool {DOWNLOAD_BEHAVIORS.contains(&behavior)}+/// Disables Browser-domain observation owned by one DevTools session.+pub(in crate::domains) fn dispose_session_handler(conn: &mut CdpConnection, session_id: &str) {+ conn.download_behavior+ .set_browser_events_enabled_for_session(Some(session_id), false);+}+pub(crate) struct PendingBrowserCommandDispatch {command_id: Option<u64>,response_session_id: Option<String>,diff --git a/moli-protocol/src/domains/console.rs b/moli-protocol/src/domains/console.rsindex 8b69d368b..2d91def0b 100644--- a/moli-protocol/src/domains/console.rs+++ b/moli-protocol/src/domains/console.rs@@ -182,7 +182,7 @@ mod tests {bc.set_active_target_id("TID-1".to_owned());bc.set_target_url("data:text/html,console-test".to_owned());bc.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-1"),@@ -293,7 +293,7 @@ mod tests {stack: None,});bc.insert_shared_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}#[tokio::test]@@ -558,7 +558,7 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 13,diff --git a/moli-protocol/src/domains/css.rs b/moli-protocol/src/domains/css.rsindex 0e3d9256c..b022d2656 100644--- a/moli-protocol/src/domains/css.rs+++ b/moli-protocol/src/domains/css.rs@@ -785,7 +785,7 @@ mod tests {async fn with_loaded_document_async(ctx: &mut TestContext, html: &str) {let mut bc = crate::conn::BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"), None).await;wait_until_renderer_document_load(ctx, None, "TID-1", LOADER_ID).await;@@ -1020,7 +1020,7 @@ mod tests {bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><head><style title='owner'>body { color: red; }</style></head><body><div id='target' style='display:flex;width:123px;color:blue'></div></body></html>",Some("SID-background"),@@ -1144,13 +1144,14 @@ mod tests {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><head><style title='inactive'>main { color: red; }</style></head><body><main id='target' style='display:block;height:77px'></main></body></html>",Some("SID-inactive"),@@ -1699,7 +1700,8 @@ mod tests {.background_target_mut("TID-css-background").expect("background target").replace_loaded_page(Some(background_page));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let background_session = attach_page_session_async(&mut ctx, "TID-css-background").await;let active_style_sheet_id = inline_style_sheet_id_for_session_async(&mut ctx, None).await;diff --git a/moli-protocol/src/domains/debugger.rs b/moli-protocol/src/domains/debugger.rsindex e6bfc5227..f4ed77d30 100644--- a/moli-protocol/src/domains/debugger.rs+++ b/moli-protocol/src/domains/debugger.rs@@ -409,10 +409,25 @@ mod tests {"SID-debugger-attached".to_owned(),));}- ctx.conn- .register_bound_session_for_test("SID-debugger-primary");- ctx.conn- .register_bound_session_for_test("SID-debugger-attached");+ for (session_id, session_key) in [+ (+ "SID-debugger-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ ),+ (+ "SID-debugger-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-debugger-attached".to_owned()),+ ),+ ] {+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-debugger".to_owned(),+ target_id: "TID-debugger".to_owned(),+ session_key,+ },+ );+ }let enable = command(&mut ctx,@@ -491,10 +506,25 @@ mod tests {"SID-debugger-attached".to_owned(),));}- ctx.conn- .register_bound_session_for_test("SID-debugger-primary");- ctx.conn- .register_bound_session_for_test("SID-debugger-attached");+ for (session_id, session_key) in [+ (+ "SID-debugger-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ ),+ (+ "SID-debugger-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-debugger-attached".to_owned()),+ ),+ ] {+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-debugger".to_owned(),+ target_id: "TID-debugger".to_owned(),+ session_key,+ },+ );+ }for (id, session_id) in [(61, "SID-debugger-primary"), (62, "SID-debugger-attached")] {let enable = command(diff --git a/moli-protocol/src/domains/dom/patchright_shadow_tests.rs b/moli-protocol/src/domains/dom/patchright_shadow_tests.rsindex 6adc35493..c74725254 100644--- a/moli-protocol/src/domains/dom/patchright_shadow_tests.rs+++ b/moli-protocol/src/domains/dom/patchright_shadow_tests.rs@@ -7,7 +7,7 @@ use super::tests::navigate_to_data_html_async;fn load_bc(ctx: &mut TestContext, bc_id: &str) {let mut bc = BrowserContext::new(bc_id.into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn take_response_by_id(ctx: &mut TestContext, id: u64) -> Value {diff --git a/moli-protocol/src/domains/dom/tests/geometry.rs b/moli-protocol/src/domains/dom/tests/geometry.rsindex 8d1c9ac39..741da97ad 100644--- a/moli-protocol/src/domains/dom/tests/geometry.rs+++ b/moli-protocol/src/domains/dom/tests/geometry.rs@@ -50,7 +50,7 @@ async fn dom_resolve_geometry_and_mutation_target_loaded_background_owner_withoubc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_buffered_navigation_fixture_for_session_owner(background_url,"<!doctype html><html><body><section id='owned' data-route='background' style='position:absolute;left:11px;top:13px;width:17px;height:19px'>background</section></body></html>".to_owned(),@@ -291,13 +291,14 @@ async fn dom_resolve_geometry_targets_inactive_loaded_owner_without_activation()let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><html><body><article id='owned' style='position:absolute;left:7px;top:9px;width:13px;height:15px'>inactive</article></body></html>",Some("SID-inactive"),diff --git a/moli-protocol/src/domains/dom/tests/misc.rs b/moli-protocol/src/domains/dom/tests/misc.rsindex b77745149..3cda98ccb 100644--- a/moli-protocol/src/domains/dom/tests/misc.rs+++ b/moli-protocol/src/domains/dom/tests/misc.rs@@ -223,7 +223,7 @@ async fn dom_document_reads_target_loaded_background_owner_without_activation()bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><html><body><section id='owned'>background</section></body></html>",Some("SID-background"),@@ -295,13 +295,14 @@ async fn dom_document_reads_target_inactive_loaded_owner_without_activation() {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><html><body><section id='owned'>inactive</section></body></html>",Some("SID-inactive"),diff --git a/moli-protocol/src/domains/dom/tests/search.rs b/moli-protocol/src/domains/dom/tests/search.rsindex a1088883c..f7bea7fb6 100644--- a/moli-protocol/src/domains/dom/tests/search.rs+++ b/moli-protocol/src/domains/dom/tests/search.rs@@ -483,7 +483,7 @@ async fn dom_search_targets_loaded_background_owner_without_activation() {bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><html><body><span>one</span><span>two</span></body></html>",Some("SID-background"),@@ -559,13 +559,14 @@ async fn dom_search_targets_inactive_loaded_owner_without_activation() {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner("data:text/html,<!doctype html><html><body><article>one</article><article>two</article></body></html>",Some("SID-inactive"),diff --git a/moli-protocol/src/domains/dom_debugger.rs b/moli-protocol/src/domains/dom_debugger.rsindex e5406d0dc..cd2d088fb 100644--- a/moli-protocol/src/domains/dom_debugger.rs+++ b/moli-protocol/src/domains/dom_debugger.rs@@ -500,7 +500,8 @@ mod tests {browser_context.set_active_target_id("TID-1".to_owned());browser_context.set_target_url("data:text/html,dom-debugger-test".to_owned());browser_context.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-1"),diff --git a/moli-protocol/src/domains/dom_snapshot.rs b/moli-protocol/src/domains/dom_snapshot.rsindex efd158332..6dde87c2c 100644--- a/moli-protocol/src/domains/dom_snapshot.rs+++ b/moli-protocol/src/domains/dom_snapshot.rs@@ -210,7 +210,7 @@ mod tests {async fn load_document(ctx: &mut TestContext, html: &str) {let mut bc = BrowserContext::new("BID-1".to_owned());bc.set_active_target_id("TID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"), None).await;wait_until_renderer_document_load(ctx, None, "TID-1", LOADER_ID).await;@@ -1037,7 +1037,7 @@ mod tests {bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 101,@@ -1088,14 +1088,15 @@ mod tests {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url(page.final_url().as_str().to_owned());inactive.attach_active_session("SID-inactive".to_owned());inactive.replace_loaded_page(Some(page));- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 111,diff --git a/moli-protocol/src/domains/dom_storage/tests.rs b/moli-protocol/src/domains/dom_storage/tests.rsindex 1723534ad..419bcf1e1 100644--- a/moli-protocol/src/domains/dom_storage/tests.rs+++ b/moli-protocol/src/domains/dom_storage/tests.rs@@ -116,7 +116,8 @@ async fn loaded_dom_storage_context() -> (TestContext, String, String, tokio::tabrowser_context.set_target_url(page_url.clone());browser_context.set_target_security_origin(origin.clone());browser_context.set_target_secure_context_type("Secure".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn@@ -452,7 +453,8 @@ async fn dom_storage_resolves_child_frame_storage_ids_without_collapsing_to_top_browser_context.set_target_url(page_url.clone());browser_context.set_target_security_origin(top_origin.clone());browser_context.set_target_secure_context_type("Secure".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async(&page_url)diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rsindex 38ab18334..b72a25394 100644--- a/moli-protocol/src/domains/emulation/tests.rs+++ b/moli-protocol/src/domains/emulation/tests.rs@@ -60,9 +60,24 @@ fn install_multi_session_page_state(ctx: &mut TestContext) {browser_context.set_active_target_id("TID-1");browser_context.attach_active_session("SID-primary");assert!(browser_context.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(browser_context);- ctx.conn.register_bound_session_for_test("SID-primary");- ctx.conn.register_bound_session_for_test("SID-attached");+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);+ for (session_id, session_key) in [+ ("SID-primary", moli_page_types::DevToolsSessionKey::Primary),+ (+ "SID-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-attached".to_owned()),+ ),+ ] {+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-1".to_owned(),+ session_key,+ },+ );+ }}async fn expect_session_command_result(@@ -105,7 +120,7 @@ async fn install_session_page_for_emulation_test(bc: BrowserContext,url: &str,) {- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);// A production navigation binds the reserved renderer Page to its target// before output can arrive. Use the production-shaped fixture transaction// instead of inserting a bare Page and racing its first publication.@@ -158,7 +173,7 @@ async fn bidi_set_extra_headers_merges_global_user_context_and_context_layers()let mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);execute_set_extra_headers_for_test(&mut ctx,@@ -274,11 +289,14 @@ async fn attached_session_first_io_emulation_response_uses_its_session_host() {.expect("browser context").assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- let owner = crate::conn::CommandOwnerScope::for_route(- ctx.conn- .bound_session_route_for_test("SID-attached", Some("TID-1"))- .expect("attached test session must own its Page route"),- );+ let route = crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-1".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Attached("SID-attached".to_owned()),+ };+ ctx.conn+ .register_session_route_for_test("SID-attached", route.clone());+ let owner = crate::conn::CommandOwnerScope::for_route(route);ctx.conn.apply_runtime_binding_state_for_owner_async(&owner).await@@ -773,7 +791,7 @@ async fn pure_state_emulation_commands_complete_through_command_dispatch() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (id, method, params) in [(@@ -830,7 +848,7 @@ async fn set_cpu_throttling_rate_rejects_invalid_params() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 9115,@@ -858,7 +876,7 @@ async fn live_apply_emulation_commands_without_loaded_page_do_not_use_legacy_fallet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (id, method, params) in [(@@ -1439,7 +1457,7 @@ async fn set_user_agent_override_applies_to_subsequent_navigation_requests() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 6,@@ -1509,7 +1527,7 @@ async fn emulation_user_agent_override_replaces_network_override() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 9,@@ -1577,7 +1595,7 @@ async fn set_user_agent_override_applies_to_current_page_xhr_requests() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>ok</body>",Some("SID-1"),@@ -1665,7 +1683,7 @@ async fn set_user_agent_override_applies_complete_chromium_identity_profile() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 200,@@ -2033,7 +2051,7 @@ async fn emulation_async_dispatch_updates_live_page_surface_without_mutating_acclet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&format!("http://{addr}/page"), Some("SID-1")).await;@@ -2243,7 +2261,7 @@ async fn set_geolocation_override_applies_to_subsequent_navigation_surface() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 89,@@ -2399,7 +2417,7 @@ async fn device_metrics_override_updates_layout_metrics() {let mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 12,@@ -2487,7 +2505,7 @@ async fn locale_override_updates_intl_without_mutating_language_surfaces() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 14,@@ -2543,7 +2561,7 @@ async fn bidi_user_context_locale_composes_with_user_agent_on_all_identity_surfalet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for command in [DevToolsCommand::SetUserAgentOverride(DevToolsSetUserAgentOverrideCommand {@@ -2647,7 +2665,7 @@ async fn touch_and_timezone_overrides_apply_to_document_start_surface() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 16,@@ -2686,7 +2704,7 @@ async fn locale_and_timezone_overrides_apply_to_locale_date_formatting() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 181,@@ -2734,7 +2752,7 @@ async fn context_emulated_media_applies_to_loaded_background_page_without_activabc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active");bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background</body>",Some("SID-background"),@@ -2810,7 +2828,7 @@ async fn context_locale_override_applies_to_loaded_background_page_without_activbc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active");bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background</body>",Some("SID-background"),@@ -2899,7 +2917,7 @@ async fn session_emulation_routes_to_loaded_background_owner_without_activation(bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active");bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background</body>",Some("SID-background"),@@ -3032,7 +3050,7 @@ async fn emulated_media_updates_existing_media_query_list_matches() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body><script>globalThis.events = []; globalThis.darkMql = matchMedia('(prefers-color-scheme: dark)'); globalThis.lightMql = matchMedia('(prefers-color-scheme: light)'); darkMql.addEventListener('change', event => events.push(['dark', event.matches, event.media, event.target === darkMql])); lightMql.onchange = event => events.push(['light', event.matches, event.media, event.target === lightMql]);</script></body>",Some("SID-1"),@@ -3105,7 +3123,7 @@ async fn generated_surface_refresh_does_not_freeze_match_media_override() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body></body>", Some("SID-1")).await;ctx.sent.clear();@@ -3162,7 +3180,7 @@ async fn target_session_detach_disposes_non_aggregated_emulation_state_before_relet mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body></body>", None).await;ctx.sent.clear();@@ -3311,7 +3329,7 @@ async fn emulated_media_color_scheme_applies_to_match_media_surface() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 184,@@ -3347,7 +3365,7 @@ async fn active_document_start_surface_reports_active_focus_and_visibility() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 18,@@ -3370,7 +3388,7 @@ async fn focus_emulation_override_applies_to_document_start_surface() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 19,diff --git a/moli-protocol/src/domains/fetch/commands.rs b/moli-protocol/src/domains/fetch/commands.rsindex 07fa5b823..e57790b50 100644--- a/moli-protocol/src/domains/fetch/commands.rs+++ b/moli-protocol/src/domains/fetch/commands.rs@@ -2043,7 +2043,7 @@ mod protocol_neutral_tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(Some("SID-primary"))@@ -2187,7 +2187,7 @@ mod protocol_neutral_tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(Some("SID-primary"))@@ -2323,7 +2323,7 @@ mod protocol_neutral_tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(Some("SID-primary"))diff --git a/moli-protocol/src/domains/fetch/subresource.rs b/moli-protocol/src/domains/fetch/subresource.rsindex 242b4b0ef..3f191b6e7 100644--- a/moli-protocol/src/domains/fetch/subresource.rs+++ b/moli-protocol/src/domains/fetch/subresource.rs@@ -700,7 +700,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(None).expect("active test target should expose a Page residence identity");@@ -779,7 +779,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(None).expect("active test target should expose a Page residence identity");@@ -824,7 +824,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = conn.target_page_residence_identity_for_session(None).expect("active test target should expose a Page residence identity");@@ -876,7 +876,7 @@ mod tests {"https://example.test/background".to_owned(),);bc.insert_page_target_host(target);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);conn.runtime_session_owner_slot_mut(Some("SID-background")).expect("background test target runtime slot").set_page_attachment_id_for_test(1);diff --git a/moli-protocol/src/domains/fetch/tests/basics.rs b/moli-protocol/src/domains/fetch/tests/basics.rsindex c0335b926..d6937fa8e 100644--- a/moli-protocol/src/domains/fetch/tests/basics.rs+++ b/moli-protocol/src/domains/fetch/tests/basics.rs@@ -154,7 +154,7 @@ async fn enable_and_disable_are_session_local_for_same_target() {bc.set_active_target_id("TID-session-fetch".to_owned());bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-session-fetch", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 210,@@ -246,7 +246,7 @@ async fn disable_drains_only_current_session_pending_subresource_fetches() {bc.set_active_target_id("TID-session-fetch".to_owned());bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-session-fetch", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 220,@@ -319,7 +319,7 @@ async fn disable_drains_fetch_owned_pending_when_same_session_network_intercept_let mut bc = BrowserContext::new("BID-session-mixed-fetch-pending".into());bc.set_active_target_id("TID-session-fetch".to_owned());bc.attach_active_session("SID-primary".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 230,@@ -408,7 +408,7 @@ async fn enable_targets_loaded_background_owner_without_activation() {bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<title>fetch background</title>",Some("SID-background"),@@ -460,7 +460,7 @@ async fn pending_fetch_enable_keeps_background_owner_route_across_completion() {let mut bc = BrowserContext::new("BID-fetch-owner-route".to_owned());bc.set_active_target_id("TID-fetch-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<title>active fetch</title>",@@ -530,12 +530,13 @@ async fn enable_targets_inactive_owner_without_activation() {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 1202,@@ -614,7 +615,7 @@ async fn disable_targets_loaded_background_owner_without_activation() {}],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<title>fetch disable background</title>",Some("SID-background"),@@ -1139,7 +1140,7 @@ async fn disable_clears_fetch_state() {auth_stage_chain: None,},);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 5, "method": "Fetch.disable"})).await;@@ -1168,7 +1169,7 @@ async fn disable_after_enable_resets_pending_requests() {bc.active_page_target_mut().fetch_owner.register_pending_fetch_request_id_for_test("INT-2".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 14, "method": "Fetch.disable"})).await;@@ -1232,7 +1233,7 @@ async fn continue_response_and_take_response_body_as_stream_validate_like_fetch_bc.active_page_target_mut().fetch_owner.register_pending_fetch_request_id_for_test("INT-43".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 16,@@ -1266,7 +1267,7 @@ async fn pending_fetch_request_can_be_consumed_once() {bc.active_page_target_mut().fetch_owner.register_pending_fetch_request_id_for_test("INT-7".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 8,@@ -1363,7 +1364,7 @@ async fn continue_with_auth_rejects_invalid_response_without_consuming_pending_aauth_stage_chain: None,},);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 77,@@ -1438,7 +1439,7 @@ async fn continue_with_auth_unsupported_challenge_preserves_pending_auth_navigatauth_stage_chain: None,},);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 78,diff --git a/moli-protocol/src/domains/fetch/tests/command_correlation.rs b/moli-protocol/src/domains/fetch/tests/command_correlation.rsindex 1db1363bf..9d7dd7d3c 100644--- a/moli-protocol/src/domains/fetch/tests/command_correlation.rs+++ b/moli-protocol/src/domains/fetch/tests/command_correlation.rs@@ -21,7 +21,8 @@ async fn context_with_loaded_fetch_page() -> TestContext {.active_page_target_mut().runtime_slot.replace_loaded_page(Some(page));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx}@@ -167,7 +168,8 @@ async fn deferred_fetch_command_keeps_its_exact_page_for_implicit_work() {Some("SID-background".to_owned()),"https://example.test/background".to_owned(),));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let completed = PendingFetchCommandDispatch::new(&ctx.conn,@@ -196,7 +198,8 @@ async fn deferred_sessionless_fetch_command_freezes_the_active_page_at_admissionNone,"https://example.test/next".to_owned(),));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let completed = PendingFetchCommandDispatch::new(&ctx.conn,diff --git a/moli-protocol/src/domains/fetch/tests/mod.rs b/moli-protocol/src/domains/fetch/tests/mod.rsindex 27a54c6a8..7987760d3 100644--- a/moli-protocol/src/domains/fetch/tests/mod.rs+++ b/moli-protocol/src/domains/fetch/tests/mod.rs@@ -45,7 +45,7 @@ async fn with_loaded_http_document(let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id(target_id.to_owned());bc.attach_active_session(session_id.to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(url, Some(session_id)).await;ctx.conn@@ -72,7 +72,7 @@ async fn with_loaded_http_background_document(bc.set_active_target_id(active_target_id.to_owned());bc.attach_active_session(active_session_id.to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(url, Some(background_session_id)).await;}diff --git a/moli-protocol/src/domains/fetch/tests/navigation_auth.rs b/moli-protocol/src/domains/fetch/tests/navigation_auth.rsindex c29fe1304..e40b3b109 100644--- a/moli-protocol/src/domains/fetch/tests/navigation_auth.rs+++ b/moli-protocol/src/domains/fetch/tests/navigation_auth.rs@@ -46,7 +46,7 @@ async fn continue_with_auth_retries_navigation_with_basic_credentials() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));let url = format!("http://{addr}/auth");@@ -207,7 +207,7 @@ async fn devtools_continue_response_credentials_retries_auth_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));let url = format!("http://{addr}/auth");@@ -353,7 +353,7 @@ async fn continue_with_auth_and_intercept_response_pauses_before_authorized_bodybc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -487,7 +487,7 @@ async fn continue_with_non_basic_auth_and_intercept_response_fails_explicitly_wibc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -615,7 +615,7 @@ async fn navigation_auth_required_includes_synthesized_cookie_header() {)],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 72_001,@@ -701,7 +701,7 @@ async fn continue_with_auth_prefers_supported_navigation_challenge_over_unsupporbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -851,7 +851,7 @@ async fn run_navigation_cdp_fetch_then_bidi_network_auth_required_terminal(bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));let url = format!("http://{addr}/auth");diff --git a/moli-protocol/src/domains/fetch/tests/navigation_control.rs b/moli-protocol/src/domains/fetch/tests/navigation_control.rsindex 2ac7a6373..8bfedeef0 100644--- a/moli-protocol/src/domains/fetch/tests/navigation_control.rs+++ b/moli-protocol/src/domains/fetch/tests/navigation_control.rs@@ -33,7 +33,8 @@ fn parse_binary_response_headers_rejects_invalid_header_value() {#[tokio::test]async fn continue_request_rejects_invalid_url_without_consuming_pending_navigation() {let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.process_async(json!({"id": 62,@@ -85,7 +86,8 @@ async fn continue_request_rejects_invalid_url_without_consuming_pending_navigati#[tokio::test]async fn continue_request_rejects_invalid_post_data_without_consuming_pending_navigation() {let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.process_async(json!({"id": 65,@@ -152,7 +154,8 @@ async fn request_paused_then_continue_request_resumes_main_document_navigation()});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));let url = format!("http://{addr}/page");@@ -219,7 +222,8 @@ async fn request_paused_then_continue_request_resumes_main_document_navigation()#[tokio::test]async fn main_document_request_uses_loader_id_as_observed_network_request_id() {let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.process_async(json!({"id": 301,@@ -257,7 +261,7 @@ async fn fail_request_blocked_by_client_maps_main_document_navigation_to_net_errbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 303,@@ -301,7 +305,8 @@ async fn fail_request_blocked_by_client_maps_main_document_navigation_to_net_err#[tokio::test(flavor = "multi_thread")]async fn request_paused_then_continue_request_fails_when_network_offline() {let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.process_async(json!({"id": 16630,@@ -395,7 +400,7 @@ async fn response_stage_document_pattern_pauses_main_document_after_response() {&[("set-cookie".to_owned(), "sid=1; Path=/".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 33,@@ -588,7 +593,7 @@ async fn continue_request_with_post_data_marks_network_request_as_having_post_dabc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -697,7 +702,8 @@ async fn intercepted_form_post_navigation_body_is_available_by_network_request_ilet page_url = format!("http://{addr}/page");let post_url = format!("http://{addr}/post");let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;{@@ -823,7 +829,7 @@ async fn continue_request_with_intercept_response_pauses_after_response_until_cobc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));let url = format!("http://{addr}/page");@@ -952,7 +958,7 @@ async fn intercepted_navigation_start_events_stay_before_network_pause_with_backbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (sender, mut receiver) = tokio::sync::mpsc::unbounded_channel();ctx.conn.set_background_event_sender(sender);@@ -1010,7 +1016,7 @@ async fn disable_aborts_paused_main_document_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 78,diff --git a/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs b/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rsindex 04f734b13..9acabdbe8 100644--- a/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs+++ b/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs@@ -31,7 +31,7 @@ async fn response_stage_pause_happens_before_navigation_body_eof() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -275,7 +275,7 @@ async fn empty_http_error_response_stage_commits_browser_error_document_after_cobc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_background_navigation_scheduler_for_test();let url = format!("http://{addr}/empty-429");@@ -316,7 +316,7 @@ lateBinding("author-script");bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let initial_page = ctx.conn.load_page_via_runtime_async("data:text/html,<title>initial</title>")@@ -503,7 +503,7 @@ async fn response_stage_xml_commit_uses_live_configuration_before_first_author_sbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let initial_page = ctx.conn.load_page_via_runtime_async("data:text/html,<title>initial</title>")@@ -694,7 +694,8 @@ async fn response_stage_xml_commit_uses_live_configuration_before_first_author_s#[tokio::test(flavor = "multi_thread")]async fn fulfill_request_commit_uses_configuration_added_while_paused_before_author_script() {let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let initial_page = ctx.conn.load_page_via_runtime_async("data:text/html,<title>initial</title>")@@ -889,7 +890,7 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 364,@@ -1028,7 +1029,7 @@ async fn response_stage_continue_request_rejects_data_url_override_without_consubc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let data_url = "data:text/html,<html><body><main>data response stage</main></body></html>";ctx.process_async(json!({@@ -1094,7 +1095,7 @@ async fn response_stage_continue_request_rejects_file_url_override_without_consubc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 395,"method": "Fetch.enable",@@ -1173,7 +1174,7 @@ async fn response_stage_continue_response_streams_network_events_through_backgrobc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (background_tx, mut background_rx) = tokio::sync::mpsc::unbounded_channel();ctx.conn.set_background_event_sender(background_tx);let url = format!("http://{addr}/page");@@ -1293,7 +1294,7 @@ async fn continue_response_can_override_status_and_headers() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -1468,7 +1469,8 @@ async fn continue_response_header_override_keeps_streaming_parser_body() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -1578,7 +1580,7 @@ async fn response_stage_navigation_request_paused_includes_synthesized_cookie_he&[("set-cookie".to_owned(), "sid=nav; Path=/page".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 3_530,@@ -1664,7 +1666,8 @@ async fn continue_response_with_binary_response_headers_overrides_headers() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -1757,7 +1760,7 @@ async fn fail_request_at_response_stage_aborts_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -1859,7 +1862,7 @@ async fn fulfill_request_at_response_stage_replaces_the_network_candidate_once()bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 369,@@ -1973,7 +1976,8 @@ async fn take_response_body_as_stream_at_response_stage_returns_stream_and_keeps});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2101,7 +2105,8 @@ async fn continue_response_rejects_while_response_body_stream_is_active() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2224,7 +2229,8 @@ async fn io_close_cancels_active_response_body_stream_and_request_id() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2323,7 +2329,8 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2477,7 +2484,8 @@ async fn fulfill_request_cancels_active_response_body_stream_and_uses_synthetic_});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2580,7 +2588,8 @@ async fn fail_request_cancels_active_response_body_stream_and_fails_navigation()});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2670,7 +2679,8 @@ async fn clear_browser_cache_cancels_active_response_body_stream_without_stale_r});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2771,7 +2781,8 @@ async fn fail_request_finishes_pending_navigation_with_error() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/page");ctx.process_async(json!({@@ -2818,7 +2829,7 @@ async fn fulfill_request_completes_navigation_with_synthetic_response() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));@@ -2911,7 +2922,7 @@ async fn fulfill_request_navigation_get_response_body_preserves_binary_bytes() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 44_001,@@ -2989,7 +3000,7 @@ async fn fulfill_request_document_body_uses_phase_one_parser_semantics() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 390,@@ -3059,7 +3070,7 @@ async fn fulfill_request_accepts_binary_response_headers() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 40,@@ -3150,7 +3161,7 @@ async fn continue_request_applies_url_method_headers_and_post_data() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));diff --git a/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs b/moli-protocol/src/domains/fetch/tests/navigation_subresource.rsindex e7bad890d..5c454b114 100644--- a/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs+++ b/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs@@ -85,7 +85,7 @@ async fn request_stage_navigation_request_paused_includes_synthesized_cookie_hea)],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 72_101,@@ -154,7 +154,7 @@ fetch('/api', { method: 'POST', body: 'nav-payload' })bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -376,7 +376,7 @@ document.addEventListener('DOMContentLoaded', () => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -538,7 +538,7 @@ window.addEventListener('load', () => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -699,7 +699,7 @@ window.postMessage('go', '*');bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -865,7 +865,7 @@ document.body.setAttribute('data-trigger', '1');bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1030,7 +1030,7 @@ observer.observe(document.getElementById('target'));bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1192,7 +1192,7 @@ setTimeout(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1367,7 +1367,7 @@ const id = setInterval(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1540,7 +1540,7 @@ queueMicrotask(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1701,7 +1701,7 @@ Promise.resolve().then(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -1863,7 +1863,7 @@ setTimeout(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -2043,7 +2043,7 @@ const id = setInterval(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -2217,7 +2217,7 @@ queueMicrotask(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -2379,7 +2379,7 @@ Promise.resolve().then(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -2541,7 +2541,7 @@ requestIdleCallback(deadline => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -2699,7 +2699,7 @@ requestIdleCallback(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -2863,7 +2863,7 @@ requestAnimationFrame(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let api_url = format!("http://{addr}/api");@@ -3019,7 +3019,7 @@ requestAnimationFrame(() => {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");let xhr_url = format!("http://{addr}/xhr");@@ -3171,7 +3171,7 @@ fetch('/api').catch(() => {});bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page_url = format!("http://{addr}/page");ctx.process_async(json!({@@ -3242,7 +3242,8 @@ async fn continue_with_auth_default_aborts_pending_navigation() {});let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(attached_browser_context());+ ctx.conn+ .install_browser_context_fixture_for_test(attached_browser_context());let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -3341,7 +3342,7 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -3449,7 +3450,7 @@ async fn continue_with_auth_retries_navigation_with_basic_proxy_credentials() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -3544,7 +3545,7 @@ async fn continue_with_auth_retries_navigation_with_digest_proxy_credentials() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.conn.set_http_proxy_override_async(Some(proxy_url)).await;@@ -3688,7 +3689,7 @@ async fn cancel_https_proxy_connect_auth_emits_407_without_extra_info_and_fails_bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.conn.set_http_proxy_override_async(Some(format!("http://{proxy_addr}"))).await;@@ -3838,7 +3839,7 @@ async fn continue_with_auth_handles_multi_round_basic_navigation_challenge() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -3970,7 +3971,7 @@ async fn continue_with_auth_handles_digest_navigation_challenge() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({@@ -4101,7 +4102,7 @@ async fn continue_with_auth_handles_multi_round_digest_navigation_challenge() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let url = format!("http://{addr}/auth");ctx.process_async(json!({diff --git a/moli-protocol/src/domains/input.rs b/moli-protocol/src/domains/input.rsindex b3760da05..a6014b392 100644--- a/moli-protocol/src/domains/input.rs+++ b/moli-protocol/src/domains/input.rs@@ -2171,7 +2171,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-typed", "ROOT-typed", source_document);let owner = page_residence_identity_for_test(&conn, "SID-typed");@@ -2223,7 +2223,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-root-capture".into());bc.set_active_target_id("TID-root-capture");bc.attach_active_session("SID-root-capture");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -2255,7 +2255,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -2326,7 +2326,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -2389,7 +2389,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-download".into());bc.set_active_target_id("FRAME-download");bc.attach_active_session("SID-download");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);conn.download_behavior.set_global("deny".to_owned(), None, true);let mut out: Vec<BackgroundProtocolEvent> = Vec::new();@@ -2441,7 +2441,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "ROOT-1", source_document);let owner = page_residence_identity_for_test(&conn, "SID-1");@@ -2489,7 +2489,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-context", "ROOT-context", source_document);let owner = page_residence_identity_for_test(&conn, "SID-context");diff --git a/moli-protocol/src/domains/input/tests.rs b/moli-protocol/src/domains/input/tests.rsindex 871663288..e9ce7e23a 100644--- a/moli-protocol/src/domains/input/tests.rs+++ b/moli-protocol/src/domains/input/tests.rs@@ -9,7 +9,7 @@ const INPUT_HIT_Y: u32 = 20;async fn with_loaded_document(ctx: &mut TestContext, html: &str) {let mut bc = BrowserContext::new("BID-I".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let data_url = format!("data:text/html,{html}");// Input commands can execute JS and therefore publish concrete renderer// output. Install the fixture through the same Page-owner transaction as@@ -422,7 +422,7 @@ async fn coordinate_mouse_event_without_document_still_reports_no_document_loadelet mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-I".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 103,@@ -610,7 +610,7 @@ async fn coordinate_input_invalid_params_keep_session_id() {let mut bc = BrowserContext::new("BID-I".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (id, method) in [(9001, "Input.dispatchMouseEvent"),diff --git a/moli-protocol/src/domains/inspector.rs b/moli-protocol/src/domains/inspector.rsindex bbcf6165d..1d2df5435 100644--- a/moli-protocol/src/domains/inspector.rs+++ b/moli-protocol/src/domains/inspector.rs@@ -116,7 +116,7 @@ mod tests {.owner_state.target_crash_state.mark_crashed();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 3, "method": "Inspector.enable", "sessionId": "SID-1"})).await;@@ -143,7 +143,7 @@ mod tests {.owner_state.target_crash_state.mark_crashed();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 30,@@ -185,7 +185,7 @@ mod tests {.owner_state.target_crash_state.mark_crashed();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 301,@@ -224,7 +224,7 @@ mod tests {);target.attach_session("SID-service-worker".to_owned());bc.insert_service_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 31,@@ -277,7 +277,7 @@ mod tests {.owner_state.target_crash_state.mark_crashed();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 4, "method": "Inspector.enable", "sessionId": "SID-B"})).await;diff --git a/moli-protocol/src/domains/io.rs b/moli-protocol/src/domains/io.rsindex 3bdf63c5b..4a8954235 100644--- a/moli-protocol/src/domains/io.rs+++ b/moli-protocol/src/domains/io.rs@@ -407,7 +407,7 @@ mod tests {let mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.insert_io_stream("STREAM-1".into(), b"abcdef".to_vec(), 0);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,@@ -439,7 +439,7 @@ mod tests {let mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.insert_io_stream("STREAM-1".into(), b"abcdef".to_vec(), 0);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 3,@@ -484,7 +484,7 @@ mod tests {let mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.insert_io_stream("STREAM-2".into(), vec![b'x'; 1024 * 1024 + 8], 0);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 6,@@ -517,7 +517,7 @@ mod tests {let mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.insert_io_stream("STREAM-DISPATCH".into(), b"dispatch".to_vec(), 0);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);process_via_command_dispatch(&mut ctx,@@ -547,7 +547,7 @@ mod tests {Some("SID-background".to_owned()),"about:blank#background".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let handle = ctx.conndiff --git a/moli-protocol/src/domains/log.rs b/moli-protocol/src/domains/log.rsindex f6cff2513..cc0192cbf 100644--- a/moli-protocol/src/domains/log.rs+++ b/moli-protocol/src/domains/log.rs@@ -653,7 +653,7 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,diff --git a/moli-protocol/src/domains/mod.rs b/moli-protocol/src/domains/mod.rsindex 854ab8db1..f923cc547 100644--- a/moli-protocol/src/domains/mod.rs+++ b/moli-protocol/src/domains/mod.rs@@ -31,6 +31,7 @@ pub mod runtime;pub(crate) mod runtime_context_events;pub mod security;pub mod service_worker;+pub(crate) mod session;pub mod storage;pub mod system_info;pub mod target;diff --git a/moli-protocol/src/domains/network/activity.rs b/moli-protocol/src/domains/network/activity.rsindex 06c3511c7..d47994834 100644--- a/moli-protocol/src/domains/network/activity.rs+++ b/moli-protocol/src/domains/network/activity.rs@@ -587,7 +587,7 @@ mod tests {bc.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = conn.target_page_residence_identity_for_session(Some("SID-1")).expect("test target should expose a Page residence identity");@@ -680,7 +680,7 @@ mod tests {bc.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let old_owner = conn.target_page_residence_identity_for_session(Some("SID-collision"))@@ -762,7 +762,7 @@ mod tests {bc.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(conn.enable_network_listener_for_session_owner(Some("FETCH-SID")));let page_owner = conn.target_page_residence_identity_for_session(Some("SID-1"))@@ -821,7 +821,7 @@ mod tests {bc.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = conn.target_page_residence_identity_for_session(Some("SID-1")).expect("test target should expose a Page residence identity");@@ -909,7 +909,7 @@ mod tests {Some("SID-background".to_owned()),page_url.clone(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (id, session_id) in [(1, "SID-active"), (2, "SID-background")] {ctx.process_async(serde_json::json!({@@ -997,7 +997,7 @@ mod tests {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.process_async(serde_json::json!({diff --git a/moli-protocol/src/domains/network/tests/blocked_urls.rs b/moli-protocol/src/domains/network/tests/blocked_urls.rsindex 59051826b..b0576e33d 100644--- a/moli-protocol/src/domains/network/tests/blocked_urls.rs+++ b/moli-protocol/src/domains/network/tests/blocked_urls.rs@@ -125,7 +125,7 @@ async fn set_blocked_urls_navigation_fails_with_blocked_by_client() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);enable_network_domain(&mut ctx, 28_040, Some("SID-1")).await;ctx.process_async(json!({@@ -167,7 +167,7 @@ async fn set_blocked_urls_runtime_fetch_emits_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);enable_network_domain(&mut ctx, 28_060, Some("SID-1")).await;ctx.process_async(json!({@@ -311,7 +311,8 @@ async fn background_set_blocked_urls_updates_loaded_owner_page_without_activatio);let mut inactive = BrowserContext::new("BID-background".to_owned());inactive.insert_page_target_host(background);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-background")).await;@@ -407,7 +408,7 @@ async fn set_blocked_urls_worker_fetch_emits_loading_failed() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 28_101,@@ -551,7 +552,7 @@ async fn set_blocked_urls_worker_xhr_emits_loading_failed() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 28_102,@@ -691,7 +692,7 @@ async fn set_blocked_urls_worker_websocket_emits_loading_failed() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 28_103,@@ -855,7 +856,7 @@ async fn emulate_network_conditions_offline_worker_fetch_emits_loading_failed()bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 2821,@@ -971,7 +972,7 @@ async fn emulate_network_conditions_offline_worker_xhr_emits_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 2826,@@ -1083,7 +1084,7 @@ async fn set_blocked_urls_runtime_xhr_emits_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);enable_network_domain(&mut ctx, 28_110, Some("SID-1")).await;ctx.process_async(json!({@@ -1172,7 +1173,7 @@ async fn set_blocked_urls_runtime_websocket_emits_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);enable_network_domain(&mut ctx, 28_160, Some("SID-1")).await;ctx.process_async(json!({@@ -1351,7 +1352,7 @@ async fn emulate_network_conditions_offline_navigation_fails_before_completion_ebc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 31,@@ -1393,7 +1394,7 @@ async fn emulate_network_conditions_offline_runtime_fetch_emits_loading_failed()bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 33,@@ -1507,7 +1508,7 @@ globalThis.__lm_after_blocked_parser_script = true;let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_010,diff --git a/moli-protocol/src/domains/network/tests/cache.rs b/moli-protocol/src/domains/network/tests/cache.rsindex 2ea7a0666..cf65aae46 100644--- a/moli-protocol/src/domains/network/tests/cache.rs+++ b/moli-protocol/src/domains/network/tests/cache.rs@@ -116,7 +116,8 @@ async fn cached_subresource_reload_emits_served_from_cache_before_response() {let mut browser_context = ctx.conn.new_browser_context("BID-1".to_owned());browser_context.set_active_target_id("TID-1");browser_context.attach_active_session("SID-1");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 70,@@ -277,7 +278,8 @@ async fn cached_main_document_navigation_emits_served_from_cache_before_responselet mut browser_context = ctx.conn.new_browser_context("BID-1".to_owned());browser_context.set_active_target_id("TID-1");browser_context.attach_active_session("SID-1");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 73,@@ -444,7 +446,7 @@ async fn clear_browser_cache_clears_response_body_and_stream_artifacts() {let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.record_captured_response_body("REQ-1".to_owned(), "body".to_owned(), [None]);bc.insert_io_stream("STREAM-1".to_owned(), b"payload".to_vec(), 0);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 4, "method": "Network.clearBrowserCache"})).await;@@ -476,7 +478,8 @@ async fn clear_browser_cache_clears_configured_disk_http_cache() {fetch_config,));let browser_context = ctx.conn.new_browser_context("BID-1".into());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 44, "method": "Network.clearBrowserCache"})).await;@@ -510,7 +513,8 @@ async fn clear_browser_cache_uses_browser_context_http_cache_owner() {));let mut browser_context = BrowserContext::new("BID-1".into());browser_context.http_cache_root = Some(cache_dir.clone());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 45, "method": "Network.clearBrowserCache"})).await;@@ -560,8 +564,9 @@ async fn clear_browser_cache_targets_command_session_browser_context() {);let mut ctx = TestContext::new();- ctx.conn.browser_context = Some(active);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn.install_browser_context_fixture_for_test(active);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 46,@@ -683,7 +688,7 @@ async fn clear_browser_cache_keeps_pending_response_navigation_transfer() {network_observation_journal: Default::default(),},);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 5, "method": "Network.clearBrowserCache"})).await;@@ -778,7 +783,7 @@ async fn devtools_set_cache_behavior_global_updates_existing_targets_and_defaultTargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let result = ctx.conn@@ -832,7 +837,7 @@ async fn devtools_set_cache_behavior_contexts_only_updates_requested_targets() {TargetIdentityState::about_blank(),TargetPageSlot::empty_for_test_fixture(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.conn.execute_devtools_command(crate::devtools_runtime::DevToolsCommand::SetCacheBehavior(diff --git a/moli-protocol/src/domains/network/tests/cookies.rs b/moli-protocol/src/domains/network/tests/cookies.rsindex 32fa90d4c..16e358bf0 100644--- a/moli-protocol/src/domains/network/tests/cookies.rs+++ b/moli-protocol/src/domains/network/tests/cookies.rs@@ -125,7 +125,7 @@ async fn set_user_agent_override_applies_to_subsequent_navigation_requests() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 30,@@ -192,7 +192,8 @@ async fn background_target_user_agent_override_reaches_replacement_document() {).expect("new BrowserContext owner should be live");ctx.conn.replace_standalone_navigation_engine(engine);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 35,@@ -328,7 +329,7 @@ async fn set_user_agent_override_applies_to_current_page_fetch_requests() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>ok</body>",Some("SID-1"),@@ -645,7 +646,7 @@ async fn network_set_cookie_uses_browser_context_default_cookie_url_when_missinglet mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-N6", "TID-N6");bc.set_target_url("https://example.com/path".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 46,diff --git a/moli-protocol/src/domains/network/tests/load_resource.rs b/moli-protocol/src/domains/network/tests/load_resource.rsindex d0918a70b..c8c978f35 100644--- a/moli-protocol/src/domains/network/tests/load_resource.rs+++ b/moli-protocol/src/domains/network/tests/load_resource.rs@@ -9,7 +9,8 @@ async fn install_loaded_page(ctx: &mut TestContext, page_url: &str) {let mut browser_context = ctx.conn.new_browser_context("BID-1".to_owned());browser_context.set_active_target_id(TARGET_ID);browser_context.attach_active_session(SESSION_ID);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(page_url, Some(SESSION_ID)).await;ctx.sent.clear();diff --git a/moli-protocol/src/domains/network/tests/navigation.rs b/moli-protocol/src/domains/network/tests/navigation.rsindex 26af6ecae..674324338 100644--- a/moli-protocol/src/domains/network/tests/navigation.rs+++ b/moli-protocol/src/domains/network/tests/navigation.rs@@ -39,7 +39,7 @@ async fn async_dispatch_updates_live_request_overrides_for_current_page() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>ok</body>",Some("SID-1"),@@ -122,7 +122,7 @@ async fn async_dispatch_offline_runtime_fetch_emits_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><body>offline</body></html>",Some("SID-1"),@@ -205,7 +205,7 @@ async fn main_document_navigation_emits_network_events_and_captures_response_bodlet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));@@ -425,7 +425,7 @@ async fn main_document_navigation_applies_extra_http_headers() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,@@ -514,7 +514,7 @@ async fn main_document_navigation_events_include_synthesized_cookie_header() {&[("set-cookie".to_owned(), "sid=1; Path=/page".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 4_1,@@ -610,7 +610,7 @@ async fn main_document_navigation_deduplicates_manual_cookie_header_when_store_s&[("set-cookie".to_owned(), "sid=store; Path=/page".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 4_3,@@ -711,7 +711,7 @@ async fn main_document_navigation_redirect_emits_second_request_with_redirect_re)],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_dom_events_for_test(Some("SID-1"));@@ -985,7 +985,7 @@ async fn main_document_critical_client_hint_restart_matches_chromium_network_chalet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.process_async(json!({@@ -1159,7 +1159,7 @@ async fn main_document_multi_hop_redirect_preserves_cookie_downgrade_report() {)],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 3_1,@@ -1258,7 +1258,7 @@ async fn browser_initiated_redirect_does_not_fabricate_renderer_navigation_requelet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,@@ -1328,7 +1328,7 @@ async fn main_document_request_cookie_report_is_snapshotted_before_response_setslet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 401,@@ -1389,7 +1389,7 @@ async fn first_main_document_transport_failure_commits_error_document() {bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");assert!(bc.assign_attached_session_to_target("TID-1", "SID-2".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.enable_page_events_for_test(Some("SID-2"));@@ -1626,7 +1626,7 @@ async fn main_document_navigation_failure_emits_one_failed_and_finished_terminallet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.process_async(json!({diff --git a/moli-protocol/src/domains/network/tests/response_body.rs b/moli-protocol/src/domains/network/tests/response_body.rsindex c44e13ab9..d580bb5e9 100644--- a/moli-protocol/src/domains/network/tests/response_body.rs+++ b/moli-protocol/src/domains/network/tests/response_body.rs@@ -40,7 +40,7 @@ async fn get_response_body_respects_recorded_session_visibility() {"aux-only body".to_owned(),[Some("SID-attached".to_owned())],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_280,@@ -82,7 +82,7 @@ async fn get_response_body_requires_calling_session_network_listener() {Some("SID-attached".to_owned()),],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_282,@@ -123,7 +123,7 @@ async fn get_response_body_reports_pending_body_as_existing_without_data() {.runtime_slot.enable_primary_network_events();bc.record_pending_response_body("REQ-pending".to_owned(), [None::<String>]);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_281,@@ -150,7 +150,7 @@ async fn get_response_body_ready_body_replaces_pending_body() {"ready body".to_owned(),[None::<String>],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_282,@@ -175,7 +175,7 @@ async fn get_response_body_rejects_bodies_over_materialization_limit() {.runtime_slot.enable_primary_network_events();bc.record_captured_response_body("REQ-large".to_owned(), "hello".to_owned(), [None::<String>]);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_282,@@ -202,7 +202,7 @@ async fn get_response_body_reports_default_single_resource_budget_eviction() {CapturedBody::from_bytes(vec![b'x'; 2_000_001]),[None::<String>],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_285,@@ -229,7 +229,7 @@ async fn get_response_body_base64_encodes_non_utf8_captured_bytes() {CapturedBody::from_bytes(vec![0x00, 0xff, b'a']),[None::<String>],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_283,@@ -272,7 +272,7 @@ async fn get_request_post_data_matches_chromium_errors_and_binary_encoding() {std::iter::empty::<String>(),false,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_284,@@ -337,7 +337,7 @@ async fn get_response_body_returns_partial_body_after_staged_loading_failed() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let handle = SubresourceNetworkRequestHandle::new(41);let document_url = Url::parse("https://example.test/page").unwrap();@@ -469,7 +469,7 @@ async fn get_request_post_data_respects_recorded_session_visibility() {std::iter::empty::<String>(),false,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_288,@@ -503,7 +503,7 @@ async fn get_request_post_data_returns_main_document_navigation_post_body() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let requested_url = Url::parse("http://127.0.0.1:1/post").unwrap();let navigation_state = NavigationDispatchState {@@ -558,7 +558,7 @@ async fn get_request_post_data_uses_text_projection_while_bidi_collector_keeps_tbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (result, _) = ctx.conn@@ -663,7 +663,7 @@ async fn get_network_data_returns_bidi_response_body_bytes() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (result, _) = ctx.conn@@ -1002,7 +1002,7 @@ async fn network_data_collectors_gate_get_data_disown_and_remove() {"pre collector body".to_owned(),[Some("bidi-session-1".to_owned())],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (collector, max_encoded_data_size) in [("collector-ok", 1000),@@ -1313,7 +1313,7 @@ async fn network_data_collector_body_persists_after_target_artifact_cleanup() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("bidi-session-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let collector_id =crate::devtools_runtime::DevToolsNetworkDataCollectorId::from("collector-persist");@@ -1468,7 +1468,7 @@ async fn network_data_explicit_collector_prefers_collected_body_over_stale_targelet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("bidi-session-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let collector_id =crate::devtools_runtime::DevToolsNetworkDataCollectorId::from("collector-shadow");@@ -1550,7 +1550,7 @@ async fn network_data_explicit_collector_rejects_unconfigured_data_type() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("bidi-session-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let collector_id =crate::devtools_runtime::DevToolsNetworkDataCollectorId::from("collector-request-only");@@ -1614,7 +1614,7 @@ async fn network_data_without_collector_requires_matching_collected_data_type()let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("bidi-session-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (result, _) = ctx.conn@@ -1691,7 +1691,7 @@ async fn network_data_collector_membership_uses_recorded_target_scope() {None,"about:blank".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (collector, target_id) in [("collector-active", "TID-active"),@@ -1814,7 +1814,7 @@ async fn network_data_collector_gated_body_without_match_is_not_readable() {None,"about:blank".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (result, _) = ctx.conn@@ -1893,7 +1893,7 @@ async fn get_network_data_reports_unimplemented_or_missing_data_with_bidi_errorslet mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.record_pending_response_body("REQ-pending".to_owned(), [None::<String>]);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (request_id, data_type, collector, expected_kind) in [(@@ -1992,7 +1992,7 @@ async fn main_document_navigation_get_response_body_preserves_binary_bytes() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_284,@@ -2082,7 +2082,7 @@ fetch('/binary')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_287,@@ -2209,7 +2209,7 @@ fetch("/upload", {method: "POST", body: formData})let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (result, _) = ctx.conndiff --git a/moli-protocol/src/domains/network/tests/runtime.rs b/moli-protocol/src/domains/network/tests/runtime.rsindex ca1a8d5bf..55732f3f4 100644--- a/moli-protocol/src/domains/network/tests/runtime.rs+++ b/moli-protocol/src/domains/network/tests/runtime.rs@@ -82,7 +82,7 @@ async fn runtime_capture_without_network_listener_does_not_advance_subresource_clet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;@@ -149,7 +149,7 @@ async fn runtime_script_uses_document_referer_and_script_cdp_initiator() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(Some("SID-1"));ctx.process_async(json!({@@ -250,7 +250,7 @@ async fn runtime_fetch_post_body_is_available_by_network_request_id() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.sent.clear();@@ -339,7 +339,7 @@ async fn runtime_form_post_navigation_body_is_available_by_network_request_id()let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.sent.clear();@@ -569,7 +569,7 @@ async fn rejected_websocket_handshake_emits_frame_error_then_closed() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.sent.clear();@@ -716,7 +716,7 @@ document.write('<script src="/written.js"><\/script>');let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_007,diff --git a/moli-protocol/src/domains/network/tests/service_worker.rs b/moli-protocol/src/domains/network/tests/service_worker.rsindex 88b73dd0b..0ae096f0c 100644--- a/moli-protocol/src/domains/network/tests/service_worker.rs+++ b/moli-protocol/src/domains/network/tests/service_worker.rs@@ -49,7 +49,8 @@ self.addEventListener("fetch", event => {let mut browser_context = BrowserContext::new("BID-1".to_owned());browser_context.set_active_target_id("TID-1");browser_context.attach_active_session("SID-1");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 80_000,diff --git a/moli-protocol/src/domains/network/tests/session.rs b/moli-protocol/src/domains/network/tests/session.rsindex fdf87e3c8..47194f488 100644--- a/moli-protocol/src/domains/network/tests/session.rs+++ b/moli-protocol/src/domains/network/tests/session.rs@@ -4,7 +4,8 @@ async fn install_network_session_page(ctx: &mut TestContext, url: &str) {let mut browser_context = BrowserContext::new("BID-navigation".into());browser_context.set_active_target_id("TID-navigation");browser_context.attach_active_session("SID-navigation");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async(url)@@ -218,7 +219,8 @@ async fn commit_configuration_resolves_the_exact_target_network_runtime() {Some("SID-b".to_owned()),"about:blank".to_owned(),));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);for (id, session_id, user_agent) in [(30, "SID-a", "Moli/Target-A"),@@ -261,7 +263,7 @@ async fn attached_network_enable_does_not_enable_primary_session() {bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 10_101,@@ -292,7 +294,7 @@ async fn page_network_policy_aggregates_enabled_sessions_like_chromium_handlers(bc.set_active_target_id("TID-1".to_owned());bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);for (id, session_id) in [(20_001, "SID-primary"), (20_002, "SID-attached")] {ctx.process_async(json!({@@ -487,7 +489,7 @@ async fn enable_after_page_load_does_not_replay_historical_subresource_events()let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let page = ctx.conn@@ -576,7 +578,7 @@ async fn attached_enable_after_pending_subresource_does_not_replay_history_to_nebc.set_active_target_id("TID-1");bc.attach_active_session("SID-primary");assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".into()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 10_121,@@ -685,7 +687,7 @@ async fn websocket_runtime_activity_broadcasts_to_attached_network_session() {bc.set_active_target_id("TID-1".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));bc.enable_attached_network_events("SID-attached");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-primary")).await;ctx.sent.clear();@@ -789,7 +791,7 @@ async fn attached_network_enable_after_websocket_activity_does_not_replay_histor.enable_primary_network_events();bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-primary")).await;ctx.sent.clear();@@ -895,7 +897,7 @@ async fn fetch_runtime_activity_broadcasts_to_attached_network_session() {bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));bc.enable_attached_network_events("SID-attached");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-primary")).await;ctx.sent.clear();@@ -1018,7 +1020,7 @@ async fn background_fetch_runtime_activity_broadcasts_to_attached_network_sessio"SID-attached-background".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-background")).await;@@ -1118,7 +1120,7 @@ async fn main_document_navigation_broadcasts_to_attached_network_session() {bc.attach_active_session("SID-primary".to_owned());assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));bc.enable_attached_network_events("SID-attached");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-primary")).await;ctx.sent.clear();@@ -1195,7 +1197,7 @@ async fn get_response_body_reads_background_attached_target_slot() {"SID-attached-background".to_owned()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);assert!(ctx.conn@@ -1256,7 +1258,7 @@ async fn network_disable_removes_session_response_body_visibility() {"aux-only body".to_owned(),[Some("SID-attached".to_owned())],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_290,@@ -1314,7 +1316,7 @@ async fn disable_clears_enabled_flag_and_captured_bodies() {.runtime_slot.enable_primary_network_events();bc.record_captured_response_body("REQ-1".to_owned(), "body".to_owned(), [None]);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 2, "method": "Network.disable"})).await;@@ -1347,7 +1349,7 @@ async fn primary_network_disable_preserves_attached_network_session() {Some("SID-attached".to_owned()),],);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 10_201,@@ -1432,7 +1434,7 @@ async fn parser_external_script_navigation_broadcasts_network_events_to_attachedbc.set_active_target_id("TID-1");bc.attach_active_session("SID-primary");assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".into()));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_050,@@ -1541,7 +1543,7 @@ async fn network_disable_suppresses_navigation_network_events() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,diff --git a/moli-protocol/src/domains/network/tests/subresource.rs b/moli-protocol/src/domains/network/tests/subresource.rsindex 954cb8c12..acd860eae 100644--- a/moli-protocol/src/domains/network/tests/subresource.rs+++ b/moli-protocol/src/domains/network/tests/subresource.rs@@ -154,7 +154,7 @@ fetch('/api')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 46,@@ -304,9 +304,23 @@ async fn enabling_and_disabling_sessions_replays_aggregated_headers_to_loaded_pabc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");assert!(bc.assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- ctx.conn.browser_context = Some(bc);- ctx.conn.register_bound_session_for_test("SID-1");- ctx.conn.register_bound_session_for_test("SID-attached");+ ctx.conn.install_browser_context_fixture_for_test(bc);+ for (session_id, session_key) in [+ ("SID-1", moli_page_types::DevToolsSessionKey::Primary),+ (+ "SID-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-attached".to_owned()),+ ),+ ] {+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-1".to_owned(),+ session_key,+ },+ );+ }ctx.process_async(json!({"id": 50_001,@@ -477,7 +491,7 @@ fetch('/binary')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_290,@@ -584,7 +598,7 @@ fetch('/slow')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_286,@@ -711,7 +725,7 @@ fetch('/slow-clone')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_328,@@ -823,7 +837,7 @@ fetch('/partial')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_380,@@ -969,7 +983,7 @@ fetch('/binary')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_294,@@ -1082,7 +1096,7 @@ fetch('/large-binary')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_316,@@ -1206,7 +1220,7 @@ fetch('/data')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7_299,@@ -1298,7 +1312,7 @@ fetch('/api')&[("set-cookie".to_owned(), "sid=1; Path=/api".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 491,@@ -1410,7 +1424,7 @@ xhr.send();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 60,@@ -1533,7 +1547,7 @@ xhr.send('challenge-payload');let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 64,@@ -1657,7 +1671,7 @@ xhr.send('challenge-payload');let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 66,@@ -1786,7 +1800,7 @@ async fn parser_external_script_applies_extra_http_headers() {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_000,@@ -1891,7 +1905,7 @@ async fn parser_blocking_stylesheet_emits_subresource_network_events_and_capturelet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_101,@@ -2030,7 +2044,7 @@ async fn parser_style_import_emits_subresource_network_events_and_captures_body(let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_201,@@ -2162,7 +2176,7 @@ async fn parser_external_script_emits_subresource_network_events_and_captures_bolet mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_004,@@ -2284,7 +2298,7 @@ worker.onmessage = event => {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 70_019,@@ -2380,7 +2394,7 @@ fetch('/api')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 40,@@ -2523,7 +2537,7 @@ document.body.setAttribute('data-xhr-status', String(xhr.status));let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 43,@@ -2653,7 +2667,7 @@ fetch('{api_url}').catch(() => {{ document.body.setAttribute('data-fetch-failed'let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 52,@@ -2767,7 +2781,7 @@ xhr.send();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 55,@@ -2894,7 +2908,7 @@ fetch('/api-start')let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 46,@@ -3091,7 +3105,7 @@ fetch('{start_url}', {{ credentials: 'include' }}))],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 471,@@ -3327,7 +3341,7 @@ fetch('{target_url}', {{ credentials: 'include' }})&[("set-cookie".to_owned(), "sid=1; Path=/".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 481,@@ -3420,7 +3434,7 @@ fetch('{target_url}')&[("set-cookie".to_owned(), "sid=1; Path=/; Secure".to_owned())],);}- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 483,@@ -3507,7 +3521,7 @@ xhr.send();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 49,diff --git a/moli-protocol/src/domains/observable_output/emission.rs b/moli-protocol/src/domains/observable_output/emission.rsindex b0a2f0c38..d302ffcc0 100644--- a/moli-protocol/src/domains/observable_output/emission.rs+++ b/moli-protocol/src/domains/observable_output/emission.rs@@ -416,7 +416,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.log_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let queue = TargetObservableOutputQueue::for_test(vec![ScriptObservableOutputItem::ConsoleMessage("warn: planned".to_owned()),@@ -554,7 +554,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.console_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let mut prepared_slot =observable_backlog_activity_outputs(&ctx.conn, None).into_prepared_slot();@@ -617,7 +617,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.console_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let mut prepared_slot =observable_backlog_activity_outputs(&ctx.conn, None).into_prepared_slot();@@ -679,7 +679,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.console_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let mut prepared_slot =observable_backlog_activity_outputs(&ctx.conn, None).into_prepared_slot();@@ -761,7 +761,7 @@ mod tests {.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.console_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);assert_eq!(observable_backlog_activity_outputs(&ctx.conn, Some("SID-background"))@@ -850,7 +850,7 @@ mod tests {.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.console_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (old_active_attachment, activated_attachment) = {let bc = ctx.conn.browser_context.as_ref().expect("browser context");@@ -960,7 +960,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.sent.clear();ctx.conn.evaluate_runtime_expression_with_await_async("console.warn('runtime prepared')", false)@@ -1019,7 +1019,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.sent.clear();let snapshot = RendererPageDiagnosticsSnapshot::from_runtime_observable_source(@@ -1075,7 +1075,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let snapshot = RendererPageDiagnosticsSnapshot::from_runtime_observable_source(RendererRuntimeObservableSourceSummary::from_source_messages(@@ -1134,7 +1134,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].console_output_session_state.renderer_runtime_agent_owns_page_console_api_events = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let console_only_snapshot = RendererPageDiagnosticsSnapshot::from_runtime_observable_source(RendererRuntimeObservableSourceSummary::from_source_messages(@@ -1208,7 +1208,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.conn.runtime_session_owner_slot_mut(None).expect("runtime slot should exist")@@ -1245,7 +1245,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let snapshot = RendererPageDiagnosticsSnapshot::from_runtime_observable_source(RendererRuntimeObservableSourceSummary::from_source_messages(@@ -1307,7 +1307,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.sent.clear();ctx.conn.evaluate_runtime_expression_with_await_async("console.warn('runtime old')", false)diff --git a/moli-protocol/src/domains/observable_output/presence.rs b/moli-protocol/src/domains/observable_output/presence.rsindex 16274e1b8..f4752591e 100644--- a/moli-protocol/src/domains/observable_output/presence.rs+++ b/moli-protocol/src/domains/observable_output/presence.rs@@ -587,7 +587,7 @@ mod tests {bc.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(17);- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);for session_id in enabled_session_ids {conn.with_target_devtools_session_state_for_session_mut(Some(session_id), |state| {state.runtime_session_state.runtime_frontend_enabled = true@@ -618,7 +618,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert_eq!(observable_source_activity_outputs(@@ -675,7 +675,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = false;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let outputs = observable_source_activity_outputs(&mut conn,@@ -721,7 +721,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(observable_source_activity_outputs(@@ -765,7 +765,7 @@ mod tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.log_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let outputs = observable_backlog_activity_outputs(&ctx.conn, None);assert_eq!(diff --git a/moli-protocol/src/domains/observable_output/runtime_emission.rs b/moli-protocol/src/domains/observable_output/runtime_emission.rsindex dc4787cc5..b7ab19117 100644--- a/moli-protocol/src/domains/observable_output/runtime_emission.rs+++ b/moli-protocol/src/domains/observable_output/runtime_emission.rs@@ -330,7 +330,7 @@ mod tests {assert!(inactive.assign_attached_session_to_target("TID-inactive", "SID-attached".to_owned()));- conn.inactive_browser_contexts.push(inactive);+ conn.push_inactive_browser_context_fixture_for_test(inactive);assert!(retain_unemitted_runtime_observable_prepared_source_for_session_owner(diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rsindex 39fb16345..06a1d93a3 100644--- a/moli-protocol/src/domains/page.rs+++ b/moli-protocol/src/domains/page.rs@@ -76,6 +76,38 @@ pub(in crate::domains) async fn dispose_session_async(.await}+/// Clears target-visible state owned by the primary Page session after every+/// per-session handler contribution has been removed.+pub(in crate::domains) async fn dispose_primary_session_target_state_async(+ conn: &mut CdpConnection,+ plan: &crate::conn::SessionDisposalPlan,+) -> anyhow::Result<()> {+ let session_id = plan.session_id();+ if let crate::conn::SessionDisposalTarget::PageTarget {+ browser_context_id,+ target_id,+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ } = plan.target()+ {+ let reset_result = match conn.browser_context_by_id_mut(browser_context_id) {+ Some(browser_context) => {+ browser_context+ .reset_primary_page_session_target_state_async(target_id, session_id)+ .await+ }+ None => Ok(false),+ };+ reset_result.and_then(|found| {+ anyhow::ensure!(+ found,+ "primary Page target disappeared during session disposal"+ );+ Ok(())+ })?;+ }+ Ok(())+}+fn missing_page_target_error_message(conn: &CdpConnection,session_id: Option<&str>,@@ -2683,7 +2715,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-title-source".into());bc.set_active_target_id("TID-title-source");bc.attach_active_session("SID-title-source");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let predecessor = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(@@ -2747,7 +2779,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-active");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-1");let source_document = renderer_document_identity_for_test(1, 1);let mut out: Vec<BackgroundProtocolEvent> = Vec::new();@@ -2814,7 +2846,7 @@ mod producer_tests {"SID-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = page_residence_identity_for_test(&mut conn, "SID-attached");let mut prepared =ProtocolOutputPayloads::from_slot(super::PagePreparedOutputSlot::from_outputs(@@ -2873,7 +2905,7 @@ mod producer_tests {"SID-detached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let completion = RendererJavaScriptDialogCompletion::pending();let mut prepared =ProtocolOutputPayloads::from_slot(super::PagePreparedOutputSlot::from_outputs(@@ -2900,6 +2932,7 @@ mod producer_tests {&moli_page_types::DevToolsSessionKey::Attached("SID-detached".to_owned()),));+ conn.rollback_attached_session_without_event("SID-detached");let mut out = Vec::new();super::emit_javascript_dialog_activity_background_events_async(@@ -2928,7 +2961,7 @@ mod producer_tests {"SID-source".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.set_auto_attach_owner(None, true, false, CdpTargetFilter::default_auto_attach());let page_owner = page_residence_identity_for_test(&mut conn, "SID-source");let source_document = renderer_document_identity_for_test(1, 1);@@ -2971,6 +3004,7 @@ mod producer_tests {&moli_page_types::DevToolsSessionKey::Attached("SID-source".to_owned()),));+ conn.rollback_attached_session_without_event("SID-source");let mut popup_output =ProtocolOutputPayloads::from_slot(super::PagePreparedOutputSlot::from_outputs(super::PagePreparedOutputs::from_popup_activations_for_test(@@ -3017,7 +3051,7 @@ mod producer_tests {let mut browser_context = BrowserContext::new("BID-popup-dialog".into());browser_context.set_active_target_id("TID-opener");browser_context.attach_active_session("SID-opener");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.set_auto_attach_owner(None, true, false, CdpTargetFilter::default_auto_attach());let page_owner = page_residence_identity_for_test(&mut conn, "SID-opener");let source_dialog_scope = javascript_dialog_scope_for_test(&conn, "SID-opener");@@ -3172,7 +3206,7 @@ mod producer_tests {let mut browser_context = BrowserContext::new("BID-popup-no-session".into());browser_context.set_active_target_id("TID-opener-no-session");browser_context.attach_active_session("SID-opener-no-session");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page_owner = page_residence_identity_for_test(&mut conn, "SID-opener-no-session");let source_document = renderer_document_identity_for_test(1, 1);let completion = RendererJavaScriptDialogCompletion::pending();@@ -3246,7 +3280,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-dialog-epoch".into());bc.set_active_target_id("TID-dialog-epoch");bc.attach_active_session("SID-dialog-epoch");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let first_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -3293,7 +3327,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-dialog-stale-page".into());bc.set_active_target_id("TID-dialog-stale-page");bc.attach_active_session("SID-dialog-stale-page");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-dialog-stale-page");let completion = moli_core::page::RendererJavaScriptDialogCompletion::pending();let dialog = renderer_javascript_dialog_for_test(@@ -3346,7 +3380,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-dialog-generation".into());bc.set_active_target_id("TID-dialog-generation");bc.attach_active_session("SID-dialog-generation");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-dialog-generation");let completion = moli_core::page::RendererJavaScriptDialogCompletion::pending();let dialog = renderer_javascript_dialog_for_test(@@ -3394,7 +3428,7 @@ mod producer_tests {bc.set_active_target_id("TID-dialog-source");bc.set_target_url("https://example.test/current-before-capture".to_owned());bc.attach_active_session("SID-dialog-source");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-dialog-source");let dialog = RendererPendingJavaScriptDialog::new(RendererJavaScriptDialogId::new(9),@@ -3456,7 +3490,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_file_chooser_opened_event_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -3617,7 +3651,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -3787,7 +3821,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);let mut background_events = Vec::new();@@ -3867,7 +3901,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);let mut background_events = Vec::new();@@ -3938,7 +3972,7 @@ mod producer_tests {"SID-attached".to_owned(),));- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);conn.with_target_devtools_session_state_for_session_mut(Some("SID-attached"), |state| {state.page_session_state.page_domain_enabled = true;state.page_session_state.page_lifecycle_events = true;@@ -4003,7 +4037,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);let mut background_events = Vec::new();@@ -4065,7 +4099,7 @@ mod producer_tests {bc.set_target_url("https://example.test/page".to_owned());bc.attach_active_session("SID-1");assert!(bc.assign_attached_session_to_target("TID-1", "SID-ATTACHED".to_owned(),));- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(conn.enable_network_listener_for_session_owner(Some("SID-1")));assert!(conn.enable_network_listener_for_session_owner(Some("SID-ATTACHED")));let source_document = renderer_document_identity_for_test(1, 1);@@ -4214,7 +4248,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(conn.enable_network_listener_for_session_owner(Some("SID-1")));let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);@@ -4332,7 +4366,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);assert!(conn.enable_network_listener_for_session_owner(Some("SID-1")));let snapshot = ChildFrameDocumentNetworkSnapshot {request_url: "https://example.test/legacy-child".to_owned(),@@ -4390,7 +4424,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);let document = super::PagePreparedChildFrameDocumentActivity::from_parts(@@ -4471,7 +4505,7 @@ mod producer_tests {browser_context.set_active_target_id("TID-child-page-owner");browser_context.set_target_url("https://example.test/page".to_owned());browser_context.attach_active_session("SID-child-page-owner");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -4508,7 +4542,7 @@ mod producer_tests {browser_context.set_active_target_id("TID-child-root-document");browser_context.set_target_url("https://example.test/page".to_owned());browser_context.attach_active_session("SID-child-root-document");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -4552,7 +4586,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -4599,7 +4633,7 @@ mod producer_tests {browser_context.set_active_target_id("TID-child-session");browser_context.set_target_url("https://example.test/page".to_owned());browser_context.attach_active_session("SID-child-session");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn,@@ -4620,6 +4654,7 @@ mod producer_tests {.as_deref(),Some("SID-child-session"));+ conn.rollback_attached_session_without_event("SID-child-session");let mut events = Vec::new();super::emit_prepared_child_frame_activity(&mut conn, &mut events, activity, None).await;@@ -4645,7 +4680,7 @@ mod producer_tests {[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_domain_enabled = true;- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let child_frame_id = "CHILD-FRAME-1".to_owned();let mut emitted = Vec::new();super::emit_prepared_child_frame_tree_background_events(@@ -4703,7 +4738,7 @@ mod producer_tests {bc.set_active_target_id("TID-1");bc.set_target_url("https://example.test/page".to_owned());bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let owner = crate::conn::CommandOwnerScope::for_session("SID-1");let mut command_context = crate::conn::CommandDispatchContext::default();let mut context = ProtocolOutputProjectionContext::new(&owner, &mut command_context);@@ -4725,7 +4760,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-active");bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-1");let source_document = renderer_document_identity_for_test(1, 1);let mut out = Vec::new();@@ -4808,7 +4843,7 @@ mod producer_tests {let mut bc = BrowserContext::new("BID-automation".into());bc.set_active_target_id("TID-opener");bc.attach_active_session("SID-opener");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let page_owner = page_residence_identity_for_test(&mut conn, "SID-opener");let source_document = renderer_document_identity_for_test(1, 1);let mut prepared =@@ -4879,7 +4914,7 @@ mod producer_tests {bc.set_active_target_id("TID-1");bc.set_target_url("https://example.test/page".to_owned());bc.attach_active_session("SID-1");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-1", "TID-1", source_document);let mut out = Vec::new();@@ -4953,7 +4988,7 @@ mod producer_tests {bc.set_active_target_id("TID-document-open-same-document");bc.set_target_url("https://example.test/source".to_owned());bc.attach_active_session("SID-document-open-same-document");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);let replacement_document = renderer_document_identity_for_test(2, 2);@@ -5009,7 +5044,7 @@ mod producer_tests {bc.set_active_target_id("TID-stale-page-same-document");bc.set_target_url("https://example.test/replacement".to_owned());bc.attach_active_session("SID-stale-page-same-document");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(@@ -5060,7 +5095,7 @@ mod producer_tests {bc.set_active_target_id("TID-location");bc.set_target_url("about:blank".to_owned());bc.attach_active_session("SID-location");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(&mut conn, "SID-location", "TID-location", source_document);@@ -5134,7 +5169,7 @@ mod producer_tests {bc.set_active_target_id("TID-document-open-location");bc.set_target_url("https://example.test/source".to_owned());bc.attach_active_session("SID-document-open-location");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);let replacement_document = renderer_document_identity_for_test(2, 2);@@ -5199,7 +5234,7 @@ mod producer_tests {bc.set_active_target_id("TID-stale-page-location");bc.set_target_url("https://example.test/replacement".to_owned());bc.attach_active_session("SID-stale-page-location");- conn.browser_context = Some(bc);+ conn.install_browser_context_fixture_for_test(bc);let source_document = renderer_document_identity_for_test(1, 1);bind_renderer_document_for_test(diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rsindex 33833dda1..09855f423 100644--- a/moli-protocol/src/domains/page/tests/capture.rs+++ b/moli-protocol/src/domains/page/tests/capture.rs@@ -497,7 +497,7 @@ async fn capture_screenshot_targets_loaded_background_owner_without_activation()bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<title>Background Screenshot</title><main>background</main>",Some("SID-background"),@@ -568,7 +568,8 @@ async fn capture_screenshot_targets_inactive_loaded_owner_without_activation() {screen_height: 300,});inactive.replace_loaded_page(Some(page));- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 115,@@ -959,7 +960,7 @@ async fn get_layout_metrics_targets_loaded_background_owner_without_activation()bc.attach_active_session("SID-active".to_owned());bc.set_target_url("data:text/html,<body>active</body>".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-background")).await;ctx.sent.clear();@@ -1011,7 +1012,8 @@ async fn get_layout_metrics_targets_inactive_loaded_owner_without_activation() {inactive.set_active_target_id("TID-inactive".to_owned());inactive.attach_active_session("SID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-inactive")).await;ctx.sent.clear();diff --git a/moli-protocol/src/domains/page/tests/dialog.rs b/moli-protocol/src/domains/page/tests/dialog.rsindex ad63b54f4..e465e9c7c 100644--- a/moli-protocol/src/domains/page/tests/dialog.rs+++ b/moli-protocol/src/domains/page/tests/dialog.rs@@ -560,6 +560,7 @@ async fn javascript_dialog_pending_state_is_session_local_for_active_attached_sebrowser_context.assign_attached_session_to_target("TID-dialog-attached", "SID-attached".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();push_dialog_for_session(&mut ctx,Some("SID-attached"),diff --git a/moli-protocol/src/domains/page/tests/frame_tree.rs b/moli-protocol/src/domains/page/tests/frame_tree.rsindex 8b546203e..c0d59d40f 100644--- a/moli-protocol/src/domains/page/tests/frame_tree.rs+++ b/moli-protocol/src/domains/page/tests/frame_tree.rs@@ -565,7 +565,7 @@ async fn get_frame_tree_targets_loaded_background_owner_without_activation() {bc.attach_active_session("SID-active".to_owned());bc.set_target_url("data:text/html,<body>active</body>".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-background")).await;ctx.sent.clear();@@ -606,7 +606,8 @@ async fn get_frame_tree_targets_inactive_loaded_owner_without_activation() {inactive.set_active_target_id("TID-inactive".to_owned());inactive.attach_active_session("SID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.install_navigation_fixture_for_session_owner(page_url, Some("SID-inactive")).await;ctx.sent.clear();diff --git a/moli-protocol/src/domains/page/tests/lifecycle.rs b/moli-protocol/src/domains/page/tests/lifecycle.rsindex f146f1f07..4bc10efa0 100644--- a/moli-protocol/src/domains/page/tests/lifecycle.rs+++ b/moli-protocol/src/domains/page/tests/lifecycle.rs@@ -696,7 +696,8 @@ async fn page_set_download_behavior_reuses_browser_download_state() {let mut ctx = TestContext::new();let mut browser_context = BrowserContext::new("BID-PAGE-DOWNLOAD".into());browser_context.set_active_target_id("TID-PAGE-DOWNLOAD");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 103,@@ -736,10 +737,11 @@ async fn page_set_download_behavior_uses_current_page_context_not_param_context(let mut ctx = TestContext::new();let mut active = BrowserContext::new("BID-PAGE-DOWNLOAD-ACTIVE".into());active.set_active_target_id("TID-PAGE-DOWNLOAD-ACTIVE");- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-PAGE-DOWNLOAD-OTHER".into());inactive.set_active_target_id("TID-PAGE-DOWNLOAD-OTHER");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 105,@@ -804,7 +806,7 @@ async fn set_lifecycle_events_enabled_sets_flag() {let mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-1".into());bc.set_active_target_id("TID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1, "method": "Page.setLifecycleEventsEnabled","params": {"enabled": true}})).await;@@ -1024,6 +1026,7 @@ async fn set_lifecycle_events_enabled_is_session_local_for_active_attached_sessiassert!(browser_context.assign_attached_session_to_target("TID-active", "SID-attached".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();let (binding, initial_events) = ctx.conn.bind_renderer_document_lifecycle_for_owner(&crate::conn::CommandOwnerScope::for_session("SID-attached"),artifacts,@@ -1105,7 +1108,8 @@ async fn set_lifecycle_events_enabled_is_session_local_for_background_attached_s"SID-background-attached".to_owned()));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background attached lifecycle</body>",Some("SID-background-attached"),@@ -1180,6 +1184,7 @@ async fn page_disable_clears_page_handler_state_for_active_attached_session() {assert!(browser_context.assign_attached_session_to_target("TID-active", "SID-attached".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();enable_page_domain_for_session(&mut ctx.conn, "SID-attached");assert_page_domain_enabled(@@ -1236,7 +1241,8 @@ async fn page_disable_clears_page_handler_state_for_background_attached_session(.page_session_state,);}- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);enable_page_domain_for_session(&mut ctx.conn, "SID-background-attached");assert_page_domain_enabled(@@ -2255,7 +2261,7 @@ async fn document_start_script_run_immediately_targets_loaded_background_owner_wbc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background</body>",Some("SID-background"),@@ -2704,7 +2710,7 @@ async fn crash_targets_background_owner_without_activation() {.expect("background target should start document navigation");bc.commit_document_navigation_if_matches(&background_document_token);assert!(bc.accepts_document_body_completion_event(&background_document_token));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 248,@@ -3884,6 +3890,7 @@ async fn screencast_visual_state_is_independent_for_two_sessions_on_one_page() {"SID-screencast-attached".to_owned(),));+ ctx.conn.commit_declared_session_fixtures_for_test();ensure_initial_document_for_session(&mut ctx, Some("SID-screencast-primary")).await;let start = |conn: &mut CdpConnection, session_id: &str, command_id: u64| {@@ -4082,7 +4089,8 @@ async fn start_screencast_is_session_local_for_background_attached_session() {"SID-background-attached".to_owned()));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 57,diff --git a/moli-protocol/src/domains/page/tests/mod.rs b/moli-protocol/src/domains/page/tests/mod.rsindex 4ff868ce8..79f7fe6c1 100644--- a/moli-protocol/src/domains/page/tests/mod.rs+++ b/moli-protocol/src/domains/page/tests/mod.rs@@ -162,7 +162,7 @@ fn load_bc_with_target(ctx: &mut TestContext, bc_id: &str, target_id: &str, url:let mut bc = BrowserContext::new(bc_id.into());bc.set_active_target_id(target_id);bc.set_target_url(url.into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn load_bc_with_session(ctx: &mut TestContext,@@ -183,7 +183,15 @@ fn load_bc_with_session(url.to_owned(),Some(url.to_owned()),);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: bc_id.to_owned(),+ target_id: target_id.to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ );}fn load_bc_with_service_worker_target(ctx: &mut TestContext) {let mut bc = BrowserContext::new("BID-service-worker-frame-tree".to_owned());@@ -197,13 +205,13 @@ fn load_bc_with_service_worker_target(ctx: &mut TestContext) {None,);bc.insert_service_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}async fn ensure_initial_document_for_session(ctx: &mut TestContext, session_id: Option<&str>) {let owner = match session_id {Some(session_id) => crate::conn::CommandOwnerScope::for_route(ctx.conn- .bound_session_route_for_test(session_id, None)+ .session_route(Some(session_id)).expect("test session must own a concrete target route"),),None => crate::conn::CommandOwnerScope::capture(&ctx.conn, None),diff --git a/moli-protocol/src/domains/page/tests/navigation.rs b/moli-protocol/src/domains/page/tests/navigation.rsindex ffc0600eb..b6fca0752 100644--- a/moli-protocol/src/domains/page/tests/navigation.rs+++ b/moli-protocol/src/domains/page/tests/navigation.rs@@ -1305,7 +1305,7 @@ async fn get_navigation_history_targets_loaded_background_owner_without_activatibc.attach_active_session("SID-active".to_owned());bc.set_target_url("data:text/html,<title>Active</title><main>active</main>".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(background_url, Some("SID-background")).await;ctx.sent.clear();@@ -1351,7 +1351,8 @@ async fn reset_navigation_history_targets_loaded_background_owner_without_activabrowser_context.set_target_url("data:text/html,<title>Active</title><main>active</main>".to_owned());browser_context.insert_page_target_host(background);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(background_url, Some("SID-background-reset")).await;ctx.sent.clear();@@ -1404,7 +1405,7 @@ async fn navigate_to_history_entry_targets_background_owner_without_activation()Some("SID-background".to_owned()),"about:blank".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let first_url = "data:text/html,<title>Background A</title><main>a</main>";let second_url = "data:text/html,<title>Background B</title><main>b</main>";@@ -1488,7 +1489,8 @@ async fn get_navigation_history_targets_inactive_loaded_owner_without_activation.active_page_target_mut().runtime_slot.replace_loaded_page(Some(page));- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 16,@@ -1589,7 +1591,7 @@ async fn navigate_targets_background_owner_without_activation() {Some("SID-background".to_owned()),"about:blank".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let background_url = "data:text/html,<title>Background</title><main>background</main>";ctx.process_async(json!({@@ -1627,7 +1629,8 @@ async fn navigate_targets_inactive_owner_without_activation() {inactive.set_active_target_id("TID-inactive".to_owned());inactive.attach_active_session("SID-inactive".to_owned());inactive.set_target_url("about:blank".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);let inactive_url = "data:text/html,<title>Inactive</title><main>inactive</main>";ctx.process_async(json!({@@ -3550,6 +3553,7 @@ async fn navigate_with_staged_attached_runtime_enable_emits_context_created_for_.unwrap().assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn.with_target_devtools_session_state_for_session_mut(Some("SID-1"), |state| {state.runtime_session_state.runtime_frontend_enabled = true;@@ -6056,7 +6060,7 @@ async fn reload_targets_background_owner_without_activation() {bc.attach_active_session("SID-active".to_owned());bc.set_target_url("data:text/html,<title>Active</title><main>active</main>".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-background")).await;let initial_html = ctxdiff --git a/moli-protocol/src/domains/page/tests/scripts.rs b/moli-protocol/src/domains/page/tests/scripts.rsindex 00a8c3a57..18cd67210 100644--- a/moli-protocol/src/domains/page/tests/scripts.rs+++ b/moli-protocol/src/domains/page/tests/scripts.rs@@ -1605,7 +1605,7 @@ async fn create_isolated_world_targets_loaded_background_owner_without_activatiobc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<body>background</body>",Some("SID-background"),diff --git a/moli-protocol/src/domains/performance.rs b/moli-protocol/src/domains/performance.rsindex b9faad18c..8e08953db 100644--- a/moli-protocol/src/domains/performance.rs+++ b/moli-protocol/src/domains/performance.rs@@ -673,7 +673,7 @@ mod tests {bc.set_active_target_id("TID-1".to_owned());bc.set_target_url("data:text/html,performance-test".to_owned());bc.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-1"),@@ -813,11 +813,14 @@ mod tests {.expect("browser context").assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));- let owner = crate::conn::CommandOwnerScope::for_route(- ctx.conn- .bound_session_route_for_test("SID-attached", Some("TID-1"))- .expect("attached test session must own its Page route"),- );+ let route = crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-1".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Attached("SID-attached".to_owned()),+ };+ ctx.conn+ .register_session_route_for_test("SID-attached", route.clone());+ let owner = crate::conn::CommandOwnerScope::for_route(route);ctx.conn.apply_runtime_binding_state_for_owner_async(&owner).await@@ -934,7 +937,8 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(active_url,Some("SID-performance-active"),@@ -1039,7 +1043,7 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(background_url, Some("SID-background")).await;@@ -1085,7 +1089,7 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 7,@@ -1136,7 +1140,7 @@ mod tests {None,None,);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 5,diff --git a/moli-protocol/src/domains/runtime.rs b/moli-protocol/src/domains/runtime.rsindex 401960ced..984dda395 100644--- a/moli-protocol/src/domains/runtime.rs+++ b/moli-protocol/src/domains/runtime.rs@@ -45,21 +45,45 @@ pub(in crate::domains) async fn detach_page_session_inspector_async(}}-/// Releases Runtime state and the renderer Inspector endpoint owned by one-/// Worker session. The binding described by `plan` remains authoritative for-/// the whole operation.-pub(in crate::domains) async fn dispose_worker_session_async(+/// Disables Runtime state owned by one DevTools session. Renderer Inspector+/// detachment is a separate lifecycle phase and runs after every browser-side+/// domain handler has disabled itself.+pub(in crate::domains) async fn dispose_session_handler_async(conn: &mut CdpConnection,background_events: &mut Vec<BackgroundProtocolEvent>,protocol_events: &mut Vec<BackgroundProtocolEvent>,plan: &SessionDisposalPlan,) -> anyhow::Result<()> {let session_id = plan.session_id();- conn.release_worker_runtime_remote_objects_for_session_best_effort_async(session_id)- .await;- fail_pending_session_calls(conn, background_events, protocol_events, session_id);+ match plan.target() {+ SessionDisposalTarget::PageTarget { .. }+ | SessionDisposalTarget::SharedWorkerTarget { .. }+ | SessionDisposalTarget::DedicatedWorkerTarget { .. }+ | SessionDisposalTarget::ServiceWorkerTarget { .. } => {+ if !matches!(plan.target(), SessionDisposalTarget::PageTarget { .. }) {+ conn.release_worker_runtime_remote_objects_for_session_best_effort_async(+ session_id,+ )+ .await;+ }+ fail_pending_session_calls(conn, background_events, protocol_events, session_id);+ }+ SessionDisposalTarget::Browser | SessionDisposalTarget::TabTarget { .. } => {}+ }+ Ok(())+}+/// Detaches the renderer-side Inspector endpoint after every browser-side+/// domain handler has disabled itself.+pub(in crate::domains) async fn detach_session_inspector_async(+ conn: &mut CdpConnection,+ plan: &SessionDisposalPlan,+) -> anyhow::Result<()> {+ let session_id = plan.session_id();match plan.target() {+ SessionDisposalTarget::PageTarget { .. } => {+ detach_page_session_inspector_async(conn, session_id).await;+ }SessionDisposalTarget::SharedWorkerTarget {browser_context_id,target_id,@@ -122,7 +146,6 @@ pub(in crate::domains) async fn dispose_worker_session_async()})});- super::target::set_service_worker_pause_on_start_owner(conn, Some(session_id), false);if let Some((renderer_runtime, version_id)) = renderer_detach {renderer_runtime.detach_service_worker_runtime_inspector_session(version_id,@@ -130,9 +153,7 @@ pub(in crate::domains) async fn dispose_worker_session_async();}}- SessionDisposalTarget::Browser- | SessionDisposalTarget::PageTarget { .. }- | SessionDisposalTarget::TabTarget { .. } => anyhow::bail!("InvalidSessionId"),+ SessionDisposalTarget::Browser | SessionDisposalTarget::TabTarget { .. } => {}}Ok(())}diff --git a/moli-protocol/src/domains/runtime/activity.rs b/moli-protocol/src/domains/runtime/activity.rsindex 1feffb418..3c4dff66c 100644--- a/moli-protocol/src/domains/runtime/activity.rs+++ b/moli-protocol/src/domains/runtime/activity.rs@@ -634,7 +634,7 @@ mod tests {.active_page_target_mut().runtime_slot.replace_loaded_page(Some(page));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn runtime_binding_attachment_fixture() -> (@@ -649,7 +649,7 @@ mod tests {.active_page_target_mut().runtime_slot.set_page_attachment_id_for_test(1);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let attachment = conn.target_page_protocol_attachment_identity_for_session(Some("SID-1")).expect("exact Runtime binding attachment");@@ -869,6 +869,7 @@ mod tests {.as_deref(),Some("SID-1"),);+ ctx.conn.rollback_attached_session_without_event("SID-1");assert!(drain_runtime_inspector_outputs(&mut ctx.conn, outputs_after_detach, None).await@@ -1006,6 +1007,7 @@ mod tests {.as_deref(),Some("SID-1"),);+ conn.rollback_attached_session_without_event("SID-1");let owner = crate::conn::CommandOwnerScope::capture(&conn, None);let mut command_context = CommandDispatchContext::default();let mut context = ProtocolOutputProjectionContext::new(&owner, &mut command_context);@@ -1104,6 +1106,7 @@ mod tests {.as_deref(),Some("SID-1"),);+ ctx.conn.rollback_attached_session_without_event("SID-1");let events = drain_runtime_inspector_outputs(&mut ctx.conn, outputs, None).await;assert!(@@ -1123,6 +1126,7 @@ mod tests {.expect("browser context").assign_attached_session_to_target("TID-1", "SID-attached".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();let outputs = renderer_inspector_outputs(&mut ctx.conn,Some("SID-1"),diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rsindex 4eede3fc4..831c88ec3 100644--- a/moli-protocol/src/domains/runtime/dispatcher.rs+++ b/moli-protocol/src/domains/runtime/dispatcher.rs@@ -11542,7 +11542,7 @@ mod protocol_neutral_tests {let mut browser_context = BrowserContext::new("BID-duplicate".to_owned());browser_context.set_active_target_id("TID-duplicate".to_owned());browser_context.attach_active_session("SID-duplicate".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.try_register_pending_inspector_await_with_object_group_for_owner(77,&CommandOwnerScope::for_session("SID-duplicate"),@@ -11599,7 +11599,8 @@ mod protocol_neutral_tests {let mut browser_context = BrowserContext::new("BID-console-duplicate".to_owned());browser_context.set_active_target_id("TID-console-duplicate".to_owned());browser_context.attach_active_session("SID-console-duplicate".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let page = ctx.conn.load_page_via_runtime_async("data:text/html,<p>console duplicate</p>")@@ -11707,7 +11708,7 @@ mod protocol_neutral_tests {stack: None,});browser_context.insert_shared_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);apply_shared_worker_runtime_completion_projection(&mut conn,diff --git a/moli-protocol/src/domains/runtime/tests/bindings.rs b/moli-protocol/src/domains/runtime/tests/bindings.rsindex ce9d3b12f..4257f092d 100644--- a/moli-protocol/src/domains/runtime/tests/bindings.rs+++ b/moli-protocol/src/domains/runtime/tests/bindings.rs@@ -319,6 +319,7 @@ async fn add_binding_during_document_navigation_persists_without_touching_retiribrowser_context.start_document_navigation_for_active_target("PENDING-LOADER".to_owned()).expect("active navigation should start");+ ctx.conn.commit_declared_session_fixtures_for_test();assert!(ctx.conn.renderer_document_navigation_is_suspended_for_session_owner(Some("SID-1"))@@ -1365,6 +1366,7 @@ async fn pre_document_add_binding_completes_through_command_task_without_live_pa.expect("browser context should exist");bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");+ ctx.conn.commit_declared_session_fixtures_for_test();let raw = json!({"id": 36_001,@@ -1504,6 +1506,7 @@ async fn pre_document_remove_binding_completes_through_command_task_without_live.expect("browser context should exist");bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");+ ctx.conn.commit_declared_session_fixtures_for_test();let add_raw = json!({"id": 36_101,diff --git a/moli-protocol/src/domains/runtime/tests/console.rs b/moli-protocol/src/domains/runtime/tests/console.rsindex 8898c8498..294eaf7e9 100644--- a/moli-protocol/src/domains/runtime/tests/console.rs+++ b/moli-protocol/src/domains/runtime/tests/console.rs@@ -63,7 +63,8 @@ async fn runtime_discard_console_entries_is_page_target_local() {browser_context.set_active_target_id("TID-active");browser_context.attach_active_session("SID-active");browser_context.insert_page_target_host(background_target);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner("data:text/html,<script>console.log('active-discard-peer')</script>",Some("SID-active"),diff --git a/moli-protocol/src/domains/runtime/tests/evaluate.rs b/moli-protocol/src/domains/runtime/tests/evaluate.rsindex 451152c56..ede3c3abe 100644--- a/moli-protocol/src/domains/runtime/tests/evaluate.rs+++ b/moli-protocol/src/domains/runtime/tests/evaluate.rs@@ -1817,6 +1817,7 @@ async fn evaluate_started_before_pending_navigation_can_complete() {browser_context.set_active_target_id("TID-1");browser_context.attach_active_session("SID-1");browser_context.set_target_url("data:text/html,previous".to_owned());+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.sent.clear();let step = ctx.conn.start_command_dispatch(@@ -1871,6 +1872,7 @@ async fn evaluate_rejects_attached_session_while_main_document_navigation_is_penbrowser_context.start_document_navigation_for_active_target("PENDING-LOADER".to_owned()).expect("active navigation should start");+ ctx.conn.commit_declared_session_fixtures_for_test();assert!(ctx.conn.has_pending_document_navigation_for_session_owner(Some("SID-attached")),@@ -1938,7 +1940,8 @@ async fn document_navigation_gate_is_scoped_to_background_target_owner() {.runtime_session_state.runtime_frontend_enabled = true;browser_context.insert_page_target_host(background_target);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><title>active</title></html>",Some("SID-active"),@@ -6743,7 +6746,8 @@ async fn registered_named_world_object_handles_remain_callable_after_navigation(let mut other_context = crate::conn::BrowserContext::new("BID-2".into());other_context.set_active_target_id("TID-2");other_context.attach_active_session("SID-2");- ctx.conn.inactive_browser_contexts.push(other_context);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(other_context);assert!(ctx.conn.activate_browser_context_by_id_async("BID-2").await,"test setup should switch the active context away from the pending Runtime.callFunctionOn owner"@@ -6795,7 +6799,8 @@ async fn call_function_on_rejects_object_id_known_to_different_target_owner() {let mut other_context = crate::conn::BrowserContext::new("BID-2".into());other_context.set_active_target_id("TID-2");other_context.attach_active_session("SID-2");- ctx.conn.inactive_browser_contexts.push(other_context);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(other_context);ctx.process_async(json!({"id": 513,@@ -6981,7 +6986,8 @@ async fn call_function_on_rejects_dom_resolve_node_object_id_from_different_targlet mut other_context = crate::conn::BrowserContext::new("BID-2".into());other_context.set_active_target_id("TID-2");other_context.attach_active_session("SID-2");- ctx.conn.inactive_browser_contexts.push(other_context);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(other_context);ctx.process_async(json!({"id": 518,diff --git a/moli-protocol/src/domains/runtime/tests/inspector.rs b/moli-protocol/src/domains/runtime/tests/inspector.rsindex 65106b0c9..f0888aadb 100644--- a/moli-protocol/src/domains/runtime/tests/inspector.rs+++ b/moli-protocol/src/domains/runtime/tests/inspector.rs@@ -86,6 +86,7 @@ async fn runtime_evaluate_materializes_default_context_via_inspector_hook() {bc.active_page_target_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.sent.clear();let before = ctx@@ -138,6 +139,7 @@ async fn pending_inspector_await_does_not_block_default_context_evaluate() {bc.active_page_target_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn.register_pending_inspector_await(900_199, Some("SID-1"));ctx.sent.clear();diff --git a/moli-protocol/src/domains/runtime/tests/mod.rs b/moli-protocol/src/domains/runtime/tests/mod.rsindex c4031f75b..4c0e7e4c1 100644--- a/moli-protocol/src/domains/runtime/tests/mod.rs+++ b/moli-protocol/src/domains/runtime/tests/mod.rs@@ -43,7 +43,7 @@ fn load_shared_worker_target(ctx: &mut TestContext, session_id: &str) {);target.attach_session(session_id.to_owned());bc.insert_shared_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn load_dedicated_worker_target(ctx: &mut TestContext, session_id: &str) {let browser_context_id = "BID-dedicated".to_owned();@@ -58,7 +58,7 @@ fn load_dedicated_worker_target(ctx: &mut TestContext, session_id: &str) {);target.attach_session(session_id.to_owned());bc.insert_dedicated_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn record_shared_worker_console(ctx: &mut TestContext, session_id: &str, message: &str) {ctx.conn@@ -157,7 +157,8 @@ async fn push_loaded_runtime_frontend_enabled_background_context_async(.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled = true;- ctx.conn.inactive_browser_contexts.push(background_context);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(background_context);}async fn with_loaded_runtime_frontend_enabled_background_target_async(ctx: &mut TestContext,@@ -185,7 +186,8 @@ async fn with_loaded_runtime_frontend_enabled_background_target_async(.runtime_session_state.runtime_frontend_enabled = true;}- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some(background_session_id),diff --git a/moli-protocol/src/domains/runtime/tests/navigation.rs b/moli-protocol/src/domains/runtime/tests/navigation.rsindex f68557586..3712007a2 100644--- a/moli-protocol/src/domains/runtime/tests/navigation.rs+++ b/moli-protocol/src/domains/runtime/tests/navigation.rs@@ -7,7 +7,7 @@ async fn enable_with_background_event_sender_defers_initial_document_page_build(bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");bc.set_target_url("about:blank".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let (background_tx, _) = tokio::sync::mpsc::unbounded_channel();let (completion_tx, _) =@@ -95,7 +95,7 @@ async fn enable_reports_no_document_without_legacy_materialization_adapter() {bc.set_active_target_id("TID-1");bc.attach_active_session("SID-1");bc.set_target_url("about:blank".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 21_002,diff --git a/moli-protocol/src/domains/runtime/tests/objects.rs b/moli-protocol/src/domains/runtime/tests/objects.rsindex e5aaafe21..83f807886 100644--- a/moli-protocol/src/domains/runtime/tests/objects.rs+++ b/moli-protocol/src/domains/runtime/tests/objects.rs@@ -630,7 +630,8 @@ async fn runtime_disable_clears_background_child_default_context_emission_cursorbrowser_context.set_active_target_id("TID-active".to_owned());browser_context.attach_active_session("SID-active".to_owned());browser_context.insert_page_target_host(background_target);- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.install_navigation_fixture_for_session_owner(&format!("data:text/html,{html}"),Some("SID-background"),diff --git a/moli-protocol/src/domains/runtime/tests/service_worker.rs b/moli-protocol/src/domains/runtime/tests/service_worker.rsindex 372c703f1..3311c9b75 100644--- a/moli-protocol/src/domains/runtime/tests/service_worker.rs+++ b/moli-protocol/src/domains/runtime/tests/service_worker.rs@@ -16,13 +16,13 @@ fn load_service_worker_target(ctx: &mut TestContext, session_id: &str) {let mut target = service_worker_target();target.attach_session(session_id.to_owned());bc.insert_service_worker_target(target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn load_unattached_service_worker_target(ctx: &mut TestContext) {let mut bc = BrowserContext::new("BID-service".to_owned());bc.insert_service_worker_target(service_worker_target());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}fn service_worker_target() -> ServiceWorkerTargetState {diff --git a/moli-protocol/src/domains/runtime_context_events.rs b/moli-protocol/src/domains/runtime_context_events.rsindex bd5d94781..7282b3f17 100644--- a/moli-protocol/src/domains/runtime_context_events.rs+++ b/moli-protocol/src/domains/runtime_context_events.rs@@ -508,7 +508,7 @@ mod tests {let mut conn = CdpConnection::default();let mut browser_context = BrowserContext::new("BID-1".to_owned());browser_context.set_active_target_id("TID-1".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let mut created = json!({"method": "Runtime.executionContextCreated",@@ -562,7 +562,7 @@ mod tests {);target.attach_session("SID-shared-worker".to_owned());browser_context.insert_shared_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let mut event = super::RuntimeContextProtocolEvent::Created(super::runtime_context_created_event_from_cdp_params(json!({@@ -614,7 +614,7 @@ mod tests {);target.attach_session("SID-service-worker".to_owned());browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let mut event = super::RuntimeContextProtocolEvent::Created(super::runtime_context_created_event_from_cdp_params(json!({@@ -706,7 +706,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-1".to_owned());browser_context.set_active_target_id("TID-1".to_owned());browser_context.attach_active_session("SID-1".to_owned());- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let event = super::RuntimeContextProtocolEvent::Created(super::runtime_context_created_event_from_cdp_params(json!({"context": {@@ -864,7 +864,7 @@ mod tests {);target.attach_session("SID-shared-worker".to_owned());browser_context.insert_shared_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);conn.register_runtime_remote_object_ids_for_session_owner_with_realm(Some("SID-shared-worker"),vec!["worker-object".to_owned()],diff --git a/moli-protocol/src/domains/service_worker.rs b/moli-protocol/src/domains/service_worker.rsindex 0a22a63f4..94d40969d 100644--- a/moli-protocol/src/domains/service_worker.rs+++ b/moli-protocol/src/domains/service_worker.rs@@ -674,7 +674,7 @@ mod tests {let mut context = browser_context_with_service_worker_target();context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());- ctx.conn.browser_context = Some(context);+ ctx.conn.install_browser_context_fixture_for_test(context);ctx.process_async(json!({"id": 1,@@ -726,7 +726,7 @@ mod tests {let mut context = browser_context_with_service_worker_target();context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());- ctx.conn.browser_context = Some(context);+ ctx.conn.install_browser_context_fixture_for_test(context);ctx.process_async(json!({"id": 2,@@ -849,7 +849,7 @@ mod tests {let mut context = browser_context_with_service_worker_target();context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());- ctx.conn.browser_context = Some(context);+ ctx.conn.install_browser_context_fixture_for_test(context);ctx.process_async(json!({"id": 1,@@ -900,7 +900,7 @@ mod tests {let mut context = browser_context_with_service_worker_target();context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());- ctx.conn.browser_context = Some(context);+ ctx.conn.install_browser_context_fixture_for_test(context);ctx.process_async(json!({"id": 1,@@ -930,7 +930,7 @@ mod tests {let mut context = browser_context_with_service_worker_target();context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());- ctx.conn.browser_context = Some(context);+ ctx.conn.install_browser_context_fixture_for_test(context);ctx.process_async(json!({"id": 1,diff --git a/moli-protocol/src/domains/session.rs b/moli-protocol/src/domains/session.rsnew file mode 100644index 000000000..f7db71928--- /dev/null+++ b/moli-protocol/src/domains/session.rs@@ -0,0 +1,239 @@+use crate::conn::{+ BackgroundProtocolEvent, CdpConnection, SessionDisposalPlan, SessionDisposalTarget,+};++#[derive(Clone, Copy, Debug, PartialEq, Eq)]+enum DevToolsSessionDomainHandler {+ Tracing,+ Browser,+ Target,+ Fetch,+ Runtime,+ Page,+ Emulation,+ Network,+ PrimaryPageTargetState,+}++const CONNECTION_HANDLERS: &[DevToolsSessionDomainHandler] = &[+ DevToolsSessionDomainHandler::Tracing,+ DevToolsSessionDomainHandler::Browser,+ DevToolsSessionDomainHandler::Target,+];++const PAGE_HANDLERS: &[DevToolsSessionDomainHandler] = &[+ DevToolsSessionDomainHandler::Tracing,+ DevToolsSessionDomainHandler::Browser,+ DevToolsSessionDomainHandler::Target,+ DevToolsSessionDomainHandler::Fetch,+ DevToolsSessionDomainHandler::Runtime,+ DevToolsSessionDomainHandler::Page,+ DevToolsSessionDomainHandler::Emulation,+ DevToolsSessionDomainHandler::Network,+ DevToolsSessionDomainHandler::PrimaryPageTargetState,+];++const WORKER_HANDLERS: &[DevToolsSessionDomainHandler] = &[+ DevToolsSessionDomainHandler::Tracing,+ DevToolsSessionDomainHandler::Browser,+ DevToolsSessionDomainHandler::Target,+ DevToolsSessionDomainHandler::Runtime,+];++/// Browser-side handlers installed for one DevTools session.+///+/// Target teardown iterates this collection without knowing any domain's+/// state or disable operation. That mirrors Chromium's DevToolsSession, where+/// handlers own Disable() and the session lifecycle only invokes them before+/// renderer Inspector detachment.+struct DevToolsSessionHandlers {+ handlers: &'static [DevToolsSessionDomainHandler],+}++impl DevToolsSessionHandlers {+ fn for_target(target: &SessionDisposalTarget) -> Self {+ let handlers = match target {+ SessionDisposalTarget::PageTarget { .. } => PAGE_HANDLERS,+ SessionDisposalTarget::SharedWorkerTarget { .. }+ | SessionDisposalTarget::DedicatedWorkerTarget { .. }+ | SessionDisposalTarget::ServiceWorkerTarget { .. } => WORKER_HANDLERS,+ SessionDisposalTarget::Browser | SessionDisposalTarget::TabTarget { .. } => {+ CONNECTION_HANDLERS+ }+ };+ Self { handlers }+ }+}++pub(crate) struct DevToolsSessionHandlerDisposal {+ first_error: Option<anyhow::Error>,+ renderer_output_predecessor: Option<moli_core::RendererOutputFence>,+}++impl DevToolsSessionHandlerDisposal {+ pub(crate) fn first_error(&self) -> Option<&anyhow::Error> {+ self.first_error.as_ref()+ }++ pub(crate) fn into_renderer_output_predecessor(self) -> Option<moli_core::RendererOutputFence> {+ self.renderer_output_predecessor+ }+}++/// Invokes every installed browser-side handler while the session route is+/// still authoritative. One failure never prevents the remaining handlers+/// from receiving their disposal callback.+pub(crate) async fn dispose_live_handlers_async(+ conn: &mut CdpConnection,+ background_events: &mut Vec<BackgroundProtocolEvent>,+ protocol_events: &mut Vec<BackgroundProtocolEvent>,+ plan: &SessionDisposalPlan,+) -> DevToolsSessionHandlerDisposal {+ let mut disposal = DevToolsSessionHandlerDisposal {+ first_error: None,+ renderer_output_predecessor: None,+ };+ for handler in DevToolsSessionHandlers::for_target(plan.target()).handlers {+ let result = handler+ .dispose_async(conn, background_events, protocol_events, plan)+ .await;+ match result {+ Ok(Some(predecessor)) => {+ disposal.renderer_output_predecessor = Some(predecessor);+ }+ Ok(None) => {}+ Err(error) => {+ tracing::warn!(+ session_id = plan.session_id(),+ domain = handler.name(),+ %error,+ "failed to dispose DevTools session domain"+ );+ disposal.first_error.get_or_insert_with(|| {+ anyhow::anyhow!("failed to dispose {} domain: {error:#}", handler.name())+ });+ }+ }+ }+ disposal+}++/// Runs the handlers whose state survives target destruction. Renderer-owned+/// and target-owned handlers have already disappeared with the closed target.+pub(crate) async fn dispose_closed_handlers_async(conn: &mut CdpConnection, session_id: &str) {+ super::tracing::dispose_session_handler_async(conn, session_id).await;+ super::browser::dispose_session_handler(conn, session_id);+ super::target::dispose_session_handler(conn, session_id);+}++pub(crate) fn dispose_closed_handlers_sync(conn: &mut CdpConnection, session_id: &str) {+ conn.cancel_tracing_for_session_owner(Some(session_id));+ super::browser::dispose_session_handler(conn, session_id);+ super::target::dispose_session_handler(conn, session_id);+}++impl DevToolsSessionDomainHandler {+ fn name(self) -> &'static str {+ match self {+ Self::Tracing => "Tracing",+ Self::Browser => "Browser",+ Self::Target => "Target",+ Self::Fetch => "Fetch",+ Self::Runtime => "Runtime",+ Self::Page => "Page",+ Self::Emulation => "Emulation",+ Self::Network => "Network",+ Self::PrimaryPageTargetState => "primary Page target",+ }+ }++ async fn dispose_async(+ self,+ conn: &mut CdpConnection,+ background_events: &mut Vec<BackgroundProtocolEvent>,+ protocol_events: &mut Vec<BackgroundProtocolEvent>,+ plan: &SessionDisposalPlan,+ ) -> anyhow::Result<Option<moli_core::RendererOutputFence>> {+ let session_id = plan.session_id();+ match self {+ Self::Tracing => {+ super::tracing::dispose_session_handler_async(conn, session_id).await;+ Ok(None)+ }+ Self::Browser => {+ super::browser::dispose_session_handler(conn, session_id);+ Ok(None)+ }+ Self::Target => {+ super::target::dispose_session_handler(conn, session_id);+ Ok(None)+ }+ Self::Fetch => {+ Box::pin(super::fetch::dispose_session_async(+ conn,+ background_events,+ session_id,+ ))+ .await+ }+ Self::Runtime => {+ super::runtime::dispose_session_handler_async(+ conn,+ background_events,+ protocol_events,+ plan,+ )+ .await?;+ Ok(None)+ }+ Self::Page => {+ super::page::dispose_session_async(conn, session_id).await?;+ Ok(None)+ }+ Self::Emulation => {+ super::emulation::dispose_page_session_async(conn, session_id).await?;+ Ok(None)+ }+ Self::Network => {+ super::network::dispose_session_policy_async(conn, session_id).await?;+ Ok(None)+ }+ Self::PrimaryPageTargetState => {+ super::page::dispose_primary_session_target_state_async(conn, plan).await?;+ Ok(None)+ }+ }+ }+}++#[cfg(test)]+mod tests {+ use super::*;+ use moli_page_types::DevToolsSessionKey;++ #[test]+ fn handler_sets_are_owned_by_session_target_kind() {+ let page = SessionDisposalTarget::PageTarget {+ browser_context_id: "BID".to_owned(),+ target_id: "TID".to_owned(),+ session_key: DevToolsSessionKey::Attached("SID".to_owned()),+ };+ assert_eq!(+ DevToolsSessionHandlers::for_target(&page).handlers,+ PAGE_HANDLERS+ );++ let worker = SessionDisposalTarget::DedicatedWorkerTarget {+ browser_context_id: "BID".to_owned(),+ target_id: "WID".to_owned(),+ };+ assert_eq!(+ DevToolsSessionHandlers::for_target(&worker).handlers,+ WORKER_HANDLERS+ );+ assert_eq!(+ DevToolsSessionHandlers::for_target(&SessionDisposalTarget::Browser).handlers,+ CONNECTION_HANDLERS+ );+ }+}diff --git a/moli-protocol/src/domains/storage/tests.rs b/moli-protocol/src/domains/storage/tests.rsindex 3e02e9ebb..dc9f72839 100644--- a/moli-protocol/src/domains/storage/tests.rs+++ b/moli-protocol/src/domains/storage/tests.rs@@ -392,7 +392,7 @@ async fn storage_get_storage_key_for_frame_returns_top_frame_origin() {bc.set_active_target_id("TID-SK-TOP");bc.set_target_url("https://top.example/app".into());bc.set_target_security_origin("https://top.example".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 1,@@ -421,7 +421,7 @@ async fn storage_get_storage_key_for_top_frame_uses_loaded_page_storage_key() {bc.set_target_url("https://stale-target-url.example/app".into());bc.set_target_security_origin("https://stale-target-url.example".into());bc.set_target_secure_context_type("Secure".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, None).await;@@ -457,7 +457,7 @@ async fn storage_get_storage_key_for_frame_returns_child_frame_inherited_origin(bc.set_target_url(page_url.clone());bc.set_target_security_origin(top_origin.clone());bc.set_target_secure_context_type("Secure".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, None).await;@@ -505,7 +505,7 @@ async fn storage_get_storage_key_for_credentialless_child_uses_page_nonce() {bc.set_target_url(page_url.clone());bc.set_target_security_origin(top_origin.clone());bc.set_target_secure_context_type("Secure".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, None).await;@@ -651,7 +651,7 @@ async fn storage_get_storage_key_for_frame_returns_child_frame_partition_key() {bc.set_target_url(page_url.clone());bc.set_target_security_origin(top_origin);bc.set_target_secure_context_type("Secure".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(None);ctx.install_navigation_fixture_for_session_owner(&page_url, None)@@ -708,7 +708,7 @@ async fn storage_get_storage_key_for_frame_rejects_opaque_child_frame() {bc.set_target_url(page_url.clone());bc.set_target_security_origin(top_origin);bc.set_target_secure_context_type("Secure".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.enable_page_events_for_test(None);ctx.install_navigation_fixture_for_session_owner(&page_url, None)@@ -753,7 +753,7 @@ async fn storage_get_storage_key_for_frame_rejects_unknown_frame() {let mut ctx = TestContext::new();let mut bc = BrowserContext::new("BID-SK-MISSING".into());bc.set_active_target_id("TID-SK-MISSING");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 4,@@ -784,7 +784,7 @@ async fn storage_key_targets_loaded_background_owner_without_activation() {bc.set_active_target_id("TID-active".to_owned());bc.attach_active_session("SID-active".to_owned());bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-background")).await;ctx.sent.clear();@@ -872,7 +872,7 @@ async fn pending_storage_key_keeps_background_owner_route_across_completion() {.runtime_slot.set_loaded_page_for_test(active_page);bc.insert_page_target_host(background);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);let raw = serde_json::to_string(&json!({"id": 104,@@ -927,14 +927,15 @@ async fn storage_key_targets_inactive_owner_without_activation() {let mut active = BrowserContext::new("BID-active".to_owned());active.set_active_target_id("TID-active".to_owned());active.attach_active_session("SID-active".to_owned());- ctx.conn.browser_context = Some(active);+ ctx.conn.install_browser_context_fixture_for_test(active);let mut inactive = BrowserContext::new("BID-inactive".to_owned());inactive.set_active_target_id("TID-inactive".to_owned());inactive.set_target_url("https://inactive.example/app".to_owned());inactive.set_target_security_origin("https://inactive.example".to_owned());inactive.attach_active_session("SID-inactive".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 111,@@ -963,9 +964,18 @@ async fn storage_get_cookies_accepts_attached_page_session_route() {"TID-attached-storage","SID-attached-storage".to_owned()));- ctx.conn.browser_context = Some(browser_context);ctx.conn- .register_bound_session_for_test("SID-attached-storage");+ .install_browser_context_fixture_for_test(browser_context);+ ctx.conn.register_session_route_for_test(+ "SID-attached-storage",+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-attached-storage".to_owned(),+ target_id: "TID-attached-storage".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Attached(+ "SID-attached-storage".to_owned(),+ ),+ },+ );ctx.process_async(json!({"id": 8,@@ -989,9 +999,16 @@ async fn storage_get_cookies_accepts_background_page_session_route() {None,None,);- ctx.conn.browser_context = Some(browser_context);ctx.conn- .register_bound_session_for_test("SID-background-storage");+ .install_browser_context_fixture_for_test(browser_context);+ ctx.conn.register_session_route_for_test(+ "SID-background-storage",+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-background-storage".to_owned(),+ target_id: "TID-background-storage".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ );ctx.process_async(json!({"id": 9,@@ -1775,7 +1792,7 @@ async fn storage_set_cookies_uses_browser_context_default_cookie_url_when_missinlet mut ctx = TestContext::new();let mut bc = BrowserContext::new_with_page_for_test("BID-DEF", "TID-DEF");bc.set_target_url("https://example.com/app".into());- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 124,@@ -1834,7 +1851,8 @@ async fn storage_cookie_methods_accept_inactive_browser_context_ids() {));let mut inactive = BrowserContext::new_with_page_for_test("BID-INACTIVE", "TID-INACTIVE");inactive.set_target_url("https://inactive.example/app".into());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 1_251,@@ -2334,7 +2352,8 @@ async fn storage_get_usage_and_quota_reports_indexed_db_usage_for_origin() {let mut ctx = TestContext::new();let mut browser_context = BrowserContext::new("BID-usage-indexeddb".into());browser_context.set_active_target_id("TID-usage-indexeddb");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let url = Url::parse("https://idb-usage.example/app").unwrap();ctx.install_buffered_navigation_fixture_for_session_owner(url.clone(),@@ -2600,8 +2619,9 @@ async fn storage_get_usage_and_quota_targets_command_session_browser_context() {assert!(store.set_item(&storage_key, "local", "bbbb"));}- ctx.conn.browser_context = Some(active);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn.install_browser_context_fixture_for_test(active);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 12_529,@@ -2688,8 +2708,9 @@ async fn storage_override_quota_for_origin_targets_command_session_browser_conteBrowserContext::new_with_page_for_test("BID-quota-inactive", "TID-quota-inactive");inactive.attach_active_session("SID-quota-inactive");- ctx.conn.browser_context = Some(active);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn.install_browser_context_fixture_for_test(active);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 12_535,@@ -2843,8 +2864,9 @@ async fn storage_clear_data_for_origin_targets_command_session_browser_context()assert!(store.set_item(&storage_key, "local", "inactive"));}- ctx.conn.browser_context = Some(active);- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn.install_browser_context_fixture_for_test(active);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 12_527,@@ -2950,7 +2972,8 @@ async fn storage_clear_data_for_origin_clears_indexed_db_backend() {let mut ctx = TestContext::new();let mut browser_context = BrowserContext::new("BID-origin-indexeddb".into());browser_context.set_active_target_id("TID-origin-indexeddb");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let url = Url::parse("https://idb-clear.example/app").unwrap();ctx.install_buffered_navigation_fixture_for_session_owner(url.clone(),@@ -3316,7 +3339,8 @@ async fn storage_clear_data_for_origin_clears_http_cache_entries_for_origin() {fetch_config.clone(),));let browser_context = ctx.conn.new_browser_context("BID-cache-clear".into());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let app_origin = Url::parse(&app_url).expect("app url should parse")@@ -3389,7 +3413,8 @@ async fn storage_clear_data_for_origin_uses_browser_context_http_cache_owner() {let mut browser_context = BrowserContext::new("BID-cache-owner".into());browser_context.http_cache_root = Some(cache_root.path.clone());browser_context.http_cache_max_bytes = seed_config.http_cache_max_bytes();- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let app_origin = Url::parse(&app_url).expect("app url should parse")diff --git a/moli-protocol/src/domains/system_info.rs b/moli-protocol/src/domains/system_info.rsindex b57e8f5b3..37d93ffbd 100644--- a/moli-protocol/src/domains/system_info.rs+++ b/moli-protocol/src/domains/system_info.rs@@ -90,7 +90,8 @@ mod tests {let mut browser_context = BrowserContext::new("BID-system-info".to_owned());browser_context.set_active_target_id("TID-system-info".to_owned());browser_context.attach_active_session("SID-frame".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 2,@@ -130,7 +131,8 @@ mod tests {let mut browser_context = BrowserContext::new("BID-system-info".to_owned());browser_context.set_active_target_id("TID-system-info".to_owned());browser_context.attach_active_session("SID-frame".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 2,diff --git a/moli-protocol/src/domains/target.rs b/moli-protocol/src/domains/target.rsindex 36d440243..61cd16317 100644--- a/moli-protocol/src/domains/target.rs+++ b/moli-protocol/src/domains/target.rs@@ -182,6 +182,14 @@ pub(in crate::domains) fn set_dedicated_worker_pause_on_start_owner(sync_dedicated_worker_pause_on_start_for_devtools(conn);}+/// Disables Target-domain policy owned by one DevTools session.+pub(in crate::domains) fn dispose_session_handler(conn: &mut CdpConnection, session_id: &str) {+ conn.clear_auto_attach_owner(Some(session_id));+ conn.clear_target_discovery_for_owner(Some(session_id));+ set_service_worker_pause_on_start_owner(conn, Some(session_id), false);+ set_dedicated_worker_pause_on_start_owner(conn, Some(session_id), false);+}+impl CdpConnection {/// Releases root-owned Target control state after its transport frontend/// disconnects, while preserving sessions owned by direct page frontends.@@ -1174,7 +1182,7 @@ mod devtools_runtime_entry_tests {"TID-runtime-ready-close","SID-runtime-ready-close-attached".to_owned(),));- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let page = conn.load_page_via_runtime_async("data:text/html,<p>runtime ready close</p>").awaitdiff --git a/moli-protocol/src/domains/target/session_disposal.rs b/moli-protocol/src/domains/target/session_disposal.rsindex 28c45e179..019a794a0 100644--- a/moli-protocol/src/domains/target/session_disposal.rs+++ b/moli-protocol/src/domains/target/session_disposal.rs@@ -58,128 +58,23 @@ async fn dispose_live_session_domains_async(protocol_events: &mut Vec<BackgroundProtocolEvent>,plan: &SessionDisposalPlan,) -> anyhow::Result<Option<moli_core::RendererOutputFence>> {- let session_id = plan.session_id();- dispose_connection_session_domains_async(conn, session_id).await;-- match plan.target() {- SessionDisposalTarget::PageTarget { .. } => {- let mut first_error = None;- let predecessor = match Box::pin(crate::domains::fetch::dispose_session_async(- conn,- background_events,- session_id,- ))- .await- {- Ok(predecessor) => predecessor,- Err(error) => {- record_session_cleanup_error(&mut first_error, session_id, "Fetch", error);- None- }- };- crate::domains::runtime::fail_pending_session_calls(- conn,- background_events,- protocol_events,- session_id,- );-- // Document-start scripts are renderer-owned resources. Remove- // them before detaching the Inspector endpoint that carries the- // cleanup commands.- record_session_cleanup_result(- &mut first_error,- session_id,- "Page",- crate::domains::page::dispose_session_async(conn, session_id).await,- );- record_session_cleanup_result(- &mut first_error,- session_id,- "Emulation",- crate::domains::emulation::dispose_page_session_async(conn, session_id).await,- );- record_session_cleanup_result(- &mut first_error,- session_id,- "Network",- crate::domains::network::dispose_session_policy_async(conn, session_id).await,- );- if let SessionDisposalTarget::PageTarget {- browser_context_id,- target_id,- session_key: moli_page_types::DevToolsSessionKey::Primary,- } = plan.target()- {- let reset_result = match conn.browser_context_by_id_mut(browser_context_id) {- Some(browser_context) => {- browser_context- .reset_primary_page_session_target_state_async(target_id, session_id)- .await- }- None => Ok(false),- };- record_session_cleanup_result(- &mut first_error,- session_id,- "primary Page target",- reset_result.and_then(|found| {- anyhow::ensure!(- found,- "primary Page target disappeared during session disposal"- );- Ok(())- }),- );- }- if let Some(error) = first_error {- recover_failed_page_session_disposal_async(conn, background_events, plan, &error)- .await?;- }- crate::domains::runtime::detach_page_session_inspector_async(conn, session_id).await;- Ok(predecessor)- }- SessionDisposalTarget::SharedWorkerTarget { .. }- | SessionDisposalTarget::DedicatedWorkerTarget { .. }- | SessionDisposalTarget::ServiceWorkerTarget { .. } => {- crate::domains::runtime::dispose_worker_session_async(- conn,- background_events,- protocol_events,- plan,- )- .await?;- Ok(None)+ let disposal = crate::domains::session::dispose_live_handlers_async(+ conn,+ background_events,+ protocol_events,+ plan,+ )+ .await;+ if let Some(error) = disposal.first_error() {+ if matches!(plan.target(), SessionDisposalTarget::PageTarget { .. }) {+ recover_failed_page_session_disposal_async(conn, background_events, plan, error)+ .await?;+ } else {+ return Err(anyhow::anyhow!("{error:#}"));}- SessionDisposalTarget::Browser | SessionDisposalTarget::TabTarget { .. } => Ok(None),}-}--fn record_session_cleanup_result(- first_error: &mut Option<anyhow::Error>,- session_id: &str,- domain: &'static str,- result: anyhow::Result<()>,-) {- if let Err(error) = result {- record_session_cleanup_error(first_error, session_id, domain, error);- }-}--fn record_session_cleanup_error(- first_error: &mut Option<anyhow::Error>,- session_id: &str,- domain: &'static str,- error: anyhow::Error,-) {- tracing::warn!(- session_id,- domain,- %error,- "failed to dispose DevTools session domain"- );- first_error- .get_or_insert_with(|| anyhow::anyhow!("failed to dispose {domain} domain: {error:#}"));+ crate::domains::runtime::detach_session_inspector_async(conn, plan).await?;+ Ok(disposal.into_renderer_output_predecessor())}async fn recover_failed_page_session_disposal_async(@@ -251,24 +146,6 @@ async fn recover_failed_page_session_disposal_async(Ok(())}-async fn dispose_connection_session_domains_async(conn: &mut CdpConnection, session_id: &str) {- // Tracing may own isolate tasks that must finish before another session- // can start a trace.- conn.cancel_tracing_for_session_owner_async(Some(session_id))- .await;- dispose_connection_session_domains_sync(conn, session_id);-}--fn dispose_connection_session_domains_sync(conn: &mut CdpConnection, session_id: &str) {- conn.cancel_tracing_for_session_owner(Some(session_id));- conn.download_behavior- .set_browser_events_enabled_for_session(Some(session_id), false);- conn.clear_auto_attach_owner(Some(session_id));- conn.clear_target_discovery_for_owner(Some(session_id));- super::set_service_worker_pause_on_start_owner(conn, Some(session_id), false);- super::set_dedicated_worker_pause_on_start_owner(conn, Some(session_id), false);-}-pub(super) async fn dispose_browser_session_without_event_async(conn: &mut CdpConnection,session_id: &str,@@ -310,7 +187,7 @@ pub(crate) async fn dispose_closed_session_domains_async(conn: &mut CdpConnection,plan: &SessionDisposalPlan,) {- dispose_connection_session_domains_async(conn, plan.session_id()).await;+ crate::domains::session::dispose_closed_handlers_async(conn, plan.session_id()).await;}/// Rolls back a prepared attachment after it has become capable of owning@@ -431,6 +308,6 @@ pub(super) fn dispose_removed_dedicated_worker_session_after_failed_retirement(conn: &mut CdpConnection,cleanup_plan: TargetSessionDetachCleanupPlan,) -> TargetEventPlan {- dispose_connection_session_domains_sync(conn, cleanup_plan.session_id());+ crate::domains::session::dispose_closed_handlers_sync(conn, cleanup_plan.session_id());conn.commit_target_session_detachment_after_prepared_state_delta_event_plan(cleanup_plan)}diff --git a/moli-protocol/src/domains/target/tests/test_support.rs b/moli-protocol/src/domains/target/tests/test_support.rsindex c6a22378e..e04947b5e 100644--- a/moli-protocol/src/domains/target/tests/test_support.rs+++ b/moli-protocol/src/domains/target/tests/test_support.rs@@ -11,7 +11,7 @@ pub(super) fn load_bc(ctx: &mut TestContext, bc_id: &str) {pub(super) fn load_bc_with_target(ctx: &mut TestContext, bc_id: &str, target_id: &str) {let mut bc = BrowserContext::new(bc_id.into());bc.set_active_target_id(target_id);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);}pub(super) fn tab_id_for_page(ctx: &TestContext, page_target_id: &str) -> String {@@ -21,6 +21,23 @@ pub(super) fn tab_id_for_page(ctx: &TestContext, page_target_id: &str) -> String.to_owned()}+pub(super) fn register_page_session_route(+ ctx: &mut TestContext,+ browser_context_id: &str,+ target_id: &str,+ session_id: &str,+ session_key: moli_page_types::DevToolsSessionKey,+) {+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: browser_context_id.to_owned(),+ target_id: target_id.to_owned(),+ session_key,+ },+ );+}+pub(super) fn push_background_target(ctx: &mut TestContext,target_id: &str,@@ -45,7 +62,20 @@ pub(super) fn push_background_target());}if let Some(session_id) = session_id {- ctx.conn.register_bound_session_for_test(session_id);+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: ctx+ .conn+ .browser_context+ .as_ref()+ .expect("browser context")+ .id+ .clone(),+ target_id: target_id.to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ );}}@@ -90,7 +120,19 @@ pub(super) fn push_shared_worker_target(bc.insert_shared_worker_target(target);}if let Some(session_id) = session_id {- ctx.conn.register_bound_session_for_test(session_id);+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::SharedWorkerTarget {+ browser_context_id: ctx+ .conn+ .browser_context+ .as_ref()+ .expect("browser context")+ .id+ .clone(),+ target_id: target_id.to_owned(),+ },+ );}}@@ -123,7 +165,19 @@ pub(super) fn push_service_worker_target(}}if let Some(session_id) = session_id {- ctx.conn.register_bound_session_for_test(session_id);+ ctx.conn.register_session_route_for_test(+ session_id,+ crate::conn::CdpSessionRoute::ServiceWorkerTarget {+ browser_context_id: ctx+ .conn+ .browser_context+ .as_ref()+ .expect("browser context")+ .id+ .clone(),+ target_id: target_id.to_owned(),+ },+ );}}diff --git a/moli-protocol/src/domains/target/tests/tests_browser_context.rs b/moli-protocol/src/domains/target/tests/tests_browser_context.rsindex f31dcd51f..585b056f6 100644--- a/moli-protocol/src/domains/target/tests/tests_browser_context.rs+++ b/moli-protocol/src/domains/target/tests/tests_browser_context.rs@@ -115,7 +115,7 @@ async fn dispose_browser_context_emits_detached_events_for_attached_target() {bc.active_page_target_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled = true;- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 10, "method": "Target.disposeBrowserContext","params": {"browserContextId": "BID-20"}}))@@ -790,7 +790,7 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 20,@@ -869,7 +869,7 @@ async fn dispose_browser_context_aborts_root_session_navigation_without_target_sbc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 23,@@ -957,7 +957,7 @@ async fn dispose_browser_context_aborts_paused_runtime_fetch_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conndiff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rsindex 2ac869d7a..92edc037d 100644--- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs+++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs@@ -1386,6 +1386,7 @@ async fn rust_cdp_chromium_target_auto_attach_false_detaches_active_session() {.as_mut().unwrap().attach_active_session("SID-active");+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn.set_auto_attach_owner(None,true,@@ -1393,7 +1394,7 @@ async fn rust_cdp_chromium_target_auto_attach_false_detaches_active_session() {crate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-active".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-active".to_owned(), None);set_auto_attach(&mut ctx, 260_035, false).await;let detached = ctx.take_one();@@ -1417,7 +1418,7 @@ async fn rust_cdp_chromium_target_auto_attach_false_detaches_background_session(crate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-bg".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-bg".to_owned(), None);set_auto_attach(&mut ctx, 260_036, false).await;let detached = ctx.take_one();diff --git a/moli-protocol/src/domains/target/tests/tests_control_plane.rs b/moli-protocol/src/domains/target/tests/tests_control_plane.rsindex b9e862cf2..ebd402139 100644--- a/moli-protocol/src/domains/target/tests/tests_control_plane.rs+++ b/moli-protocol/src/domains/target/tests/tests_control_plane.rs@@ -639,7 +639,8 @@ async fn get_target_info_for_inactive_target_keeps_previously_active_context() {load_bc_with_target(&mut ctx, "BID-A", "TID-A");let mut inactive = BrowserContext::new_with_page_for_test("BID-B", "TID-B");inactive.set_active_target_id("TID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 111,@@ -675,7 +676,8 @@ async fn send_message_to_target_restores_previously_active_context() {load_bc_with_target(&mut ctx, "BID-A", "TID-A");let mut inactive = BrowserContext::new_with_page_for_test("BID-B", "TID-B");inactive.attach_active_session("SID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 1501,@@ -705,7 +707,8 @@ async fn detach_from_target_error_restores_previously_active_context() {let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B");inactive.attach_active_session("SID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 1502,@@ -731,9 +734,10 @@ async fn detach_from_inactive_context_cleans_exact_session_without_activating_coload_bc_with_target(&mut ctx, "BID-A", "TID-A");let mut inactive = BrowserContext::new_with_page_for_test("BID-B", "TID-B");inactive.attach_active_session("SID-B");- ctx.conn.inactive_browser_contexts.push(inactive);ctx.conn- .register_auto_attached_session_for_target("SID-B".to_owned(), None, Some("TID-B"));+ .push_inactive_browser_context_fixture_for_test(inactive);+ ctx.conn+ .mark_session_auto_attached_for_test("SID-B".to_owned(), None);ctx.conn.set_service_worker_pause_on_start_owner(Some("SID-B"), true);ctx.conn@@ -1707,6 +1711,7 @@ async fn set_auto_attach_false_detaches_existing_background_targets() {),crate::conn::TargetPageSlot::empty_for_test_fixture(),));+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn.set_auto_attach_owner(None,true,@@ -1714,9 +1719,9 @@ async fn set_auto_attach_false_detaches_existing_background_targets() {crate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-1".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-1".to_owned(), None);ctx.conn- .register_auto_attached_session("SID-bg".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-bg".to_owned(), None);ctx.process_async(json!({"id": 1702,@@ -1759,7 +1764,8 @@ async fn set_auto_attach_restores_previously_active_context_after_sweeping_conteload_bc_with_target(&mut ctx, "BID-A", "TID-A");let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 181,diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rsindex 55efd87bd..20e291a0c 100644--- a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs+++ b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs@@ -907,7 +907,13 @@ async fn close_active_target_activates_auto_attached_background_session_into_pag.as_mut().unwrap().attach_active_session("SID-active");- ctx.conn.register_bound_session_for_test("SID-active");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.conn.set_auto_attach_owner(None,true,@@ -1000,7 +1006,13 @@ async fn close_targets_chain_activates_multiple_auto_attached_background_session.as_mut().unwrap().attach_active_session("SID-active");- ctx.conn.register_bound_session_for_test("SID-active");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.conn.set_auto_attach_owner(None,true,@@ -1177,7 +1189,13 @@ async fn activate_target_chain_restores_multiple_auto_attached_loaded_page_runti.as_mut().unwrap().attach_active_session("SID-active");- ctx.conn.register_bound_session_for_test("SID-active");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.conn.set_auto_attach_owner(None,true,@@ -1372,7 +1390,13 @@ async fn activate_target_chain_restores_multiple_set_auto_attach_background_load.as_mut().unwrap().attach_active_session("SID-active");- ctx.conn.register_bound_session_for_test("SID-active");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );{let bc = ctx.conn.browser_context.as_mut().unwrap();bc.insert_page_target_host(crate::conn::PageTargetHost::new(@@ -1572,7 +1596,13 @@ async fn close_target_restores_loaded_runtime_to_previous_set_auto_attach_target.as_mut().unwrap().attach_active_session("SID-active");- ctx.conn.register_bound_session_for_test("SID-active");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );{let bc = ctx.conn.browser_context.as_mut().unwrap();bc.insert_page_target_host(crate::conn::PageTargetHost::new(@@ -1842,8 +1872,20 @@ async fn page_command_on_background_target_session_routes_without_activating_loa),crate::conn::TargetPageSlot::empty_for_test_fixture(),));- ctx.conn.register_bound_session_for_test("SID-active");- ctx.conn.register_bound_session_for_test("SID-bg");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000F",+ "SID-bg",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.process_async(json!({"id": 12,@@ -1926,7 +1968,7 @@ async fn close_target_aborts_paused_request_stage_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 20,@@ -2015,7 +2057,7 @@ async fn close_target_aborts_paused_runtime_fetch_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -2144,7 +2186,7 @@ async fn close_target_aborts_paused_response_stage_runtime_xhr_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -2312,7 +2354,7 @@ async fn close_target_aborts_paused_runtime_xhr_auth_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conndiff --git a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs b/moli-protocol/src/domains/target/tests/tests_target_attachment.rsindex ca3199a14..9ca75c17a 100644--- a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs@@ -409,10 +409,9 @@ async fn worker_target_handler_is_auto_attach_only() {"worker-child",Some("SID-worker-child"),);- ctx.conn.register_auto_attached_session_for_target(+ ctx.conn.mark_session_auto_attached_for_test("SID-worker-child".to_owned(),Some(&worker_session_id),- Some("TID-worker-child"),);assert!(ctx.conn@@ -698,7 +697,13 @@ async fn attach_to_target_existing_session_creates_distinct_attached_session() {.as_mut().unwrap().attach_active_session("SID-primary");- ctx.conn.register_bound_session_for_test("SID-primary");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000B",+ "SID-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.process_async(json!({"id": 12, "method": "Target.attachToTarget","params": {"targetId": "TID-000000000B"}}))@@ -1257,8 +1262,20 @@ async fn session_route_finds_committed_browser_page_and_worker_sessions() {bc.attach_active_session("SID-active");assert!(bc.assign_attached_session_to_target("TID-000000000A", "SID-attached".to_owned()));}- ctx.conn.register_bound_session_for_test("SID-active");- ctx.conn.register_bound_session_for_test("SID-attached");+ register_page_session_route(+ &mut ctx,+ "BID-A",+ "TID-000000000A",+ "SID-active",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-A",+ "TID-000000000A",+ "SID-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-attached".to_owned()),+ );push_background_target(&mut ctx,"TID-000000000B",@@ -1297,14 +1314,44 @@ async fn session_route_finds_committed_browser_page_and_worker_sessions() {);inactive_shared_worker.attach_session("SID-shared-inactive".to_owned());inactive.insert_shared_worker_target(inactive_shared_worker);- ctx.conn.inactive_browser_contexts.push(inactive);- for session_id in [- "SID-inactive",- "SID-inactive-background",- "SID-inactive-attached-background",- "SID-shared-inactive",+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);+ for (session_id, route) in [+ (+ "SID-inactive",+ CdpSessionRoute::PageTarget {+ browser_context_id: "BID-B".to_owned(),+ target_id: "TID-000000000C".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ ),+ (+ "SID-inactive-background",+ CdpSessionRoute::PageTarget {+ browser_context_id: "BID-B".to_owned(),+ target_id: "TID-000000000D".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ ),+ (+ "SID-inactive-attached-background",+ CdpSessionRoute::PageTarget {+ browser_context_id: "BID-B".to_owned(),+ target_id: "TID-000000000D".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Attached(+ "SID-inactive-attached-background".to_owned(),+ ),+ },+ ),+ (+ "SID-shared-inactive",+ CdpSessionRoute::SharedWorkerTarget {+ browser_context_id: "BID-B".to_owned(),+ target_id: "TID-shared-inactive".to_owned(),+ },+ ),] {- ctx.conn.register_bound_session_for_test(session_id);+ ctx.conn.register_session_route_for_test(session_id, route);}assert_eq!(@@ -1657,10 +1704,20 @@ async fn detach_from_target_drops_only_selected_page_renderer_inspector_session("SID-detach-attached".to_owned()));}- ctx.conn- .register_bound_session_for_test("SID-detach-primary");- ctx.conn- .register_bound_session_for_test("SID-detach-attached");+ register_page_session_route(+ &mut ctx,+ "BID-detach-inspector",+ "TID-detach-inspector",+ "SID-detach-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-detach-inspector",+ "TID-detach-inspector",+ "SID-detach-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-detach-attached".to_owned()),+ );ctx.sent.clear();let baseline_session_count =@@ -1735,8 +1792,13 @@ async fn detach_from_target_drops_only_selected_page_renderer_inspector_session("SID-detach-attached-replacement".to_owned()));}- ctx.conn- .register_bound_session_for_test("SID-detach-attached-replacement");+ register_page_session_route(+ &mut ctx,+ "BID-detach-inspector",+ "TID-detach-inspector",+ "SID-detach-attached-replacement",+ moli_page_types::DevToolsSessionKey::Attached("SID-detach-attached-replacement".to_owned()),+ );ctx.process_async(json!({"id": 120_006,"sessionId": "SID-detach-attached-replacement",@@ -1869,8 +1931,13 @@ async fn detach_from_target_drops_only_selected_page_renderer_inspector_session(.as_mut().expect("browser context").attach_active_session("SID-detach-diagnostic");- ctx.conn- .register_bound_session_for_test("SID-detach-diagnostic");+ register_page_session_route(+ &mut ctx,+ "BID-detach-inspector",+ "TID-detach-inspector",+ "SID-detach-diagnostic",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.process_async(json!({"id": 120_014,"sessionId": "SID-detach-diagnostic",@@ -1903,10 +1970,20 @@ async fn detach_from_target_removes_only_selected_session_document_start_scripts"SID-preload-attached".to_owned(),));}- ctx.conn- .register_bound_session_for_test("SID-preload-primary");- ctx.conn- .register_bound_session_for_test("SID-preload-attached");+ register_page_session_route(+ &mut ctx,+ "BID-detach-preload",+ "TID-detach-preload",+ "SID-preload-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-detach-preload",+ "TID-detach-preload",+ "SID-preload-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-preload-attached".to_owned()),+ );ctx.sent.clear();for (id, session_id, source) in [@@ -2082,10 +2159,20 @@ async fn detach_fail_closes_page_before_retiring_unremovable_session_scripts() {"SID-cleanup-attached".to_owned(),));}- ctx.conn- .register_bound_session_for_test("SID-cleanup-primary");- ctx.conn- .register_bound_session_for_test("SID-cleanup-attached");+ register_page_session_route(+ &mut ctx,+ "BID-detach-cleanup-failure",+ "TID-detach-cleanup-failure",+ "SID-cleanup-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-detach-cleanup-failure",+ "TID-detach-cleanup-failure",+ "SID-cleanup-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-cleanup-attached".to_owned()),+ );ctx.sent.clear();ctx.process_async(json!({@@ -2200,10 +2287,20 @@ async fn detach_fail_closes_page_when_fetch_disable_cannot_reach_renderer() {"SID-fetch-cleanup-attached".to_owned(),));}- ctx.conn- .register_bound_session_for_test("SID-fetch-cleanup-primary");- ctx.conn- .register_bound_session_for_test("SID-fetch-cleanup-attached");+ register_page_session_route(+ &mut ctx,+ "BID-detach-fetch-cleanup-failure",+ "TID-detach-fetch-cleanup-failure",+ "SID-fetch-cleanup-primary",+ moli_page_types::DevToolsSessionKey::Primary,+ );+ register_page_session_route(+ &mut ctx,+ "BID-detach-fetch-cleanup-failure",+ "TID-detach-fetch-cleanup-failure",+ "SID-fetch-cleanup-attached",+ moli_page_types::DevToolsSessionKey::Attached("SID-fetch-cleanup-attached".to_owned()),+ );ctx.sent.clear();ctx.process_async(json!({@@ -2302,7 +2399,13 @@ async fn detach_from_target_emits_detached_event() {.as_mut().unwrap().attach_active_session("SID-1");- ctx.conn.register_bound_session_for_test("SID-1");+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000C",+ "SID-1",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.process_async(json!({"id": 14,@@ -2497,8 +2600,14 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);- ctx.conn.register_bound_session_for_test("SID-1");+ ctx.conn.install_browser_context_fixture_for_test(bc);+ register_page_session_route(+ &mut ctx,+ "BID-9",+ "TID-000000000A",+ "SID-1",+ moli_page_types::DevToolsSessionKey::Primary,+ );ctx.process_async(json!({"id": 40,@@ -2600,6 +2709,7 @@ async fn set_auto_attach_false_detaches_existing_target() {request_stage: crate::conn::FetchRequestStage::Request,}],);+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn.set_auto_attach_owner(None,true,@@ -2607,7 +2717,7 @@ async fn set_auto_attach_false_detaches_existing_target() {crate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-1".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-1".to_owned(), None);ctx.process_async(json!({"id": 16,@@ -2710,7 +2820,7 @@ async fn set_auto_attach_false_detaches_existing_shared_worker_target() {crate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-shared-worker".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-shared-worker".to_owned(), None);ctx.process_async(json!({"id": 16,@@ -2759,7 +2869,7 @@ async fn set_auto_attach_false_cleans_shared_worker_runtime_state_before_detachecrate::conn::CdpTargetFilter::default_auto_attach(),);ctx.conn- .register_auto_attached_session("SID-shared-worker".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-shared-worker".to_owned(), None);{let target = ctx.conn@@ -3346,12 +3456,12 @@ async fn set_auto_attach_true_attaches_existing_unattached_shared_worker_target(async fn non_browser_auto_attach_owners_do_not_replay_existing_shared_worker_targets() {let mut ctx = TestContext::new();load_bc_with_target(&mut ctx, "BID-9", "TID-page");- assert!(- ctx.conn- .prepare_auto_attached_page_session_binding("TID-page", "SID-page".to_owned())- .is_some()- );- ctx.conn.register_bound_session_for_test("SID-page");+ let page_route = ctx+ .conn+ .prepare_auto_attached_page_session_binding("TID-page", "SID-page".to_owned())+ .expect("page session binding");+ ctx.conn+ .register_session_route_for_test("SID-page", page_route);ctx.conn.runtime_session_owner_slot_mut(Some("SID-page")).expect("page owner runtime slot")@@ -3361,16 +3471,15 @@ async fn non_browser_auto_attach_owners_do_not_replay_existing_shared_worker_tar.target_page_residence_identity_for_session(Some("SID-page")).expect("page owner residence");push_dedicated_worker_target(&mut ctx, 2401, "TID-dedicated-worker", owner_page);- assert!(- ctx.conn- .prepare_auto_attached_dedicated_worker_session_binding(- "TID-dedicated-worker",- "SID-dedicated-worker".to_owned(),- )- .is_some()- );+ let dedicated_worker_route = ctx+ .conn+ .prepare_auto_attached_dedicated_worker_session_binding(+ "TID-dedicated-worker",+ "SID-dedicated-worker".to_owned(),+ )+ .expect("dedicated worker session binding");ctx.conn- .register_bound_session_for_test("SID-dedicated-worker");+ .register_session_route_for_test("SID-dedicated-worker", dedicated_worker_route);push_shared_worker_target(&mut ctx,SharedWorkerInstanceId::from_u64(2402),diff --git a/moli-protocol/src/domains/target/tests/tests_target_basics.rs b/moli-protocol/src/domains/target/tests/tests_target_basics.rsindex 1694b2dd2..8cc5a40bd 100644--- a/moli-protocol/src/domains/target/tests/tests_target_basics.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_basics.rs@@ -51,7 +51,7 @@ async fn close_active_target_fails_only_active_owner_pending_awaits() {Some("SID-bg-await".to_owned()),"about:blank#bg-await".to_owned(),));- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.conn.register_pending_inspector_await(1041201, Some("SID-active-await"));ctx.conn@@ -158,7 +158,8 @@ async fn attach_to_target_selects_inactive_browser_context() {load_bc_with_target(&mut ctx, "BID-A", "TID-A");let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 6,@@ -200,7 +201,8 @@ async fn attach_to_target_creates_attached_session_and_keeps_target_context_actilet mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-B");inactive.attach_active_session("SID-B");- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 61,@@ -271,7 +273,7 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 20,@@ -356,7 +358,7 @@ async fn dispose_browser_context_aborts_paused_runtime_fetch_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -688,7 +690,8 @@ async fn page_bring_to_front_on_inactive_context_restores_previous_context() {let mut inactive = BrowserContext::new("BID-B".into());inactive.set_active_target_id("TID-active-b".to_owned());inactive.attach_active_session("SID-active-b".to_owned());- ctx.conn.inactive_browser_contexts.push(inactive);+ ctx.conn+ .push_inactive_browser_context_fixture_for_test(inactive);ctx.process_async(json!({"id": 1023,diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rsindex 2ac5cb5a3..fb17ac4f2 100644--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs@@ -1101,7 +1101,8 @@ async fn window_open_hands_off_session_storage_snapshot_and_initial_storage_key(enable_root_target_discovery_for_test(&mut ctx);let mut browser_context = ctx.conn.new_browser_context("BID-popup-storage".to_owned());browser_context.set_active_target_id("TID-popup-storage-opener");- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);let opener_url = format!("http://{addr}/opener");let page = ctx.conn@@ -3083,17 +3084,21 @@ async fn incomplete_popup_rollback_clears_tab_page_sessions_and_target_graph() {browser_context.remember_target_window_name("popupName", page_target_id);browser_context.remember_target_popup_id(Some(42), page_target_id);}- assert!(ctx.conn.assign_session_to_tab_target(- &tab_target_id,- "SID-popup-tab".to_owned(),- false- ));ctx.conn- .register_auto_attached_session("SID-popup-tab".to_owned(), None);+ .attach_tab_target_session_event_plan(+ "SID-popup-tab".to_owned(),+ None,+ &tab_target_id,+ false,+ )+ .expect("popup tab session should commit");+ ctx.conn.commit_declared_session_fixtures_for_test();+ ctx.conn+ .mark_session_auto_attached_for_test("SID-popup-tab".to_owned(), None);ctx.conn- .register_auto_attached_session("SID-popup-page-primary".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-popup-page-primary".to_owned(), None);ctx.conn- .register_auto_attached_session("SID-popup-page-attached".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-popup-page-attached".to_owned(), None);assert!(ctx.conn.session_route(Some("SID-popup-tab")).is_some());assert!(@@ -3156,17 +3161,21 @@ async fn incomplete_active_popup_rollback_clears_active_slot_sessions_and_target"SID-active-popup-page-attached".to_owned()));}- assert!(ctx.conn.assign_session_to_tab_target(- &tab_target_id,- "SID-active-popup-tab".to_owned(),- false- ));ctx.conn- .register_auto_attached_session("SID-active-popup-tab".to_owned(), None);+ .attach_tab_target_session_event_plan(+ "SID-active-popup-tab".to_owned(),+ None,+ &tab_target_id,+ false,+ )+ .expect("active popup tab session should commit");+ ctx.conn.commit_declared_session_fixtures_for_test();+ ctx.conn+ .mark_session_auto_attached_for_test("SID-active-popup-tab".to_owned(), None);ctx.conn- .register_auto_attached_session("SID-active-popup-page-primary".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-active-popup-page-primary".to_owned(), None);ctx.conn- .register_auto_attached_session("SID-active-popup-page-attached".to_owned(), None);+ .mark_session_auto_attached_for_test("SID-active-popup-page-attached".to_owned(), None);assert!(ctx.conn@@ -3234,8 +3243,9 @@ async fn unannounced_page_session_cleanup_clears_route_and_auto_attached_owner_i"SID-page-cleanup".to_owned()));+ ctx.conn.commit_declared_session_fixtures_for_test();ctx.conn- .register_auto_attached_session("SID-page-cleanup".to_owned(), Some("SID-tab-owner"));+ .mark_session_auto_attached_for_test("SID-page-cleanup".to_owned(), Some("SID-tab-owner"));assert!(ctx.conn.session_route(Some("SID-page-cleanup")).is_some());assert_eq!(ctx.conndiff --git a/moli-protocol/src/domains/target/tests/tests_target_management.rs b/moli-protocol/src/domains/target/tests/tests_target_management.rsindex f7d9edd60..9314bd184 100644--- a/moli-protocol/src/domains/target/tests/tests_target_management.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_management.rs@@ -349,7 +349,7 @@ async fn close_target_without_inspector_enabled_emits_inspector_detached_event()let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 29,@@ -383,7 +383,7 @@ async fn close_target_invalidates_runtime_context_and_object_without_active_page"about:blank".to_owned(),);bc.insert_page_target_host(background_target);- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner("data:text/html,<html><body><script>globalThis.__lm_closed_target_marker = 'active-clean';</script>active</body></html>",Some("SID-active"),@@ -600,7 +600,7 @@ async fn close_target_aborts_paused_request_stage_navigation() {bc.active_page_target_mut().runtime_slot.enable_primary_network_events();- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.process_async(json!({"id": 20,@@ -689,7 +689,7 @@ async fn close_target_aborts_paused_runtime_fetch_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -818,7 +818,7 @@ async fn close_target_aborts_paused_response_stage_runtime_xhr_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -986,7 +986,7 @@ async fn close_target_aborts_paused_runtime_xhr_auth_subresource() {let mut bc = BrowserContext::new("BID-9".into());bc.set_active_target_id("TID-000000000A");bc.attach_active_session("SID-1");- ctx.conn.browser_context = Some(bc);+ ctx.conn.install_browser_context_fixture_for_test(bc);ctx.install_navigation_fixture_for_session_owner(&page_url, Some("SID-1")).await;ctx.conn@@ -1548,6 +1548,7 @@ async fn send_message_to_target_preserves_nested_scheduler_events() {.as_mut().unwrap().attach_active_session("SID-9");+ ctx.conn.commit_declared_session_fixtures_for_test();let raw = json!({"id": 1402,diff --git a/moli-protocol/src/domains/target/worker_target.rs b/moli-protocol/src/domains/target/worker_target.rsindex db598502a..21a4dffa1 100644--- a/moli-protocol/src/domains/target/worker_target.rs+++ b/moli-protocol/src/domains/target/worker_target.rs@@ -3708,6 +3708,27 @@ mod tests {}}+ fn commit_worker_attach_outputs_for_test(+ conn: &mut CdpConnection,+ outputs: &[WorkerTargetLifecycleOutput],+ ) {+ let prepared_attaches = outputs+ .iter()+ .filter_map(|output| match output {+ WorkerTargetLifecycleOutput::SharedWorkerAttached {+ prepared_attach, ..+ }+ | WorkerTargetLifecycleOutput::ServiceWorkerAttached {+ prepared_attach, ..+ } => Some(prepared_attach.clone()),+ _ => None,+ })+ .collect::<Vec<_>>();+ for prepared_attach in prepared_attaches {+ let _ = conn.commit_prepared_attach_event_plan(prepared_attach);+ }+ }+fn shared_worker_info(instance_id: u64) -> RendererSharedWorkerTargetInfo {RendererSharedWorkerTargetInfo {owner_local_host_id: moli_core::RendererOwnerLocalHostId::new_for_testing(1),@@ -3748,7 +3769,7 @@ mod tests {Some("TID-page".to_owned()),page_attachment_id,);- conn.browser_context = Some(context);+ conn.install_browser_context_fixture_for_test(context);let owner_renderer_page = RendererPageResidenceIdentity::new(moli_core::RendererOwnerLocalHostId::new_for_testing(17),moli_core::PageId::new_for_testing(23),@@ -3760,11 +3781,10 @@ mod tests {conn: &mut CdpConnection,wait_for_debugger_on_start: bool,) {- assert!(conn.prepare_auto_attached_page_session_binding(- "TID-page",- "SID-page-base".to_owned(),- ).is_some());- conn.register_bound_session_for_test("SID-page-base");+ let route = conn+ .prepare_auto_attached_page_session_binding("TID-page", "SID-page-base".to_owned())+ .expect("page session binding");+ conn.register_session_route_for_test("SID-page-base", route);conn.set_auto_attach_owner(Some("SID-page-base"),true,@@ -4009,10 +4029,9 @@ mod tests {#[tokio::test]async fn dedicated_worker_auto_attach_is_scoped_to_its_owner_page_session() {let (mut conn, owner_page, owner_renderer_page) = dedicated_worker_fixture();- assert!(conn.prepare_auto_attached_page_session_binding(- "TID-page",- "SID-page-base".to_owned(),- ).is_some());+ let page_route = conn+ .prepare_auto_attached_page_session_binding("TID-page", "SID-page-base".to_owned())+ .expect("page session binding");conn.browser_context.as_mut().unwrap()@@ -4021,8 +4040,15 @@ mod tests {Some("SID-other-page".to_owned()),"about:blank".to_owned(),));- conn.register_bound_session_for_test("SID-page-base");- conn.register_bound_session_for_test("SID-other-page");+ conn.register_session_route_for_test("SID-page-base", page_route);+ conn.register_session_route_for_test(+ "SID-other-page",+ crate::conn::CdpSessionRoute::PageTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-other-page".to_owned(),+ session_key: moli_page_types::DevToolsSessionKey::Primary,+ },+ );for owner in [None, Some("SID-page-base"), Some("SID-other-page")] {conn.set_auto_attach_owner(owner, true, false, CdpTargetFilter::default_auto_attach());}@@ -4448,11 +4474,10 @@ mod tests {#[tokio::test]async fn dedicated_worker_failed_load_waits_for_debugger_before_target_retirement() {let (mut conn, owner_page, owner_renderer_page) = dedicated_worker_fixture();- assert!(conn.prepare_auto_attached_page_session_binding(- "TID-page",- "SID-page-base".to_owned(),- ).is_some());- conn.register_bound_session_for_test("SID-page-base");+ let route = conn+ .prepare_auto_attached_page_session_binding("TID-page", "SID-page-base".to_owned())+ .expect("page session binding");+ conn.register_session_route_for_test("SID-page-base", route);conn.set_target_discovery_for_owner(Some("SID-page-base"),CdpTargetFilter::default_target_discovery(),@@ -4925,7 +4950,6 @@ mod tests {#[test]fn service_worker_target_registration_auto_attaches_when_enabled() {let mut conn = CdpConnection::default();- conn.require_committed_session_routes_for_test();conn.set_root_target_discovery_enabled(true);conn.set_auto_attach_owner(None, true, true, CdpTargetFilter::default_auto_attach());conn.browser_context = Some(BrowserContext::new("BID-1".to_owned()));@@ -5117,7 +5141,6 @@ mod tests {#[test]fn service_worker_target_registration_auto_attaches_related_newer_version() {let mut conn = CdpConnection::default();- conn.require_committed_session_routes_for_test();conn.browser_context = Some(BrowserContext::new("BID-1".to_owned()));assert!(register_service_worker_target(&mut conn, "BID-1", service_worker_info(7)).is_empty()@@ -5221,7 +5244,7 @@ mod tests {context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());context.set_service_worker_domain_enabled(Some("SID-page"), true);- conn.browser_context = Some(context);+ conn.install_browser_context_fixture_for_test(context);let run = renderer_run();let outputs = register_service_worker_target_with_active_run(@@ -5264,7 +5287,7 @@ mod tests {context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());context.set_service_worker_domain_enabled(Some("SID-page"), true);- conn.browser_context = Some(context);+ conn.install_browser_context_fixture_for_test(context);let outputs = register_service_worker_target(&mut conn, "BID-1", service_worker_info(12)).worker_target_lifecycle_outputs;@@ -5371,7 +5394,7 @@ mod tests {context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());context.set_service_worker_domain_enabled(Some("SID-page"), true);- conn.browser_context = Some(context);+ conn.install_browser_context_fixture_for_test(context);let _ = register_service_worker_target(&mut conn, "BID-1", service_worker_info(12));let _ = register_service_worker_target(&mut conn, "BID-1", service_worker_info(13));@@ -5413,7 +5436,7 @@ mod tests {context.set_active_target_id("TID-page".to_owned());context.attach_active_session("SID-page".to_owned());context.set_service_worker_domain_enabled(Some("SID-page"), true);- conn.browser_context = Some(context);+ conn.install_browser_context_fixture_for_test(context);let _ = register_service_worker_target(&mut conn, "BID-1", service_worker_info(13));let outputs = service_worker_target_lifecycle_outputs_for_events(@@ -5524,6 +5547,7 @@ mod tests {))}).expect("auto-attached service worker target id");+ commit_worker_attach_outputs_for_test(&mut conn, &outputs);let target = conn.service_worker_target_for_session_mut(Some(&attached_session_id)).expect("service worker target should be attached");@@ -5623,6 +5647,7 @@ mod tests {.map(|(attachment, _)| attachment.session_id().to_owned())}).expect("auto-attached service worker target id");+ commit_worker_attach_outputs_for_test(&mut conn, &outputs);let target = conn.service_worker_target_for_session_mut(Some(&attached_session_id)).expect("service worker target should be attached");@@ -5679,6 +5704,7 @@ mod tests {))}).expect("auto-attached service worker target id");+ commit_worker_attach_outputs_for_test(&mut conn, &outputs);let target = conn.service_worker_target_for_session_mut(Some(&attached_session_id)).expect("service worker target should be attached");@@ -5897,7 +5923,7 @@ mod tests {target.attach_session("SID-service-worker".to_owned());target.set_console_enabled("SID-service-worker", true);browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let old_run = renderer_run();let old_output = record_service_worker_target_console_message(@@ -5975,7 +6001,7 @@ mod tests {target.attach_session("SID-reused".to_owned());target.set_console_enabled("SID-reused", true);browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let old_output = record_service_worker_target_console_message(&mut conn,@@ -6008,7 +6034,6 @@ mod tests {#[test]fn shared_worker_target_registration_auto_attaches_when_enabled() {let mut conn = CdpConnection::default();- conn.require_committed_session_routes_for_test();conn.set_auto_attach_owner(None,true,@@ -6039,11 +6064,10 @@ mod tests {#[test]fn shared_worker_registration_only_auto_attaches_browser_level_owners() {let (mut conn, owner_page, owner_renderer_page) = dedicated_worker_fixture();- assert!(- conn.prepare_auto_attached_page_session_binding("TID-page", "SID-page".to_owned(),)- .is_some()- );- conn.register_bound_session_for_test("SID-page");+ let page_route = conn+ .prepare_auto_attached_page_session_binding("TID-page", "SID-page".to_owned())+ .expect("page session binding");+ conn.register_session_route_for_test("SID-page", page_route);conn.register_browser_session("SID-browser-1".to_owned());conn.register_browser_session("SID-browser-2".to_owned());@@ -6058,14 +6082,13 @@ mod tests {"https://example.test/worker.js".to_owned(),Vec::new(),));- assert!(- conn.prepare_auto_attached_dedicated_worker_session_binding(+ let dedicated_worker_route = conn+ .prepare_auto_attached_dedicated_worker_session_binding("TID-dedicated-worker","SID-dedicated-worker".to_owned(),)- .is_some()- );- conn.register_bound_session_for_test("SID-dedicated-worker");+ .expect("dedicated worker session binding");+ conn.register_session_route_for_test("SID-dedicated-worker", dedicated_worker_route);let mut owner_shared_worker = SharedWorkerTargetState::new(moli_core::RendererOwnerLocalHostId::new_for_testing(2),@@ -6080,7 +6103,13 @@ mod tests {.as_mut().expect("browser context").insert_shared_worker_target(owner_shared_worker);- conn.register_bound_session_for_test("SID-shared-worker");+ conn.register_session_route_for_test(+ "SID-shared-worker",+ crate::conn::CdpSessionRoute::SharedWorkerTarget {+ browser_context_id: "BID-1".to_owned(),+ target_id: "TID-owner-shared-worker".to_owned(),+ },+ );for (owner, wait_for_debugger_on_start) in [(None, false),@@ -6164,7 +6193,7 @@ mod tests {target.attach_session("SID-first".to_owned());target.attach_session("SID-second".to_owned());browser_context.insert_shared_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let outputs = record_shared_worker_target_runtime_inspector_messages(&mut conn,@@ -6217,7 +6246,7 @@ mod tests {"service-worker",));browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let outputs = record_service_worker_target_console_message(&mut conn,@@ -6289,7 +6318,7 @@ mod tests {"service-worker",));browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let exception_message = RendererServiceWorkerExceptionMessage {message: "Uncaught Error: boom".to_owned(),@@ -6390,7 +6419,7 @@ mod tests {target.attach_session("SID-second".to_owned());assert!(target.set_network_enabled("SID-second", true));browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let diagnostic = RendererServiceWorkerFetchDiagnostic {internal_id: 101,@@ -6646,7 +6675,7 @@ mod tests {target.attach_session("SID-first".to_owned());target.attach_session("SID-second".to_owned());browser_context.insert_service_worker_target(target);- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let messages = runtime_inspector_messages(vec![json!({"method": "Runtime.executionContextCreated",@@ -6766,6 +6795,7 @@ mod tests {))}).expect("auto-attached target id");+ commit_worker_attach_outputs_for_test(&mut conn, &outputs);let target = conn.shared_worker_target_for_session_mut(Some(&attached_session_id)).expect("shared worker target should be attached");@@ -6876,7 +6906,7 @@ mod tests {let mut browser_context = BrowserContext::new("BID-1".to_owned());browser_context.set_active_target_id("TID-page");browser_context.attach_active_session("SID-page");- conn.browser_context = Some(browser_context);+ conn.install_browser_context_fixture_for_test(browser_context);let outputs =register_shared_worker_target(&mut conn, "BID-1", None, shared_worker_info(17))diff --git a/moli-protocol/src/domains/target/worker_target_attachment_tests.rs b/moli-protocol/src/domains/target/worker_target_attachment_tests.rsindex ac28d3c48..ab0146d4c 100644--- a/moli-protocol/src/domains/target/worker_target_attachment_tests.rs+++ b/moli-protocol/src/domains/target/worker_target_attachment_tests.rs@@ -45,7 +45,13 @@ fn install_collision_target(conn: &mut CdpConnection) {.as_mut().expect("test browser context").insert_shared_worker_target(target);- conn.register_bound_session_for_test(SESSION_ID);+ conn.register_session_route_for_test(+ SESSION_ID,+ crate::conn::CdpSessionRoute::SharedWorkerTarget {+ browser_context_id: BROWSER_CONTEXT_ID.to_owned(),+ target_id: TARGET_ID.to_owned(),+ },+ );}fn runtime_inspector_messages(value: &str) -> Vec<RendererRuntimeInspectorMessage> {diff --git a/moli-protocol/src/domains/tracing/mod.rs b/moli-protocol/src/domains/tracing/mod.rsindex 629068ecd..de473b3bb 100644--- a/moli-protocol/src/domains/tracing/mod.rs+++ b/moli-protocol/src/domains/tracing/mod.rs@@ -18,6 +18,19 @@ mod state;#[cfg(test)]mod tests;+/// Disables the Tracing handler owned by one DevTools session.+pub(in crate::domains) async fn dispose_session_handler_async(+ conn: &mut CdpConnection,+ session_id: &str,+) {+ // A trace may own isolate tasks that must finish before another session+ // can start one. Keep the synchronous cancellation as a final idempotent+ // state reset after the async task has settled.+ conn.cancel_tracing_for_session_owner_async(Some(session_id))+ .await;+ conn.cancel_tracing_for_session_owner(Some(session_id));+}+#[derive(Default, Deserialize)]#[serde(rename_all = "camelCase")]struct TracingStartParams {diff --git a/moli-protocol/src/domains/tracing/tests.rs b/moli-protocol/src/domains/tracing/tests.rsindex f4dc50f16..fc900cb34 100644--- a/moli-protocol/src/domains/tracing/tests.rs+++ b/moli-protocol/src/domains/tracing/tests.rs@@ -14,7 +14,8 @@ fn context_with_page_sessions() -> TestContext {assert!(browser_context.assign_attached_session_to_target("TID-tracing", "SID-peer".to_owned(),));- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx}diff --git a/moli-protocol/src/domains/webauthn.rs b/moli-protocol/src/domains/webauthn.rsindex a7353a514..02010018f 100644--- a/moli-protocol/src/domains/webauthn.rs+++ b/moli-protocol/src/domains/webauthn.rs@@ -24,7 +24,8 @@ mod tests {let mut browser_context = BrowserContext::new("BID-webauthn".to_owned());browser_context.set_active_target_id("TID-webauthn".to_owned());browser_context.attach_active_session("SID-1".to_owned());- ctx.conn.browser_context = Some(browser_context);+ ctx.conn+ .install_browser_context_fixture_for_test(browser_context);ctx.process_async(json!({"id": 1,diff --git a/moli-protocol/src/testing.rs b/moli-protocol/src/testing.rsindex de9e0fdea..697bdf895 100644--- a/moli-protocol/src/testing.rs+++ b/moli-protocol/src/testing.rs@@ -261,6 +261,7 @@ impl TestContext {raw_url: &str,session_id: Option<&str>,) {+ self.conn.commit_declared_session_fixtures_for_test();let navigation = self.conn.load_navigation_via_runtime_for_session_owner_async(session_id, raw_url)@@ -284,6 +285,7 @@ impl TestContext {response_body: String,session_id: Option<&str>,) {+ self.conn.commit_declared_session_fixtures_for_test();let navigation = self.conn.build_loaded_navigation_from_buffered_response_for_session_owner_async(@@ -705,6 +707,11 @@ impl TestContext {command: &ParsedCdpCommand,drain_after_command: bool,) -> Vec<CdpSchedulerEvent> {+ // Some low-level fixtures mutate target-side session declarations+ // after installing their BrowserContext. Materialize those declarations+ // as committed attachments at the test scheduler boundary; production+ // route lookup remains control-plane-only.+ self.conn.commit_declared_session_fixtures_for_test();let output_session_id = command.command_output_session_id().map(str::to_owned);let output_owner =crate::conn::CommandOwnerScope::capture(&self.conn, output_session_id.as_deref());