Merge branch 'main' into channel-changes

2023-10-03 17:52:28 -07:00
parent 61e0289014 55d2b9b3c9
commit 95342c8c33
69 changed files with 3632 additions and 1895 deletions
@@ -4,6 +4,7 @@ use gpui::{ModelHandle, TestAppContext};
 mod channel_buffer_tests;
 mod channel_message_tests;
 mod channel_tests;
+mod following_tests;
 mod integration_tests;
 mod random_channel_buffer_tests;
 mod random_project_collaboration_tests;
@@ -706,9 +706,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
    // Client B follows client A.
    workspace_b
        .update(cx_b, |workspace, cx| {
-            workspace
-                .toggle_follow(client_a.peer_id().unwrap(), cx)
-                .unwrap()
+            workspace.follow(client_a.peer_id().unwrap(), cx).unwrap()
        })
        .await
        .unwrap();