github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 11:11:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Rename direct message related models

Browse Source 
This is a followup of the previous refactor where we created two new
models to handle all the dedicated logic that was present in the
`ChatChannel` model.

For the sake of consistency, `DMChannel` has been renamed to
`DirectMessageChannel` and the previous `DirectMessageChannel` model is
now named `DirectMessage`. This should help reasoning about direct
messages.
This commit is contained in:
Loïc Guitaut
2022-11-02 15:53:36 +01:00
committed by Loïc Guitaut
parent 7e992cb299
commit abcaa1a961
57 changed files with 378 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/chat/spec/requests/api/chat_channel_notifications_settings_controller_spec.rb
View File

@ -79,8 +79,7 @@ RSpec.describe Chat::Api::ChatChannelNotificationsSettingsController do
context "when direct message channel has invalid params" do
fab!(:user) { Fabricate(:user) }
fab!(:chatable) { Fabricate(:direct_message_channel, users: [user, Fabricate(:user)]) }
fab!(:chat_channel) { Fabricate(:dm_channel, chatable: chatable) }
fab!(:chat_channel) { Fabricate(:direct_message_channel, users: [user, Fabricate(:user)]) }
fab!(:membership) do
Fabricate(:user_chat_channel_membership, user: user, chat_channel: chat_channel)
end
@ -102,8 +101,7 @@ RSpec.describe Chat::Api::ChatChannelNotificationsSettingsController do
context "when direct message channel has valid params" do
fab!(:user) { Fabricate(:user) }
fab!(:chatable) { Fabricate(:direct_message_channel, users: [user, Fabricate(:user)]) }
fab!(:chat_channel) { Fabricate(:dm_channel, chatable: chatable) }
fab!(:chat_channel) { Fabricate(:direct_message_channel, users: [user, Fabricate(:user)]) }
fab!(:membership) do
Fabricate(
:user_chat_channel_membership,

3
plugins/chat/spec/requests/api/chat_channels_controller_spec.rb
View File

@ -234,8 +234,7 @@ describe Chat::Api::ChatChannelsController do
context "when channel is a direct message channel" do
fab!(:user) { Fabricate(:admin) }
fab!(:chatable) { Fabricate(:direct_message_channel) }
fab!(:chat_channel) { Fabricate(:dm_channel, chatable: chatable) }
fab!(:chat_channel) { Fabricate(:direct_message_channel) }
before { sign_in(user) }