always return the unreadcount when marking read to set update request as 0, dont create new feeds that only consist of unreadcount updates

2 files changed, 17 insertions, 3 deletions

diff --git a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
index 8ab904c0a..48ae9e03c 100644
--- a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee
@@ -40,7 +40,7 @@ describe 'SubscriptionsBusinessLayer', ->
 
 
 	it 'should be visible shows all items is set to true and there are feeds', =>
-		@FeedModel.add({id: 3, unreadCount: 5})
+		@FeedModel.add({id: 3, unreadCount: 5, urlHash: 'hi'})
 
 		expect(@SubscriptionsBusinessLayer.isVisible()).toBe(true)
 
@@ -66,7 +66,7 @@ describe 'SubscriptionsBusinessLayer', ->
 
 
 	it 'should mark all feeds as read', =>
-		item = {id: 3, unreadCount: 132}
+		item = {id: 3, unreadCount: 132, urlHash: 'hi'}
 		@FeedModel.add(item)
 
 		@SubscriptionsBusinessLayer.markAllRead()
diff --git a/js/tests/services/models/feedmodelSpec.coffee b/js/tests/services/models/feedmodelSpec.coffee
index 6df9d6e9f..6b6eb85f6 100644
--- a/js/tests/services/models/feedmodelSpec.coffee
+++ b/js/tests/services/models/feedmodelSpec.coffee
@@ -120,4 +120,18 @@ describe 'FeedModel', ->
 		item2 = {faviconLink: null, urlHash: 'his', test: 'heheh', folderId: 0}
 		@FeedModel.add(item2)
 
-		expect(@FeedModel.getAllOfFolder(0).length).toBe(2)
\ No newline at end of file
+		expect(@FeedModel.getAllOfFolder(0).length).toBe(2)
+
+
+	it 'should only update feeds that contain only an id but no url hash', =>
+		item = {id: 3, unreadCount: 232}
+		@FeedModel.add(item)
+		expect(@FeedModel.size()).toBe(0)
+
+		item2 = {id: 3, unreadCount: 2, faviconLink: null, urlHash: 'his'}
+		@FeedModel.add(item2)
+		@FeedModel.add(item)
+
+		expect(@FeedModel.size()).toBe(1)
+		expect(@FeedModel.getById(3).unreadCount).toBe(232)
+