mirror of
https://github.com/discourse/discourse.git
synced 2025-02-06 03:18:23 +00:00
This commit implements all the necessary logic to create thread seamlessly. For this it relies on the same logic used for messages and generates a `staged-id`(using the format: `staged-thread-CHANNEL_ID-MESSAGE_ID` which is used to re-conciliate state client sides once the thread has been persisted on the backend. Part of this change the client side is now always using real thread and channel objects instead of sometimes relying on a flat `threadId` or `channelId`. This PR also brings three UX changes: - thread starts from top - number of buttons on message actions is dependent of the width of the enclosing container - <kbd>shift + ArrowUp</kbd> will reply to the last message
102 lines
4.0 KiB
Ruby
102 lines
4.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
describe "Channel thread message echoing", type: :system, js: true do
|
|
fab!(:current_user) { Fabricate(:user) }
|
|
fab!(:other_user) { Fabricate(:user) }
|
|
|
|
let(:chat_page) { PageObjects::Pages::Chat.new }
|
|
let(:channel_page) { PageObjects::Pages::ChatChannel.new }
|
|
let(:side_panel) { PageObjects::Pages::ChatSidePanel.new }
|
|
let(:open_thread) { PageObjects::Pages::ChatThread.new }
|
|
let(:chat_drawer_page) { PageObjects::Pages::ChatDrawer.new }
|
|
|
|
before do
|
|
chat_system_bootstrap(current_user, [channel])
|
|
sign_in(current_user)
|
|
end
|
|
|
|
context "when enable_experimental_chat_threaded_discussions is disabled" do
|
|
fab!(:channel) { Fabricate(:chat_channel) }
|
|
before { SiteSetting.enable_experimental_chat_threaded_discussions = false }
|
|
|
|
it "echoes the thread messages into the main channel stream" do
|
|
thread = chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
|
|
chat_page.visit_channel(channel)
|
|
thread.chat_messages.each do |thread_message|
|
|
expect(channel_page).to have_css(channel_page.message_by_id_selector(thread_message.id))
|
|
end
|
|
end
|
|
end
|
|
|
|
context "when threading_enabled is false for the channel" do
|
|
fab!(:channel) { Fabricate(:chat_channel) }
|
|
before do
|
|
SiteSetting.enable_experimental_chat_threaded_discussions = true
|
|
channel.update!(threading_enabled: false)
|
|
end
|
|
|
|
it "echoes the thread messages into the main channel stream" do
|
|
thread = chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
|
|
chat_page.visit_channel(channel)
|
|
thread.chat_messages.each do |thread_message|
|
|
expect(channel_page).to have_css(channel_page.message_by_id_selector(thread_message.id))
|
|
end
|
|
end
|
|
end
|
|
|
|
context "when enable_experimental_chat_threaded_discussions is true and threading is enabled for the channel" do
|
|
fab!(:channel) { Fabricate(:chat_channel) }
|
|
fab!(:thread) do
|
|
chat_thread_chain_bootstrap(channel: channel, users: [current_user, other_user])
|
|
end
|
|
|
|
before do
|
|
SiteSetting.enable_experimental_chat_threaded_discussions = true
|
|
channel.update!(threading_enabled: true)
|
|
end
|
|
|
|
it "does not echo the thread messages except for the original message into the channel stream" do
|
|
chat_page.visit_channel(channel)
|
|
expect(channel_page).to have_css(
|
|
channel_page.message_by_id_selector(thread.original_message.id),
|
|
)
|
|
thread.replies.each do |thread_message|
|
|
expect(channel_page).not_to have_css(channel_page.message_by_id_selector(thread_message.id))
|
|
end
|
|
end
|
|
|
|
it "does not echo new thread messages into the channel stream" do
|
|
chat_page.visit_channel(channel)
|
|
channel_page.message_thread_indicator(thread.original_message).click
|
|
expect(side_panel).to have_open_thread(thread)
|
|
open_thread.send_message("new thread message")
|
|
expect(open_thread).to have_message(thread_id: thread.id, text: "new thread message")
|
|
new_message = thread.reload.replies.last
|
|
expect(channel_page).not_to have_css(channel_page.message_by_id_selector(new_message.id))
|
|
end
|
|
|
|
it "does not echo the looked up message into the channel stream if it is in a thread" do
|
|
current_user
|
|
.user_chat_channel_memberships
|
|
.find_by(chat_channel: channel)
|
|
.update!(last_read_message_id: thread.replies.last.id)
|
|
chat_page.visit_channel(channel)
|
|
expect(channel_page).not_to have_css(
|
|
channel_page.message_by_id_selector(thread.replies.last.id),
|
|
)
|
|
end
|
|
|
|
it "does show the thread original_message if it is the last message in the channel" do
|
|
new_thread = Fabricate(:chat_thread, channel: channel)
|
|
current_user
|
|
.user_chat_channel_memberships
|
|
.find_by(chat_channel: channel)
|
|
.update!(last_read_message_id: new_thread.original_message_id)
|
|
chat_page.visit_channel(channel)
|
|
expect(channel_page).to have_css(
|
|
channel_page.message_by_id_selector(new_thread.original_message_id),
|
|
)
|
|
end
|
|
end
|
|
end
|