mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
d3a1b09361
This commit allows the user to set their preference vis-a-vis the chat icon in the header of the page. There are three options: - All New (default) - This maintains the existing behaviour where all new messages in the channel show a blue dot on the icon - Direct Messages and Mentions - Only show the green dot on the icon when you are directly messaged or mentioned, the blue dot is never shown - Never - Never show any dot on the chat icon, for those who want tractor-beam-laser-focus
241 lines
8.8 KiB
Ruby
241 lines
8.8 KiB
Ruby
# frozen_string_literal: true
|
||
|
||
RSpec.describe "Message notifications - with sidebar", type: :system, js: true do
|
||
fab!(:current_user) { Fabricate(:user) }
|
||
|
||
let!(:chat_page) { PageObjects::Pages::Chat.new }
|
||
let!(:chat_channel_page) { PageObjects::Pages::ChatChannel.new }
|
||
|
||
before do
|
||
SiteSetting.navigation_menu = "sidebar"
|
||
chat_system_bootstrap
|
||
end
|
||
|
||
def create_message(text: "this is fine", channel:, creator: Fabricate(:user))
|
||
sign_in(creator)
|
||
chat_page.visit_channel(channel)
|
||
chat_channel_page.send_message(text)
|
||
expect(chat_channel_page).to have_message(text: text)
|
||
end
|
||
|
||
context "as a user" do
|
||
before { sign_in(current_user) }
|
||
|
||
context "when on homepage" do
|
||
context "with public channel" do
|
||
fab!(:channel_1) { Fabricate(:category_channel) }
|
||
fab!(:channel_2) { Fabricate(:category_channel) }
|
||
fab!(:user_1) { Fabricate(:user) }
|
||
|
||
before { channel_1.add(user_1) }
|
||
|
||
context "when not member of the channel" do
|
||
context "when a message is created" do
|
||
it "doesn't show anything" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
|
||
expect(page).to have_no_css(".sidebar-row.channel-#{channel_1.id}")
|
||
end
|
||
end
|
||
end
|
||
|
||
context "when member of the channel" do
|
||
before { channel_1.add(current_user) }
|
||
|
||
context "when user is in DnD" do
|
||
before do
|
||
Fabricate(
|
||
:do_not_disturb_timing,
|
||
user: current_user,
|
||
starts_at: 1.week.ago,
|
||
ends_at: 1.week.from_now,
|
||
)
|
||
end
|
||
|
||
it "doesn’t show indicator in header" do
|
||
Jobs.run_immediately!
|
||
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".do-not-disturb-background")
|
||
expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
|
||
end
|
||
end
|
||
|
||
context "when channel is muted" do
|
||
before { channel_1.membership_for(current_user).update!(muted: true) }
|
||
|
||
context "when a message is created" do
|
||
it "doesn't show anything" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
|
||
expect(page).to have_no_css(".sidebar-row.channel-#{channel_1.id} .unread")
|
||
end
|
||
end
|
||
end
|
||
|
||
context "when user chat_header_indicator_preference is set to 'never'" do
|
||
before do
|
||
current_user.user_option.update!(
|
||
chat_header_indicator_preference:
|
||
UserOption.chat_header_indicator_preferences[:never],
|
||
)
|
||
end
|
||
|
||
context "when a message is created" do
|
||
it "doesn't show any indicator on chat-header-icon" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_no_css(".chat-header-icon .chat-channel-unread-indicator")
|
||
end
|
||
end
|
||
end
|
||
|
||
context "when user chat_header_indicator_preference is set to 'dm_and_mentions'" do
|
||
before do
|
||
current_user.user_option.update!(
|
||
chat_header_indicator_preference:
|
||
UserOption.chat_header_indicator_preferences[:dm_and_mentions],
|
||
)
|
||
end
|
||
|
||
context "when a message is created" do
|
||
it "doesn't show any indicator on chat-header-icon" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_no_css(
|
||
".chat-header-icon .chat-channel-unread-indicator.urgent",
|
||
)
|
||
end
|
||
end
|
||
|
||
context "when a message with a mention is created" do
|
||
it "does show an indicator on chat-header-icon" do
|
||
Jobs.run_immediately!
|
||
|
||
visit("/")
|
||
using_session(:user_1) do
|
||
create_message(
|
||
text: "hey what's going on @#{current_user.username}?",
|
||
channel: channel_1,
|
||
creator: user_1,
|
||
)
|
||
end
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator.urgent")
|
||
end
|
||
end
|
||
end
|
||
|
||
context "when a message is created" do
|
||
it "correctly renders notifications" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
|
||
expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .unread")
|
||
end
|
||
end
|
||
|
||
context "when a message with mentions is created" do
|
||
it "correctly renders notifications" do
|
||
Jobs.run_immediately!
|
||
|
||
visit("/")
|
||
using_session(:user_1) do
|
||
create_message(
|
||
channel: channel_1,
|
||
creator: user_1,
|
||
text: "hello @#{current_user.username} what's up?",
|
||
)
|
||
end
|
||
|
||
expect(page).to have_css(
|
||
".chat-header-icon .chat-channel-unread-indicator.urgent",
|
||
text: "1",
|
||
)
|
||
expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .icon.urgent")
|
||
end
|
||
end
|
||
end
|
||
end
|
||
|
||
context "with dm channel" do
|
||
fab!(:current_user) { Fabricate(:admin) }
|
||
fab!(:user_1) { Fabricate(:user) }
|
||
fab!(:user_2) { Fabricate(:user) }
|
||
|
||
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
|
||
fab!(:dm_channel_2) { Fabricate(:direct_message_channel, users: [current_user, user_2]) }
|
||
|
||
context "when a message is created" do
|
||
it "correctly renders notifications" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
|
||
expect(page).to have_css(".sidebar-row.channel-#{dm_channel_1.id} .icon.urgent")
|
||
|
||
using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "2")
|
||
end
|
||
|
||
it "reorders channels" do
|
||
visit("/chat")
|
||
|
||
expect(page).to have_css(
|
||
"#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(1) .channel-#{dm_channel_1.id}",
|
||
)
|
||
expect(page).to have_css(
|
||
"#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(2) .channel-#{dm_channel_2.id}",
|
||
)
|
||
|
||
using_session(:user_1) { create_message(channel: dm_channel_2, creator: user_2) }
|
||
|
||
expect(page).to have_css(
|
||
"#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(1) .channel-#{dm_channel_2.id}",
|
||
)
|
||
expect(page).to have_css(
|
||
"#sidebar-section-content-chat-dms .sidebar-section-link-wrapper:nth-child(2) .channel-#{dm_channel_1.id}",
|
||
)
|
||
end
|
||
end
|
||
end
|
||
|
||
context "with dm and public channel" do
|
||
fab!(:current_user) { Fabricate(:admin) }
|
||
fab!(:user_1) { Fabricate(:user) }
|
||
fab!(:channel_1) { Fabricate(:category_channel) }
|
||
fab!(:dm_channel_1) { Fabricate(:direct_message_channel, users: [current_user, user_1]) }
|
||
|
||
before do
|
||
channel_1.add(user_1)
|
||
channel_1.add(current_user)
|
||
end
|
||
|
||
context "when messages are created" do
|
||
it "correctly renders notifications" do
|
||
visit("/")
|
||
using_session(:user_1) { create_message(channel: channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "")
|
||
expect(page).to have_css(".sidebar-row.channel-#{channel_1.id} .unread")
|
||
|
||
using_session(:user_1) { create_message(channel: dm_channel_1, creator: user_1) }
|
||
|
||
expect(page).to have_css(".sidebar-row.channel-#{dm_channel_1.id} .icon.urgent")
|
||
expect(page).to have_css(".chat-header-icon .chat-channel-unread-indicator", text: "1")
|
||
end
|
||
end
|
||
end
|
||
end
|
||
end
|
||
end
|