github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +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

16
plugins/chat/spec/requests/direct_messages_controller_spec.rb
View File

@ -15,11 +15,11 @@ RSpec.describe Chat::DirectMessagesController do
end
def create_dm_channel(user_ids)
direct_messages_channel = DirectMessageChannel.create!
direct_messages_channel = DirectMessage.create!
user_ids.each do |user_id|
direct_messages_channel.direct_message_users.create!(user_id: user_id)
end
DMChannel.create!(chatable: direct_messages_channel)
DirectMessageChannel.create!(chatable: direct_messages_channel)
end
describe "#index" do
@ -41,10 +41,10 @@ RSpec.describe Chat::DirectMessagesController do
context "when channel exists" do
let!(:channel) do
direct_messages_channel = DirectMessageChannel.create!
direct_messages_channel = DirectMessage.create!
direct_messages_channel.direct_message_users.create!(user_id: user.id)
direct_messages_channel.direct_message_users.create!(user_id: user1.id)
DMChannel.create!(chatable: direct_messages_channel)
DirectMessageChannel.create!(chatable: direct_messages_channel)
end
it "returns the channel" do
@ -76,8 +76,8 @@ RSpec.describe Chat::DirectMessagesController do
it "creates a new dm channel with username(s) provided" do
expect {
post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
}.to change { DirectMessageChannel.count }.by(1)
expect(DirectMessageChannel.last.direct_message_users.map(&:user_id)).to match_array(
}.to change { DirectMessage.count }.by(1)
expect(DirectMessage.last.direct_message_users.map(&:user_id)).to match_array(
direct_message_user_ids,
)
end
@ -86,7 +86,7 @@ RSpec.describe Chat::DirectMessagesController do
create_dm_channel(direct_message_user_ids)
expect {
post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
}.not_to change { DirectMessageChannel.count }
}.not_to change { DirectMessage.count }
end
end
@ -127,7 +127,7 @@ RSpec.describe Chat::DirectMessagesController do
it "responds with a friendly error" do
expect {
post "/chat/direct_messages/create.json", params: { usernames: [usernames] }
}.not_to change { DirectMessageChannel.count }
}.not_to change { DirectMessage.count }
expect(response.status).to eq(422)
expect(response.parsed_body["errors"]).to eq(
[I18n.t("chat.errors.not_accepting_dms", username: user1.username)],