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

Restore missing test

Browse source
This commit is contained in:
Mikayla 2024-01-10 10:23:17 -08:00
parent c98d7adf83
commit 2a09c6aad5
No known key found for this signature in database
1 changed files with 110 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

218
crates/collab/src/tests/channel_message_tests.rs
View file

@ -1,7 +1,9 @@
use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer}; use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
use channel::{ChannelChat, ChannelMessageId, MessageParams}; use channel::{ChannelChat, ChannelMessageId, MessageParams};
use collab_ui::chat_panel::ChatPanel;
use gpui::{BackgroundExecutor, Model, TestAppContext}; use gpui::{BackgroundExecutor, Model, TestAppContext};
use rpc::Notification; use rpc::Notification;
use workspace::dock::Panel;
#[gpui::test] #[gpui::test]
async fn test_basic_channel_messages( async fn test_basic_channel_messages(
@ -273,135 +275,135 @@ fn assert_messages(chat: &Model<ChannelChat>, messages: &[&str], cx: &mut TestAp
); );
} }
//todo!(collab_ui) #[gpui::test]
// #[gpui::test] async fn test_channel_message_changes(
// async fn test_channel_message_changes( executor: BackgroundExecutor,
// executor: BackgroundExecutor, cx_a: &mut TestAppContext,
// cx_a: &mut TestAppContext, cx_b: &mut TestAppContext,
// cx_b: &mut TestAppContext, ) {
// ) { let mut server = TestServer::start(executor.clone()).await;
// let mut server = TestServer::start(&executor).await; let client_a = server.create_client(cx_a, "user_a").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_b = server.create_client(cx_b, "user_b").await;
// let channel_id = server let channel_id = server
// .make_channel( .make_channel(
// "the-channel", "the-channel",
// None, None,
// (&client_a, cx_a), (&client_a, cx_a),
// &mut [(&client_b, cx_b)], &mut [(&client_b, cx_b)],
// ) )
// .await; .await;
// // Client A sends a message, client B should see that there is a new message. // Client A sends a message, client B should see that there is a new message.
// let channel_chat_a = client_a let channel_chat_a = client_a
// .channel_store() .channel_store()
// .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx)) .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
// .await .await
// .unwrap(); .unwrap();
// channel_chat_a channel_chat_a
// .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap()) .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
// .await .await
// .unwrap(); .unwrap();
// executor.run_until_parked(); executor.run_until_parked();
// let b_has_messages = cx_b.read_with(|cx| { let b_has_messages = cx_b.update(|cx| {
// client_b client_b
// .channel_store() .channel_store()
// .read(cx) .read(cx)
// .has_new_messages(channel_id) .has_new_messages(channel_id)
// .unwrap() .unwrap()
// }); });
// assert!(b_has_messages); assert!(b_has_messages);
// // Opening the chat should clear the changed flag. // Opening the chat should clear the changed flag.
// cx_b.update(|cx| { cx_b.update(|cx| {
// collab_ui::init(&client_b.app_state, cx); collab_ui::init(&client_b.app_state, cx);
// }); });
// let project_b = client_b.build_empty_local_project(cx_b); let project_b = client_b.build_empty_local_project(cx_b);
// let workspace_b = client_b.build_workspace(&project_b, cx_b).root(cx_b); let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
// let chat_panel_b = workspace_b.update(cx_b, |workspace, cx| ChatPanel::new(workspace, cx));
// chat_panel_b
// .update(cx_b, |chat_panel, cx| {
// chat_panel.set_active(true, cx);
// chat_panel.select_channel(channel_id, None, cx)
// })
// .await
// .unwrap();
// executor.run_until_parked(); let chat_panel_b = workspace_b.update(cx_b, |workspace, cx| ChatPanel::new(workspace, cx));
chat_panel_b
.update(cx_b, |chat_panel, cx| {
chat_panel.set_active(true, cx);
chat_panel.select_channel(channel_id, None, cx)
})
.await
.unwrap();
// let b_has_messages = cx_b.read_with(|cx| { executor.run_until_parked();
// client_b
// .channel_store()
// .read(cx)
// .has_new_messages(channel_id)
// .unwrap()
// });
// assert!(!b_has_messages); let b_has_messages = cx_b.update(|cx| {
client_b
.channel_store()
.read(cx)
.has_new_messages(channel_id)
.unwrap()
});
// // Sending a message while the chat is open should not change the flag. assert!(!b_has_messages);
// channel_chat_a
// .update(cx_a, |c, cx| c.send_message("two".into(), cx).unwrap())
// .await
// .unwrap();
// executor.run_until_parked(); // Sending a message while the chat is open should not change the flag.
channel_chat_a
.update(cx_a, |c, cx| c.send_message("two".into(), cx).unwrap())
.await
.unwrap();
// let b_has_messages = cx_b.read_with(|cx| { executor.run_until_parked();
// client_b
// .channel_store()
// .read(cx)
// .has_new_messages(channel_id)
// .unwrap()
// });
// assert!(!b_has_messages); let b_has_messages = cx_b.update(|cx| {
client_b
.channel_store()
.read(cx)
.has_new_messages(channel_id)
.unwrap()
});
// // Sending a message while the chat is closed should change the flag. assert!(!b_has_messages);
// chat_panel_b.update(cx_b, |chat_panel, cx| {
// chat_panel.set_active(false, cx);
// });
// // Sending a message while the chat is open should not change the flag. // Sending a message while the chat is closed should change the flag.
// channel_chat_a chat_panel_b.update(cx_b, |chat_panel, cx| {
// .update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap()) chat_panel.set_active(false, cx);
// .await });
// .unwrap();
// executor.run_until_parked(); // Sending a message while the chat is open should not change the flag.
channel_chat_a
.update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap())
.await
.unwrap();
// let b_has_messages = cx_b.read_with(|cx| { executor.run_until_parked();
// client_b
// .channel_store()
// .read(cx)
// .has_new_messages(channel_id)
// .unwrap()
// });
// assert!(b_has_messages); let b_has_messages = cx_b.update(|cx| {
client_b
.channel_store()
.read(cx)
.has_new_messages(channel_id)
.unwrap()
});
// // Closing the chat should re-enable change tracking assert!(b_has_messages);
// cx_b.update(|_| drop(chat_panel_b));
// channel_chat_a // Closing the chat should re-enable change tracking
// .update(cx_a, |c, cx| c.send_message("four".into(), cx).unwrap()) cx_b.update(|_| drop(chat_panel_b));
// .await
// .unwrap();
// executor.run_until_parked(); channel_chat_a
.update(cx_a, |c, cx| c.send_message("four".into(), cx).unwrap())
.await
.unwrap();
// let b_has_messages = cx_b.read_with(|cx| { executor.run_until_parked();
// client_b
// .channel_store()
// .read(cx)
// .has_new_messages(channel_id)
// .unwrap()
// });
// assert!(b_has_messages); let b_has_messages = cx_b.update(|cx| {
// } client_b
.channel_store()
.read(cx)
.has_new_messages(channel_id)
.unwrap()
});
assert!(b_has_messages);
}