Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regression in visible notification detection

This commit is contained in:
Sam 2015-06-23 06:14:22 +10:00
parent 4c4b20574d
commit 9f88d6e252
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/notification.rb
View File

@ -9,7 +9,8 @@ class Notification < ActiveRecord::Base
scope :unread, lambda { where(read: false) } scope :unread, lambda { where(read: false) }
scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) } scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) }
scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id AND topics.deleted_at IS NULL') } scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
.where('topics.id IS NULL OR topics.deleted_at IS NULL') }
after_save :refresh_notification_count after_save :refresh_notification_count
after_destroy :refresh_notification_count after_destroy :refresh_notification_count

7
spec/models/notification_spec.rb
View File

@ -277,6 +277,13 @@ describe Notification do
fab(Notification.types[:liked], true) fab(Notification.types[:liked], true)
end end
it 'correctly finds visible notifications' do
pm
expect(Notification.visible.count).to eq(1)
post.topic.trash!
expect(Notification.visible.count).to eq(0)
end
it 'orders stuff correctly' do it 'orders stuff correctly' do
a = unread_pm a = unread_pm
regular regular