improved and cleaned up js unittests

3 files changed, 34 insertions, 37 deletions

diff --git a/js/tests/services/bl/feedblSpec.coffee b/js/tests/services/bl/feedblSpec.coffee
index 7cc2e9ab3..486c32198 100644
--- a/js/tests/services/bl/feedblSpec.coffee
+++ b/js/tests/services/bl/feedblSpec.coffee
@@ -21,23 +21,21 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 
-describe '_FeedBl', ->
-
+describe 'FeedBl', ->
 
 	beforeEach module 'News'
 
-	beforeEach inject (@_FeedBl, @FeedModel, @ItemModel, @_ItemBl) =>
-		@persistence =
-			getItems: ->
-
-		@itemBl = new _ItemBl(@ItemModel, @persistence)
+	beforeEach =>
+		angular.module('News').factory 'Persistence', =>
+			@persistence =
+				getItems: ->
 
-		@bl = new @_FeedBl(@FeedModel, @itemBl, @persistence)
+	beforeEach inject (@FeedBl, @FeedModel, @ItemModel) =>
 
 
 	it 'should return the number of unread feeds', =>
 		@FeedModel.add({id: 3, unreadCount:134, urlHash: 'a1'})
-		count = @bl.getUnreadCount(3)
+		count = @FeedBl.getUnreadCount(3)
 
 		expect(count).toBe(134)
 
@@ -50,7 +48,7 @@ describe '_FeedBl', ->
 		@FeedModel.add(feed2)
 		@FeedModel.add(feed3)
 
-		feeds = @bl.getFeedsOfFolder(3)
+		feeds = @FeedBl.getFeedsOfFolder(3)
 
 		expect(feeds).toContain(feed1)
 		expect(feeds).toContain(feed3)
@@ -61,7 +59,7 @@ describe '_FeedBl', ->
 		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'})
 		@FeedModel.add({id: 1, unreadCount:12, folderId: 5, urlHash: 'a3'})
 		@FeedModel.add({id: 2, unreadCount:35, folderId: 3, urlHash: 'a4'})
-		count = @bl.getFolderUnreadCount(3)
+		count = @FeedBl.getFolderUnreadCount(3)
 
 		expect(count).toBe(169)
 
@@ -69,7 +67,7 @@ describe '_FeedBl', ->
 	it 'should delete feeds', =>
 		@FeedModel.removeById = jasmine.createSpy('remove')
 		@persistence.deleteFeed = jasmine.createSpy('deletequery')
-		@bl.delete(3)
+		@FeedBl.delete(3)
 
 		expect(@FeedModel.removeById).toHaveBeenCalledWith(3)
 		expect(@persistence.deleteFeed).toHaveBeenCalledWith(3)
@@ -82,7 +80,7 @@ describe '_FeedBl', ->
 		@ItemModel.add({id: 6, feedId: 5, guidHash: 'a1'})
 		@ItemModel.add({id: 3, feedId: 5, guidHash: 'a2'})
 		@ItemModel.add({id: 2, feedId: 5, guidHash: 'a3'})
-		@bl.markFeedRead(5)
+		@FeedBl.markFeedRead(5)
 
 		expect(@persistence.setFeedRead).toHaveBeenCalledWith(5, 6)
 		expect(@FeedModel.getById(5).unreadCount).toBe(0)
@@ -94,7 +92,7 @@ describe '_FeedBl', ->
 		@FeedModel.add({id: 5, unreadCount:2, folderId: 2, urlHash: 'a2'})
 		@FeedModel.add({id: 1, unreadCount:12, folderId: 3, urlHash: 'a3'})
 
-		@bl.markAllRead()
+		@FeedBl.markAllRead()
 
 		expect(@FeedModel.getById(3).unreadCount).toBe(0)
 		expect(@FeedModel.getById(1).unreadCount).toBe(0)
@@ -104,6 +102,6 @@ describe '_FeedBl', ->
 	it 'should get the correct unread count for subscribtions', =>
 		@FeedModel.add({id: 3, unreadCount:134, urlHash: 'a1'})
 		@FeedModel.add({id: 5, unreadCount:2, urlHash: 'a2'})
-		count = @bl.getUnreadCount()
+		count = @FeedBl.getUnreadCount()
 
 		expect(count).toBe(136)
\ No newline at end of file
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 <http://www.gnu.org/licenses/>.
 ###
 
 
-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)
diff --git a/js/tests/services/bl/itemblSpec.coffee b/js/tests/services/bl/itemblSpec.coffee
index f46b178ac..36a283de2 100644
--- a/js/tests/services/bl/itemblSpec.coffee
+++ b/js/tests/services/bl/itemblSpec.coffee
@@ -21,16 +21,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
 
-describe '_ItemBl', ->
+describe 'ItemBl', ->
 
 
 	beforeEach module 'News'
 
-	beforeEach inject (@ItemModel, @_ItemBl, @StatusFlag) =>
-		@persistence =
-			getItems: ->
+	beforeEach =>
+		angular.module('News').factory 'Persistence', =>
+			@persistence =
+				getItems: ->
 
-		@bl = new _ItemBl(@ItemModel, @persistence)
+	beforeEach inject (@ItemModel, @ItemBl, @StatusFlag) =>
 
 
 	it 'should mark all items read of a feed', =>
@@ -41,7 +42,7 @@ describe '_ItemBl', ->
 		@ItemModel.add(item1)
 		@ItemModel.add(item2)
 		@ItemModel.add(item3)
-		@bl.markAllRead(5)
+		@ItemBl.markAllRead(5)
 
 		expect(@persistence.setFeedRead).toHaveBeenCalledWith(5, 6)
 		expect(item1.isRead()).toBe(true)