From b723c12e4c3e0039d9785861d4ad204fd899ac52 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 4 Apr 2013 15:23:58 +0200 Subject: improved and cleaned up js unittests --- js/tests/services/bl/folderblSpec.coffee | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'js/tests/services/bl/folderblSpec.coffee') diff --git a/js/tests/services/bl/folderblSpec.coffee b/js/tests/services/bl/folderblSpec.coffee index 898aaecba..9ede654ee 100644 --- a/js/tests/services/bl/folderblSpec.coffee +++ b/js/tests/services/bl/folderblSpec.coffee @@ -21,24 +21,22 @@ License along with this library. If not, see . ### -describe '_FolderBl', -> - +describe 'FolderBl', -> beforeEach module 'News' - beforeEach inject (@_FolderBl, @FolderModel, @_FeedBl, @_ItemBl, - @FeedModel, @ItemModel) => - @persistence = - getItems: -> - itemBl = new @_ItemBl(@ItemModel, @persistence) - feedBl = new @_FeedBl(FeedModel, itemBl, @persistence) - @bl = new @_FolderBl(@FolderModel, feedBl, @persistence) + beforeEach => + angular.module('News').factory 'Persistence', => + @persistence = + getItems: -> + + beforeEach inject (@FolderBl, @FolderModel, @FeedModel) => it 'should delete folders', => @FolderModel.removeById = jasmine.createSpy('remove') @persistence.deleteFolder = jasmine.createSpy('deletequery') - @bl.delete(3) + @FolderBl.delete(3) expect(@FolderModel.removeById).toHaveBeenCalledWith(3) expect(@persistence.deleteFolder).toHaveBeenCalledWith(3) @@ -46,10 +44,10 @@ describe '_FolderBl', -> it 'should return true when folder has feeds', => @FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a1'}) - expect(@bl.hasFeeds(3)).toBeFalsy() + expect(@FolderBl.hasFeeds(3)).toBeFalsy() @FeedModel.add({id: 2, unreadCount:35, folderId: 3, urlHash: 'a2'}) - expect(@bl.hasFeeds(3)).toBeTruthy() + expect(@FolderBl.hasFeeds(3)).toBeTruthy() it 'should toggle folder', => @@ -57,14 +55,14 @@ describe '_FolderBl', -> @persistence.collapseFolder = jasmine.createSpy('collapse') @FolderModel.add({id: 3, open: false}) - @bl.toggleFolder(4) + @FolderBl.toggleFolder(4) expect(@FolderModel.getById(3).open).toBeFalsy() - @bl.toggleFolder(3) + @FolderBl.toggleFolder(3) expect(@FolderModel.getById(3).open).toBeTruthy() expect(@persistence.openFolder).toHaveBeenCalledWith(3) - @bl.toggleFolder(3) + @FolderBl.toggleFolder(3) expect(@FolderModel.getById(3).open).toBeFalsy() expect(@persistence.collapseFolder).toHaveBeenCalledWith(3) @@ -75,7 +73,7 @@ describe '_FolderBl', -> @FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'}) @FeedModel.add({id: 1, unreadCount:12, folderId: 3, urlHash: 'a3'}) - @bl.markFolderRead(3) + @FolderBl.markFolderRead(3) expect(@FeedModel.getById(3).unreadCount).toBe(0) expect(@FeedModel.getById(1).unreadCount).toBe(0) -- cgit v1.2.3