A platform for community discussion. Free, open, simple.
DEV: Redo the chat thread context spec (#39550)
Jarek Radosz0e281751b982
diff --git a/plugins/chat/spec/system/drawer_spec.rb b/plugins/chat/spec/system/drawer_spec.rbindex 6ec777246ca..5f6563d7524 100644--- a/plugins/chat/spec/system/drawer_spec.rb+++ b/plugins/chat/spec/system/drawer_spec.rb@@ -211,55 +211,37 @@ RSpec.describe "Drawer" doendend- context "when sending a message from topic" do- fab!(:topic)- fab!(:posts) { Fabricate.times(5, :post, topic: topic) }- fab!(:channel, :chat_channel)+ context "when sending a message from a thread while viewing a topic" do+ fab!(:post1, :post)+ fab!(:post2) { Fabricate(:post, topic: post1.topic) }+ fab!(:channel) { Fabricate(:chat_channel, threading_enabled: true) }+ fab!(:thread) { Fabricate(:chat_thread, channel: channel, with_replies: 1, use_service: true) }fab!(:membership) doFabricate(:user_chat_channel_membership, user: current_user, chat_channel: channel)endlet(:topic_page) { PageObjects::Pages::Topic.new }+ let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }+ let(:thread_page) { PageObjects::Pages::ChatThread.new }- context "when on a channel" do- xit "has context" do- ::Chat::CreateMessage- .expects(:call)- .with do |value|- value["topic_id"] === topic.id.to_s &&- value["post_ids"] === [posts[1].id.to_s, posts[2].id.to_s, posts[3].id.to_s]- end-- topic_page.visit_topic(topic, post_number: 3)- chat_page.open_from_header- drawer_page.open_channel(channel)- channel_page.send_message- end- end-- context "when on a thread" do- before { channel.update!(threading_enabled: true) }+ before { Jobs.run_immediately! }- fab!(:thread_1) { Fabricate(:chat_thread, channel: channel) }+ it "has topic context" do+ tested_context = {}+ blk = ->(*, context) { tested_context = context }+ DiscourseEvent.on(:chat_message_created, &blk)- let(:thread_list_page) { PageObjects::Components::Chat::ThreadList.new }- let(:thread_page) { PageObjects::Pages::ChatThread.new }-- xit "has context" do- ::Chat::CreateMessage- .expects(:call)- .with do |value|- value["topic_id"] === topic.id.to_s &&- value["post_ids"] === [posts[1].id.to_s, posts[2].id.to_s, posts[3].id.to_s]- end-- topic_page.visit_topic(topic, post_number: 3)- chat_page.open_from_header- drawer_page.open_channel(channel)- drawer_page.open_thread_list- thread_list_page.open_thread(thread_1)- thread_page.send_message- end+ topic_page.visit_topic(post1.topic)+ chat_page.open_from_header+ drawer_page.open_channel(channel)+ drawer_page.open_thread_list+ thread_list_page.open_thread(thread)+ thread_page.send_message++ expect(tested_context.dig(:context, :post_ids)).to eq([post1.id, post2.id])+ expect(tested_context.dig(:context, :topic_id)).to eq(post1.topic_id)+ ensure+ DiscourseEvent.off(:chat_message_created, &blk)endenddiff --git a/plugins/chat/spec/system/send_message_spec.rb b/plugins/chat/spec/system/send_message_spec.rbindex 99e2ee07f71..40c9249934a 100644--- a/plugins/chat/spec/system/send_message_spec.rb+++ b/plugins/chat/spec/system/send_message_spec.rb@@ -109,20 +109,18 @@ RSpec.describe "Send message" doit "has topic context" dotested_context = {}- blk = Proc.new { |message, channel, user, context| tested_context = context }-- begin- DiscourseEvent.on(:chat_message_created, &blk)- topic_page.visit_topic(post_1.topic)- chat_page.open_from_header- drawer_page.open_channel(channel_1)- channel_page.send_message-- expect(tested_context.dig(:context, :post_ids)).to eq([post_1.id, post_2.id])- expect(tested_context.dig(:context, :topic_id)).to eq(post_1.topic_id)- ensure- DiscourseEvent.off(:chat_message_created, &blk)- end+ blk = ->(*, context) { tested_context = context }+ DiscourseEvent.on(:chat_message_created, &blk)++ topic_page.visit_topic(post_1.topic)+ chat_page.open_from_header+ drawer_page.open_channel(channel_1)+ channel_page.send_message++ expect(tested_context.dig(:context, :post_ids)).to eq([post_1.id, post_2.id])+ expect(tested_context.dig(:context, :topic_id)).to eq(post_1.topic_id)+ ensure+ DiscourseEvent.off(:chat_message_created, &blk)endendend