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

Merge branch 'main' into assists

Browse source
This commit is contained in:
Max Brunsfeld 2022-02-08 12:41:57 -08:00
commit e0fe8b5a7c
10 changed files with 126 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/server/src/rpc.rs
View file

@ -1244,11 +1244,12 @@ mod tests {
#[cfg(test)]
#[ctor::ctor]
fn init_logger() {
// std::env::set_var("RUST_LOG", "info");
env_logger::init();
if std::env::var("RUST_LOG").is_ok() {
env_logger::init();
}
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_share_project(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
let (window_b, _) = cx_b.add_window(|_| EmptyView);
let lang_registry = Arc::new(LanguageRegistry::new());
@ -1387,7 +1388,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_unshare_project(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
@ -1484,7 +1485,7 @@ mod tests {
.unwrap();
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_propagate_saves_and_fs_changes(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
@ -1674,7 +1675,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_buffer_conflict_after_save(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
@ -1767,7 +1768,7 @@ mod tests {
});
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_buffer_reloading(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
@ -1929,7 +1930,7 @@ mod tests {
buffer_b.condition(&cx_b, |buf, _| buf.text() == text).await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_leaving_worktree_while_opening_buffer(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
@ -2007,7 +2008,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_peer_disconnection(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
@ -2078,7 +2079,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_collaborating_with_diagnostics(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
@ -2302,7 +2303,7 @@ mod tests {
});
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_collaborating_with_completion(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
@ -2527,7 +2528,7 @@ mod tests {
);
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_formatting_buffer(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -2631,7 +2632,7 @@ mod tests {
);
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_definition(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -2788,7 +2789,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_open_buffer_while_getting_definition_pointing_to_it(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
@ -2902,7 +2903,7 @@ mod tests {
assert_eq!(definitions[0].target_buffer, buffer_b2);
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_basic_chat(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
@ -3042,7 +3043,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_chat_message_validation(mut cx_a: TestAppContext) {
cx_a.foreground().forbid_parking();
@ -3102,7 +3103,7 @@ mod tests {
);
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_chat_reconnection(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
cx_a.foreground().forbid_parking();
@ -3314,7 +3315,7 @@ mod tests {
.await;
}
#[gpui::test]
#[gpui::test(iterations = 10)]
async fn test_contacts(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,