From 8df6d36d49d89f3bb7186b36436606adb039b3f8 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 16 Apr 2013 13:19:28 +0200 Subject: move instantiation into file where object is declared, fix unittests that overwrote services for all unittests and caused them to fail --- .../businesslayer/businesslayerSpec.coffee | 2 +- .../businesslayer/feedbusinesslayerSpec.coffee | 32 ++++++++++++---------- .../businesslayer/folderbusinesslayerSpec.coffee | 22 +++++++++------ .../businesslayer/itembusinesslayerSpec.coffee | 10 ++++--- .../businesslayer/starredbusinesslayerSpec.coffee | 11 +++++--- .../subsriptionsbusinesslayerSpec.coffee | 15 +++++----- 6 files changed, 53 insertions(+), 39 deletions(-) (limited to 'js/tests/services/businesslayer') diff --git a/js/tests/services/businesslayer/businesslayerSpec.coffee b/js/tests/services/businesslayer/businesslayerSpec.coffee index e93fcedd5..db4cb62a0 100644 --- a/js/tests/services/businesslayer/businesslayerSpec.coffee +++ b/js/tests/services/businesslayer/businesslayerSpec.coffee @@ -27,7 +27,7 @@ describe 'BusinessLayer', -> beforeEach inject (@_BusinessLayer, @ActiveFeed, @FeedType, @ItemModel) => type = @FeedType.Starred - angular.module('News').factory 'Persistence', => + @getItemsSpy = jasmine.createSpy('getItems') @persistence = { getItems: @getItemsSpy diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee index 476d74d30..8e09e7be9 100644 --- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee @@ -25,22 +25,24 @@ describe 'FeedBusinessLayer', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @setFeedReadSpy = jasmine.createSpy('setFeedRead') - @getItemsSpy = jasmine.createSpy('Get Items') - @persistence = { - setFeedRead: @setFeedReadSpy - getItems: @getItemsSpy - createFeed: -> - } - angular.module('News').factory 'Utils', => - @imagePath = jasmine.createSpy('imagePath') - @utils = { - imagePath: @imagePath - } - + beforeEach module ($provide) => + @setFeedReadSpy = jasmine.createSpy('setFeedRead') + @getItemsSpy = jasmine.createSpy('Get Items') + @persistence = + setFeedRead: @setFeedReadSpy + getItems: @getItemsSpy + createFeed: -> + test: 'feedbusinesslayer' + + @imagePath = jasmine.createSpy('imagePath') + @utils = + imagePath: @imagePath + + $provide.value 'Persistence', @persistence + $provide.value 'Utils', @utils + return + beforeEach inject (@FeedBusinessLayer, @FeedModel, @ItemModel, @FeedType, @ShowAll, @ActiveFeed, @_ExistsError) => @ShowAll.setShowAll(false) diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee index 32573dde5..a4cb80162 100644 --- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee @@ -25,12 +25,18 @@ describe 'FolderBusinessLayer', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @persistence = - createFolder: -> - createFeed: -> - openFolder: -> + beforeEach module ($provide) => + @persistence = + test: 'folderbusinesslayer' + + @imagePath = jasmine.createSpy('imagePath') + @utils = + imagePath: @imagePath + + $provide.value 'Persistence', @persistence + $provide.value 'Utils', @utils + return + beforeEach inject (@FolderBusinessLayer, @FolderModel, @FeedModel, @ShowAll, @ActiveFeed, @FeedType, @_ExistsError) => @@ -38,7 +44,6 @@ describe 'FolderBusinessLayer', -> @ActiveFeed.handle({type: @FeedType.Feed, id:0}) - it 'should delete folders', => @FolderModel.removeById = jasmine.createSpy('remove') @persistence.deleteFolder = jasmine.createSpy('deletequery') @@ -154,6 +159,7 @@ describe 'FolderBusinessLayer', -> it 'should create a folder before theres a response from the server', => + @persistence.createFolder = jasmine.createSpy('create folder') @FolderBusinessLayer.create('johns') expect(@FolderModel.size()).toBe(1) expect(@FolderModel.getByName('johns').opened).toBe(true) @@ -366,7 +372,7 @@ describe 'FolderBusinessLayer', -> it 'should use an existing folder when importing a folder', => @persistence.createFolder = jasmine.createSpy('create folder') @persistence.createFeed = jasmine.createSpy('create feed') - @persistence.openFolder = jasmine.createSpy('open folder') + @persistence.openFolder = jasmine.createSpy('open') folder = {id: 2, name: 'design', opened: false} @FolderModel.add(folder) diff --git a/js/tests/services/businesslayer/itembusinesslayerSpec.coffee b/js/tests/services/businesslayer/itembusinesslayerSpec.coffee index 0bc8a3188..d5333c1f4 100644 --- a/js/tests/services/businesslayer/itembusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/itembusinesslayerSpec.coffee @@ -26,14 +26,16 @@ describe 'ItemBusinessLayer', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @persistence = {} - + beforeEach module ($provide) => + @persistence = {} + $provide.value 'Persistence', @persistence + return + beforeEach inject (@ItemModel, @ItemBusinessLayer, @StatusFlag, @ActiveFeed @FeedType, @FeedModel, @StarredBusinessLayer) => @item1 = {id: 5, title: 'hi', unreadCount:134, urlHash: 'a3', folderId: 3} @FeedModel.add(@item1) + it 'should return all items', => diff --git a/js/tests/services/businesslayer/starredbusinesslayerSpec.coffee b/js/tests/services/businesslayer/starredbusinesslayerSpec.coffee index feefdb181..88b5cbeef 100644 --- a/js/tests/services/businesslayer/starredbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/starredbusinesslayerSpec.coffee @@ -25,12 +25,15 @@ describe 'StarredBusinessLayer', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @persistence = {} + beforeEach module ($provide) => + @persistence = + test: 'starredbusinesslayer' + + $provide.value 'Persistence', @persistence + return beforeEach inject (@StarredBusinessLayer, @StarredCount, @ActiveFeed, - @FeedType) => + @FeedType) => @ActiveFeed.handle({type: @FeedType.Feed, id:0}) @StarredCount.setStarredCount(0) diff --git a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee index 0047f9437..8ab904c0a 100644 --- a/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/subsriptionsbusinesslayerSpec.coffee @@ -25,12 +25,13 @@ describe 'SubscriptionsBusinessLayer', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @setFeedReadSpy = jasmine.createSpy('setFeedRead') - @persistence = { - setFeedRead: @setFeedReadSpy - } + beforeEach module ($provide) => + @persistence = + setFeedRead: jasmine.createSpy('setFeedRead') + test: 'subscriptionsbusinesslayer' + + $provide.value 'Persistence', @persistence + return beforeEach inject (@SubscriptionsBusinessLayer, @ShowAll, @FeedModel, @ActiveFeed, @FeedType) => @@ -71,7 +72,7 @@ describe 'SubscriptionsBusinessLayer', -> @SubscriptionsBusinessLayer.markAllRead() expect(item.unreadCount).toBe(0) - expect(@setFeedReadSpy).toHaveBeenCalled() + expect(@persistence.setFeedRead).toHaveBeenCalled() it 'should get the correct unread count', => -- cgit v1.2.3