Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure sharing the same project twice is idempotent

Browse source
This commit is contained in:
Antonio Scandurra 2022-10-07 14:47:06 +02:00
parent d3cddfdced
commit 6fb5901d69
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/call/src/room.rs
View file

@ -299,6 +299,12 @@ impl Room {
project: ModelHandle<Project>, project: ModelHandle<Project>,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Task<Result<u64>> { ) -> 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 let request = self
.client .client
.request(proto::ShareProject { room_id: self.id() }); .request(proto::ShareProject { room_id: self.id() });

10
crates/collab/src/integration_tests.rs
View file

@ -838,6 +838,16 @@ async fn test_active_call_events(
); );
assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]); 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>>> { fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>> {
let events = Rc::new(RefCell::new(Vec::new())); let events = Rc::new(RefCell::new(Vec::new()));
let active_call = cx.read(ActiveCall::global); let active_call = cx.read(ActiveCall::global);