mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 08:09:33 +08:00
bc63232d2e
When a tab is open but left unattended for a while, the red, green, and blue pills tend to go out of sync. So whevener we open the notifications menu, we sync up the notification count (eg. blue and green pills) with the server. However, the reviewable count (eg. the red pill) is not a notification and is located in the hamburger menu. This commit adds a new route on the server side to retrieve the reviewable count for the current user and a ping (refreshReviewableCount) from the client side to sync the reviewable count whenever they open the hamburger menu. REFACTOR: I also refactored the hamburger-menu widget code to prevent repetitive uses of "this.". PERF: I improved the performance of the 'notify_reviewable' job by doing only 1 query to the database to retrieve all the pending reviewables and then tallying based on the various rights.
117 lines
4.9 KiB
Ruby
117 lines
4.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Jobs::NotifyReviewable do
|
|
describe '.execute' do
|
|
fab!(:admin) { Fabricate(:admin, moderator: true) }
|
|
fab!(:moderator) { Fabricate(:moderator) }
|
|
fab!(:group_user) { Fabricate(:group_user) }
|
|
let(:user) { group_user.user }
|
|
let(:group) { group_user.group }
|
|
|
|
it "will notify users of new reviewable content" do
|
|
SiteSetting.enable_category_group_moderation = true
|
|
|
|
GroupUser.create!(group_id: group.id, user_id: moderator.id)
|
|
|
|
# Content for admins only
|
|
r1 = Fabricate(:reviewable, reviewable_by_moderator: false)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r1.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(1)
|
|
expect(messages.any? { |m| m.user_ids.include?(moderator.id) }).to eq(false)
|
|
expect(messages.any? { |m| m.user_ids.include?(user.id) }).to eq(false)
|
|
|
|
# Content for moderators
|
|
r2 = Fabricate(:reviewable, reviewable_by_moderator: true)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r2.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(2)
|
|
mod_msg = messages.find { |m| m.user_ids.include?(moderator.id) }
|
|
expect(mod_msg.data[:reviewable_count]).to eq(1)
|
|
expect(mod_msg.user_ids).to_not include(admin.id)
|
|
expect(messages.any? { |m| m.user_ids.include?(user.id) }).to eq(false)
|
|
|
|
# Content for a group
|
|
r3 = Fabricate(:reviewable, reviewable_by_moderator: true, reviewable_by_group: group)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r3.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(3)
|
|
mod_messages = messages.select { |m| m.user_ids.include?(moderator.id) }
|
|
expect(mod_messages.size).to eq(1)
|
|
expect(mod_messages[0].data[:reviewable_count]).to eq(2)
|
|
group_msg = messages.find { |m| m.user_ids.include?(user.id) }
|
|
expect(group_msg.data[:reviewable_count]).to eq(1)
|
|
end
|
|
|
|
it "won't notify a group when disabled" do
|
|
SiteSetting.enable_category_group_moderation = false
|
|
|
|
GroupUser.create!(group_id: group.id, user_id: moderator.id)
|
|
r3 = Fabricate(:reviewable, reviewable_by_moderator: true, reviewable_by_group: group)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r3.id)
|
|
end
|
|
group_msg = messages.find { |m| m.user_ids.include?(user.id) }
|
|
expect(group_msg).to be_blank
|
|
end
|
|
|
|
it "respects visibility" do
|
|
SiteSetting.enable_category_group_moderation = true
|
|
Reviewable.set_priorities(medium: 2.0)
|
|
SiteSetting.reviewable_default_visibility = 'medium'
|
|
|
|
GroupUser.create!(group_id: group.id, user_id: moderator.id)
|
|
|
|
# Content for admins only
|
|
r1 = Fabricate(:reviewable, reviewable_by_moderator: false)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r1.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(0)
|
|
|
|
# Content for moderators
|
|
r2 = Fabricate(:reviewable, reviewable_by_moderator: true)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r2.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(0)
|
|
mod_msg = messages.find { |m| m.user_ids.include?(moderator.id) }
|
|
expect(mod_msg.data[:reviewable_count]).to eq(0)
|
|
|
|
# Content for a group
|
|
r3 = Fabricate(:reviewable, reviewable_by_moderator: true, reviewable_by_group: group)
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: r3.id)
|
|
end
|
|
admin_msg = messages.find { |m| m.user_ids.include?(admin.id) }
|
|
expect(admin_msg.data[:reviewable_count]).to eq(0)
|
|
mod_messages = messages.select { |m| m.user_ids.include?(moderator.id) }
|
|
expect(mod_messages.size).to eq(1)
|
|
expect(mod_messages[0].data[:reviewable_count]).to eq(0)
|
|
group_msg = messages.find { |m| m.user_ids.include?(user.id) }
|
|
expect(group_msg.data[:reviewable_count]).to eq(0)
|
|
end
|
|
end
|
|
|
|
it 'skips sending notifications if user_ids is empty' do
|
|
reviewable = Fabricate(:reviewable, reviewable_by_moderator: true)
|
|
regular_user = Fabricate(:user)
|
|
|
|
messages = MessageBus.track_publish("/reviewable_counts") do
|
|
described_class.new.execute(reviewable_id: reviewable.id)
|
|
end
|
|
|
|
expect(messages.size).to eq(0)
|
|
end
|
|
end
|