Merge pull request #1752 from zed-industries/allow-inviting-users-to-another-guest-project

Antonio Scandurra created 3 years ago

Allow inviting users to a project that was shared by someone else

Change summary

crates/call/src/room.rs                |  4 +---
crates/collab/src/integration_tests.rs | 26 +++++++++++++++++++++++++-
2 files changed, 26 insertions(+), 4 deletions(-)

Detailed changes

crates/call/src/room.rs

@@ -374,9 +374,7 @@ impl Room {
         project: ModelHandle<Project>,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<u64>> {
-        if project.read(cx).is_remote() {
-            return Task::ready(Err(anyhow!("can't share remote project")));
-        } else if let Some(project_id) = project.read(cx).remote_id() {
+        if let Some(project_id) = project.read(cx).remote_id() {
             return Task::ready(Ok(project_id));
         }
 

crates/collab/src/integration_tests.rs

@@ -532,17 +532,20 @@ async fn test_share_project(
     deterministic: Arc<Deterministic>,
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
+    cx_c: &mut TestAppContext,
 ) {
     deterministic.forbid_parking();
     let (_, window_b) = cx_b.add_window(|_| EmptyView);
     let mut server = TestServer::start(cx_a.foreground(), cx_a.background()).await;
     let client_a = server.create_client(cx_a, "user_a").await;
     let client_b = server.create_client(cx_b, "user_b").await;
+    let client_c = server.create_client(cx_c, "user_c").await;
     server
-        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
+        .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
         .await;
     let active_call_a = cx_a.read(ActiveCall::global);
     let active_call_b = cx_b.read(ActiveCall::global);
+    let active_call_c = cx_c.read(ActiveCall::global);
 
     client_a
         .fs
@@ -633,6 +636,27 @@ async fn test_share_project(
         .condition(cx_a, |buffer, _| buffer.text() == "ok, b-contents")
         .await;
 
+    // Client B can invite client C on a project shared by client A.
+    active_call_b
+        .update(cx_b, |call, cx| {
+            call.invite(client_c.user_id().unwrap(), Some(project_b.clone()), cx)
+        })
+        .await
+        .unwrap();
+
+    let incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
+    deterministic.run_until_parked();
+    let call = incoming_call_c.borrow().clone().unwrap();
+    assert_eq!(call.caller.github_login, "user_b");
+    let initial_project = call.initial_project.unwrap();
+    active_call_c
+        .update(cx_c, |call, cx| call.accept_incoming(cx))
+        .await
+        .unwrap();
+    let _project_c = client_c
+        .build_remote_project(initial_project.id, cx_c)
+        .await;
+
     // TODO
     // // Remove the selection set as client B, see those selections disappear as client A.
     cx_b.update(move |_| drop(editor_b));