From e6087e0ed9ecb1fc5ae898e6e30c8fe312fa2742 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 24 Oct 2023 09:46:46 +0200
Subject: [PATCH] Fix tests

---
 crates/collab/src/tests/channel_buffer_tests.rs |  5 +----
 crates/collab/src/tests/channel_tests.rs        | 14 +++++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/crates/collab/src/tests/channel_buffer_tests.rs b/crates/collab/src/tests/channel_buffer_tests.rs
index cb51c7c5f3..931610f5ff 100644
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -436,10 +436,7 @@ async fn test_channel_buffer_disconnect(
 
     // Channel buffer observed the deletion
     channel_buffer_b.update(cx_b, |buffer, cx| {
-        assert_eq!(
-            buffer.channel(cx).unwrap().as_ref(),
-            &channel(channel_id, "the-channel", proto::ChannelRole::Member)
-        );
+        assert!(buffer.channel(cx).is_none());
         assert!(!buffer.is_connected());
     });
 }
diff --git a/crates/collab/src/tests/channel_tests.rs b/crates/collab/src/tests/channel_tests.rs
index 63cc78b651..85503f8ea3 100644
--- a/crates/collab/src/tests/channel_tests.rs
+++ b/crates/collab/src/tests/channel_tests.rs
@@ -1,4 +1,5 @@
 use crate::{
+    db::{self, UserId},
     rpc::RECONNECT_TIMEOUT,
     tests::{room_participants, RoomParticipants, TestServer},
 };
@@ -292,11 +293,14 @@ async fn test_core_channels(
     server.disconnect_client(client_a.peer_id().unwrap());
     deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
 
-    client_b
-        .channel_store()
-        .update(cx_b, |channel_store, cx| {
-            channel_store.rename(channel_a_id, "channel-a-renamed", cx)
-        })
+    server
+        .app_state
+        .db
+        .rename_channel(
+            db::ChannelId::from_proto(channel_a_id),
+            UserId::from_proto(client_a.id()),
+            "channel-a-renamed",
+        )
         .await
         .unwrap();