github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 18:38:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sort chat channels by slug (#25656)

Browse Source 
Channels can include emojis in front of the channel title which causes problems when sorting.

Using the channel slug is a more reliable way to sort and avoid these kind of issues.
This commit is contained in:
David Battersby
2024-02-13 12:59:46 +08:00
committed by GitHub
parent 949b5f3fa9
commit 85001a27e9
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/chat/spec/system/list_channels/mobile_spec.rb
View File

@ -62,7 +62,7 @@ RSpec.describe "List channels | mobile", type: :system, mobile: true do
channel_4.add(current_user)
end
it "sorts them by mentions, unread, then alphabetical order" do
it "sorts them by mentions, unread, then by slug" do
Jobs.run_immediately!
Fabricate(
@ -92,7 +92,7 @@ RSpec.describe "List channels | mobile", type: :system, mobile: true do
expect(page.find("#public-channels a:nth-child(1)")["data-chat-channel-id"]).to eq(
channel_4.id.to_s,
)
# channels with unread messages are next, sorted by title
# channels with unread messages are next
expect(page.find("#public-channels a:nth-child(2)")["data-chat-channel-id"]).to eq(
channel_1.id.to_s,
)
@ -100,6 +100,24 @@ RSpec.describe "List channels | mobile", type: :system, mobile: true do
channel_2.id.to_s,
)
end
context "with emojis in title" do
before do
channel_1.update!(name: ":pear: a channel")
channel_2.update!(name: ":apple: b channel")
end
it "sorts them by slug" do
visit("/chat/channels")
expect(page.find("#public-channels a:nth-child(1)")["data-chat-channel-id"]).to eq(
channel_1.id.to_s,
)
expect(page.find("#public-channels a:nth-child(2)")["data-chat-channel-id"]).to eq(
channel_2.id.to_s,
)
end
end
end
context "when direct message channels" do