codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow reading notifications without marking them as read.

Browse source
This commit is contained in:
Vikhyat Korrapati 2014-06-07 15:47:45 +05:30
parent 92d2912ff2
commit 9b89b1466f
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/notifications_controller.rb
View file

@ -8,7 +8,7 @@ class NotificationsController < ApplicationController
if notifications.present?
# ordering can be off due to PMs
max_id = notifications.map(&:id).max
current_user.saw_notification_id(max_id)
current_user.saw_notification_id(max_id) unless params.has_key?(:silent)
end
current_user.reload
current_user.publish_notifications_state

18
spec/controllers/notifications_controller_spec.rb
View file

@ -5,12 +5,24 @@ describe NotificationsController do
context 'when logged in' do
let!(:user) { log_in }
before do
it 'should succeed' do
xhr :get, :index
response.should be_success
end
subject { response }
it { should be_success }
it 'should mark notifications as viewed' do
notification = Fabricate(:notification, user: user)
user.reload.unread_notifications.should == 1
xhr :get, :index
user.reload.unread_notifications.should == 0
end
it 'should not mark notifications as viewed if silent param is present' do
notification = Fabricate(:notification, user: user)
user.reload.unread_notifications.should == 1
xhr :get, :index, silent: true
user.reload.unread_notifications.should == 1
end
end
context 'when not logged in' do