Commit 554fe402 authored by movilla's avatar movilla
Browse files

Web mobile notificacions count dont change to unread-read when click in link post

parent 10aea3eb
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
* Fix error with invite link box shows on search results page even if invites have been turned off. [#3708](https://github.com/diaspora/diaspora/pull/3708) * Fix error with invite link box shows on search results page even if invites have been turned off. [#3708](https://github.com/diaspora/diaspora/pull/3708)
* Fix misconfiguration of Devise to allow the session to be remembered. [#3472](https://github.com/diaspora/diaspora/issues/3472) * Fix misconfiguration of Devise to allow the session to be remembered. [#3472](https://github.com/diaspora/diaspora/issues/3472)
* Fix problem with show reshares_count in stream. [#3700](https://github.com/diaspora/diaspora/pull/3700) * Fix problem with show reshares_count in stream. [#3700](https://github.com/diaspora/diaspora/pull/3700)
* Fix error with notifications count in mobile. [#3721](https://github.com/diaspora/diaspora/pull/3721)
# 0.0.1.2 # 0.0.1.2
......
...@@ -105,7 +105,7 @@ class PostsController < ApplicationController ...@@ -105,7 +105,7 @@ class PostsController < ApplicationController
end end
def mark_corresponding_notification_read def mark_corresponding_notification_read
if notification = Notification.where(:recipient_id => current_user.id, :target_id => @post.id).first if notification = Notification.where(:recipient_id => current_user.id, :target_id => @post.id, :unread => true).first
notification.unread = false notification.unread = false
notification.save notification.save
end end
......
...@@ -41,22 +41,16 @@ describe PostsController do ...@@ -41,22 +41,16 @@ describe PostsController do
end end
it 'marks a corresponding notification as read' do it 'marks a corresponding notification as read' do
note = Notification.create(:recipient => alice, :target => @message, :unread => true) # Ensure that it doesn't mark a read notification as read
FactoryGirl.create(:notification, :recipient => alice, :target => @message, :unread => false)
note = FactoryGirl.create(:notification, :recipient => alice, :target => @message, :unread => true)
lambda{ expect {
get :show, :id => @message.id get :show, :id => @message.id
note.reload note.reload
}.should change(note, :unread).from(true).to(false) }.should change(note, :unread).from(true).to(false)
end end
it 'change from unread to read a corresponding notification' do
FactoryGirl.create(:notification, :target => @message, :recipient => alice, :unread => true)
FactoryGirl.create(:notification, :recipient => alice, :unread => false)
Notification.where(:unread => true).count.should == 1
get :show, :id => @message.id
Notification.where(:unread => true).count.should == 0
end
it 'succeeds with a AS/photo' do it 'succeeds with a AS/photo' do
photo = FactoryGirl.create(:activity_streams_photo, :author => bob.person) photo = FactoryGirl.create(:activity_streams_photo, :author => bob.person)
get :show, :id => photo.id get :show, :id => photo.id
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment