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

windows: Enable collab tests (#27587)

Browse source 
Release Notes:

- N/A
This commit is contained in:
张小白 2025-03-27 20:42:22 +08:00 • committed by GitHub
parent 71ddb3dad4
commit 06960670bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 277 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/collab/src/tests/following_tests.rs
View file

@ -16,6 +16,7 @@ use project::WorktreeSettings;
use rpc::proto::PeerId;
use serde_json::json;
use settings::SettingsStore;
use util::path;
use workspace::{item::ItemHandle as _, SplitDirection, Workspace};
use super::TestClient;
@ -50,7 +51,7 @@ async fn test_basic_following(
client_a
.fs()
.insert_tree(
"/a",
path!("/a"),
json!({
"1.txt": "one\none\none",
"2.txt": "two\ntwo\ntwo",
@ -58,7 +59,7 @@ async fn test_basic_following(
}),
)
.await;
let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
active_call_a
.update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
.await
@ -436,7 +437,9 @@ async fn test_basic_following(
);
// TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
#[cfg(not(target_os = "macos"))]
// todo(windows)
// Fix this on Windows
#[cfg(all(not(target_os = "macos"), not(target_os = "windows")))]
{
use crate::rpc::RECONNECT_TIMEOUT;
use gpui::TestScreenCaptureSource;
@ -1220,7 +1223,7 @@ async fn test_auto_unfollowing(cx_a: &mut TestAppContext, cx_b: &mut TestAppCont
client_a
.fs()
.insert_tree(
"/a",
path!("/a"),
json!({
"1.txt": "one",
"2.txt": "two",
@ -1228,7 +1231,7 @@ async fn test_auto_unfollowing(cx_a: &mut TestAppContext, cx_b: &mut TestAppCont
}),
)
.await;
let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
active_call_a
.update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
.await
@ -1435,7 +1438,7 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
client_a
.fs()
.insert_tree(
"/a",
path!("/a"),
json!({
"w.rs": "",
"x.rs": "",
@ -1446,7 +1449,7 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
client_b
.fs()
.insert_tree(
"/b",
path!("/b"),
json!({
"y.rs": "",
"z.rs": "",
@ -1460,8 +1463,8 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
let active_call_a = cx_a.read(ActiveCall::global);
let active_call_b = cx_b.read(ActiveCall::global);
let (project_a, worktree_id_a) = client_a.build_local_project("/a", cx_a).await;
let (project_b, worktree_id_b) = client_b.build_local_project("/b", cx_b).await;
let (project_a, worktree_id_a) = client_a.build_local_project(path!("/a"), cx_a).await;
let (project_b, worktree_id_b) = client_b.build_local_project(path!("/b"), cx_b).await;
let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
@ -1718,7 +1721,7 @@ async fn test_following_into_excluded_file(
client_a
.fs()
.insert_tree(
"/a",
path!("/a"),
json!({
".git": {
"COMMIT_EDITMSG": "write your commit message here",
@ -1729,7 +1732,7 @@ async fn test_following_into_excluded_file(
}),
)
.await;
let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
let (project_a, worktree_id) = client_a.build_local_project(path!("/a"), cx_a).await;
active_call_a
.update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
.await