summaryrefslogtreecommitdiffstats
path: root/js/tests
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:31:30 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:31:30 +0200
commit0ed9131f3f1c851158421b39767bf94264f80b8b (patch)
tree51ee951c0c7cd6cff6a3cd1456e2987a8943edaa /js/tests
parent7c3c70fc88b669386cca180250081be45cdfeb92 (diff)
add simple keyboard shortcuts, implemt keep unread fix #43, implement mark as read when scrolling fix #4
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/services/businesslayer/businesslayerSpec.coffee16
-rw-r--r--js/tests/services/businesslayer/itembusinesslayerSpec.coffee18
2 files changed, 17 insertions, 17 deletions
diff --git a/js/tests/services/businesslayer/businesslayerSpec.coffee b/js/tests/services/businesslayer/businesslayerSpec.coffee
index d91124a89..e93fcedd5 100644
--- a/js/tests/services/businesslayer/businesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/businesslayerSpec.coffee
@@ -45,9 +45,6 @@ describe 'BusinessLayer', ->
it 'should reset the item cache when a different feed is being loaded', =>
@ItemModel.clear = jasmine.createSpy('clear')
@ActiveFeed.handle({id: 0, type: @FeedType.Starred})
- @BusinessLayer.load(0)
-
- expect(@ItemModel.clear).not.toHaveBeenCalled()
@BusinessLayer.load(2)
expect(@ItemModel.clear).toHaveBeenCalled()
@@ -58,19 +55,6 @@ describe 'BusinessLayer', ->
- it 'should send a get latest items query when feed did not change', =>
- @ItemModel.add({id: 1, lastModified: 5})
- @ItemModel.add({id: 2, lastModified: 1})
- @ItemModel.add({id: 4, lastModified: 323})
- @ItemModel.add({id: 6, lastModified: 44})
- @persistence.getItems = jasmine.createSpy('latest')
- @ActiveFeed.handle({id: 3, type: @FeedType.Starred})
- @BusinessLayer.load(3)
-
- expect(@persistence.getItems).toHaveBeenCalledWith(@FeedType.Starred, 3,
- 0, null, 6)
-
-
it 'should send a get all items query when feed changed', =>
@persistence.getItems = jasmine.createSpy('latest')
@ActiveFeed.handle({id: 3, type: @FeedType.Feed})
diff --git a/js/tests/services/businesslayer/itembusinesslayerSpec.coffee b/js/tests/services/businesslayer/itembusinesslayerSpec.coffee
index 932260747..0bc8a3188 100644
--- a/js/tests/services/businesslayer/itembusinesslayerSpec.coffee
+++ b/js/tests/services/businesslayer/itembusinesslayerSpec.coffee
@@ -117,6 +117,20 @@ describe 'ItemBusinessLayer', ->
expect(@persistence.readItem).toHaveBeenCalledWith(2)
+ it 'should not set an item read if its kept unread', =>
+ @persistence.readItem = jasmine.createSpy('read item')
+
+ item = {id: 2, feedId: 5, guidHash: 'a3', status: 0, keptUnread: true}
+ @ItemModel.add(item)
+ item.setUnread()
+
+ @ItemBusinessLayer.setRead(2)
+
+ expect(item.isRead()).toBe(false)
+ expect(@persistence.readItem).not.toHaveBeenCalled()
+
+
+
it 'should no set an item read if its already read', =>
@persistence.readItem = jasmine.createSpy('read item')
@@ -214,4 +228,6 @@ describe 'ItemBusinessLayer', ->
@ItemBusinessLayer.setUnread(2)
- expect(@item1.unreadCount).toBe(135) \ No newline at end of file
+ expect(@item1.unreadCount).toBe(135)
+
+