implemented bare itembl methods

2 files changed, 41 insertions, 8 deletions

diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee
index 19cce6c6f..35aff7141 100644
--- a/js/tests/controllers/itemcontrollerSpec.coffee
+++ b/js/tests/controllers/itemcontrollerSpec.coffee
@@ -27,16 +27,14 @@ describe '_ItemController', ->
 	beforeEach module 'News'
 
 	beforeEach inject (@_ItemController, @ActiveFeed, @ShowAll, @FeedType,
-		               @StarredCount, @FeedModel, @FolderModel, @ItemModel) =>
+		               @StarredCount, @FeedModel, @FolderModel, @ItemModel,
+		               @ItemBl) =>
 		@scope = {}
 		@persistence = {
 			getItems: ->
 		}
-		@controller = new @_ItemController(@scope, @ItemModel, @FeedModel)
+		@controller = new @_ItemController(@scope, @ItemBl, @FeedModel)
 
 
-	it 'should make items availabe', =>
-		@ItemModel.getAll = jasmine.createSpy('ItemModel')
-		new @_ItemController(@scope, @ItemModel)
-
-		expect(@ItemModel.getAll).toHaveBeenCalled()
+	it 'should make ItemBl availabe', =>
+		expect(@scope.itemBl).toBe(@ItemBl)
diff --git a/js/tests/services/bl/itemblSpec.coffee b/js/tests/services/bl/itemblSpec.coffee
index 158b09467..ff2bbd80a 100644
--- a/js/tests/services/bl/itemblSpec.coffee
+++ b/js/tests/services/bl/itemblSpec.coffee
@@ -33,4 +33,39 @@ describe 'ItemBl', ->
 				
 			}
 
-	beforeEach inject (@ItemModel, @ItemBl, @StatusFlag) =>
+	beforeEach inject (@ItemModel, @ItemBl, @StatusFlag, @ActiveFeed
+	                   @FeedType) =>
+
+
+	it 'should return all items', =>
+		item1 = {id: 6, feedId: 5, guidHash: 'a1'}
+		item2 = {id: 3, feedId: 5, guidHash: 'a2'}
+		item3 = {id: 2, feedId: 5, guidHash: 'a3'}
+
+		@ItemModel.add(item1)
+		@ItemModel.add(item2)
+		@ItemModel.add(item3)
+
+		items = @ItemBl.getAll()
+
+		expect(items).toContain(item1)
+		expect(items).toContain(item2)
+		expect(items).toContain(item3)
+
+
+	it 'should tell if no feed is active', =>
+		@ActiveFeed.handle({type: @FeedType.Folder, id: 0})
+		expect(@ItemBl.noFeedActive()).toBe(true)
+
+		@ActiveFeed.handle({type: @FeedType.Subscriptions, id: 0})
+		expect(@ItemBl.noFeedActive()).toBe(true)
+
+		@ActiveFeed.handle({type: @FeedType.Starred, id: 0})
+		expect(@ItemBl.noFeedActive()).toBe(true)
+
+		@ActiveFeed.handle({type: @FeedType.Shared, id: 0})
+		expect(@ItemBl.noFeedActive()).toBe(true)
+
+		@ActiveFeed.handle({type: @FeedType.Feed, id: 0})
+		expect(@ItemBl.noFeedActive()).toBe(false)
+