From 50c4783333b9c325bad1ffc615a5d7095fd1a162 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 24 Oct 2022 15:17:25 +0200 Subject: [PATCH] Add test for screen-sharing --- crates/collab/src/integration_tests.rs | 65 ++++++++++++++++++++++++-- crates/workspace/src/workspace.rs | 2 +- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/crates/collab/src/integration_tests.rs b/crates/collab/src/integration_tests.rs index 406a97025e..80ed46c336 100644 --- a/crates/collab/src/integration_tests.rs +++ b/crates/collab/src/integration_tests.rs @@ -55,7 +55,7 @@ use std::{ }; use theme::ThemeRegistry; use unindent::Unindent as _; -use workspace::{Item, SplitDirection, ToggleFollow, Workspace}; +use workspace::{shared_screen::SharedScreen, Item, SplitDirection, ToggleFollow, Workspace}; #[ctor::ctor] fn init_logger() { @@ -5058,7 +5058,11 @@ async fn test_contact_requests( } #[gpui::test(iterations = 10)] -async fn test_following(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) { +async fn test_following( + deterministic: Arc, + cx_a: &mut TestAppContext, + cx_b: &mut TestAppContext, +) { cx_a.foreground().forbid_parking(); cx_a.update(editor::init); cx_b.update(editor::init); @@ -5239,7 +5243,7 @@ async fn test_following(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) { workspace_a.update(cx_a, |workspace, cx| { workspace.activate_item(&editor_a2, cx) }); - cx_a.foreground().run_until_parked(); + deterministic.run_until_parked(); assert_eq!( workspace_b.read_with(cx_b, |workspace, cx| workspace .active_item(cx) @@ -5269,9 +5273,62 @@ async fn test_following(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) { editor_a1.id() ); + // Client B activates an external window, which causes a new screen-sharing item to be added to the pane. + let display = MacOSDisplay::new(); + active_call_b + .update(cx_b, |call, cx| call.set_location(None, cx)) + .await + .unwrap(); + active_call_b + .update(cx_b, |call, cx| { + call.room().unwrap().update(cx, |room, cx| { + room.set_display_sources(vec![display.clone()]); + room.share_screen(cx) + }) + }) + .await + .unwrap(); + deterministic.run_until_parked(); + let shared_screen = workspace_a.read_with(cx_a, |workspace, cx| { + workspace + .active_item(cx) + .unwrap() + .downcast::() + .unwrap() + }); + + // Client B activates Zed again, which causes the previous editor to become focused again. + active_call_b + .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx)) + .await + .unwrap(); + deterministic.run_until_parked(); + assert_eq!( + workspace_a.read_with(cx_a, |workspace, cx| workspace + .active_item(cx) + .unwrap() + .id()), + editor_a1.id() + ); + + // Client B activates an external window again, and the previously-opened screen-sharing item + // gets activated. + active_call_b + .update(cx_b, |call, cx| call.set_location(None, cx)) + .await + .unwrap(); + deterministic.run_until_parked(); + assert_eq!( + workspace_a.read_with(cx_a, |workspace, cx| workspace + .active_item(cx) + .unwrap() + .id()), + shared_screen.id() + ); + // Following interrupts when client B disconnects. client_b.disconnect(&cx_b.to_async()).unwrap(); - cx_a.foreground().run_until_parked(); + deterministic.run_until_parked(); assert_eq!( workspace_a.read_with(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)), None diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index c3e54c525b..e7752219c5 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -6,7 +6,7 @@ pub mod dock; pub mod pane; pub mod pane_group; pub mod searchable; -mod shared_screen; +pub mod shared_screen; pub mod sidebar; mod status_bar; mod toolbar;