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

Show a different message when participant is active on unshared project

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-10-11 15:24:31 +02:00
parent 29c3b81a0a
commit 4504b36c8f
8 changed files with 97 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -946,6 +946,22 @@ async fn test_room_location(
}
});
room_a
.update(cx_a, |room, cx| room.set_location(Some(&project_a), cx))
.await
.unwrap();
deterministic.run_until_parked();
assert!(a_notified.take());
assert_eq!(
participant_locations(&room_a, cx_a),
vec![("user_b".to_string(), ParticipantLocation::External)]
);
assert!(b_notified.take());
assert_eq!(
participant_locations(&room_b, cx_b),
vec![("user_a".to_string(), ParticipantLocation::UnsharedProject)]
);
let project_a_id = active_call_a
.update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
.await
@ -959,7 +975,12 @@ async fn test_room_location(
assert!(b_notified.take());
assert_eq!(
participant_locations(&room_b, cx_b),
vec![("user_a".to_string(), ParticipantLocation::External)]
vec![(
"user_a".to_string(),
ParticipantLocation::SharedProject {
project_id: project_a_id
}
)]
);
let project_b_id = active_call_b
@ -973,27 +994,11 @@ async fn test_room_location(
vec![("user_b".to_string(), ParticipantLocation::External)]
);
assert!(b_notified.take());
assert_eq!(
participant_locations(&room_b, cx_b),
vec![("user_a".to_string(), ParticipantLocation::External)]
);
room_a
.update(cx_a, |room, cx| room.set_location(Some(&project_a), cx))
.await
.unwrap();
deterministic.run_until_parked();
assert!(a_notified.take());
assert_eq!(
participant_locations(&room_a, cx_a),
vec![("user_b".to_string(), ParticipantLocation::External)]
);
assert!(b_notified.take());
assert_eq!(
participant_locations(&room_b, cx_b),
vec![(
"user_a".to_string(),
ParticipantLocation::Project {
ParticipantLocation::SharedProject {
project_id: project_a_id
}
)]
@ -1009,7 +1014,7 @@ async fn test_room_location(
participant_locations(&room_a, cx_a),
vec![(
"user_b".to_string(),
ParticipantLocation::Project {
ParticipantLocation::SharedProject {
project_id: project_b_id
}
)]
@ -1019,7 +1024,7 @@ async fn test_room_location(
participant_locations(&room_b, cx_b),
vec![(
"user_a".to_string(),
ParticipantLocation::Project {
ParticipantLocation::SharedProject {
project_id: project_a_id
}
)]
@ -1040,7 +1045,7 @@ async fn test_room_location(
participant_locations(&room_b, cx_b),
vec![(
"user_a".to_string(),
ParticipantLocation::Project {
ParticipantLocation::SharedProject {
project_id: project_a_id
}
)]