IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: correctly show user info (#21023)

Browse Source 
This PR primarily fixes this case:

- USER A message
- USER B message
- USER B reply to USER A message <-- not showing user info when it should

Moreover, this commit also improves the spec to correctly test more cases.
This commit is contained in:
Joffrey JAFFEUX
2023-04-07 20:08:31 +02:00
committed by GitHub
parent 1f0aff2719
commit 6d99e6408f
2 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
plugins/chat/spec/system/message_user_info.rb
View File

@@ -1,6 +1,6 @@
# frozen_string_literal: true
RSpec.describe "Sticky date", type: :system, js: true do
RSpec.describe "Message user info", type: :system, js: true do
fab!(:current_user) { Fabricate(:user) }
fab!(:channel_1) { Fabricate(:category_channel) }
@@ -8,53 +8,99 @@ RSpec.describe "Sticky date", type: :system, js: true do
before do
chat_system_bootstrap
channel_1.add(current_user)
sign_in(current_user)
end
context "when previous message is from a different user" do
context "with one message" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
it "shows user info on the message" do
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
end
end
context "with two messages from the same user" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
it "shows user info only on first message" do
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
end
end
context "with a deleted previous message" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
it "shows user info only on second message" do
message_1.trash!
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
end
end
context "when previous message is from the same user" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
context "with messages from a webhook" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1) }
it "doesn’t show user info on the message" do
it "shows user info only on boths messages" do
Fabricate(:chat_webhook_event, chat_message: message_1)
Fabricate(:chat_webhook_event, chat_message: message_2)
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
end
end
context "with large time difference between messages" do
fab!(:message_1) do
Fabricate(:chat_message, chat_channel: channel_1, user: current_user, created_at: 1.days.ago)
end
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
it "shows user info on both messages" do
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
end
end
context "when replying to own previous message" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
fab!(:message_2) do
Fabricate(:chat_message, in_reply_to: message_1, user: current_user, chat_channel: channel_1)
end
context "when previous message is old" do
fab!(:message_1) do
Fabricate(
:chat_message,
chat_channel: channel_1,
user: current_user,
created_at: DateTime.parse("2018-11-10 17:00"),
)
end
fab!(:message_2) do
Fabricate(
:chat_message,
chat_channel: channel_1,
user: current_user,
created_at: DateTime.parse("2018-11-10 17:30"),
)
end
it "shows user info on first message only" do
chat_page.visit_channel(channel_1)
it "shows user info on the message" do
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
end
end
expect(page.find("[data-id='#{message_2.id}']")).to have_no_css(".chat-message-avatar")
end
context "when replying to another user previous message and previous message is yours" do
fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel_1) }
fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel_1, user: current_user) }
fab!(:message_3) do
Fabricate(:chat_message, in_reply_to: message_1, user: current_user, chat_channel: channel_1)
end
it "shows user info on each message" do
chat_page.visit_channel(channel_1)
expect(page.find("[data-id='#{message_1.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_2.id}']")).to have_css(".chat-message-avatar")
expect(page.find("[data-id='#{message_3.id}']")).to have_css(".chat-message-avatar")
end
end
end