Ensure sharing the same project twice is idempotent

Antonio Scandurra created 3 years ago

Change summary

crates/call/src/room.rs                |  6 ++++++
crates/collab/src/integration_tests.rs | 10 ++++++++++
2 files changed, 16 insertions(+)

Detailed changes

crates/call/src/room.rs

@@ -299,6 +299,12 @@ 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() {
+            return Task::ready(Ok(project_id));
+        }
+
         let request = self
             .client
             .request(proto::ShareProject { room_id: self.id() });

crates/collab/src/integration_tests.rs

@@ -838,6 +838,16 @@ async fn test_active_call_events(
     );
     assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
 
+    // Sharing a project twice is idempotent.
+    let project_b_id_2 = active_call_b
+        .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
+        .await
+        .unwrap();
+    assert_eq!(project_b_id_2, project_b_id);
+    deterministic.run_until_parked();
+    assert_eq!(mem::take(&mut *events_a.borrow_mut()), vec![]);
+    assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
+
     fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>> {
         let events = Rc::new(RefCell::new(Vec::new()));
         let active_call = cx.read(ActiveCall::global);