diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-16 13:19:28 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-16 15:23:12 +0200 |
| commit | 8df6d36d49d89f3bb7186b36436606adb039b3f8 (patch) | |
| tree | 2fbbe1e55995d0f9277557838a25f351e371540e /js/tests/controllers | |
| parent | efc118431b6afbb7cc1df887e11195d8c7e761a7 (diff) | |
move instantiation into file where object is declared, fix unittests that overwrote services for all unittests and caused them to fail
Diffstat (limited to 'js/tests/controllers')
| -rw-r--r-- | js/tests/controllers/feedcontrollerSpec.coffee | 10 | ||||
| -rw-r--r-- | js/tests/controllers/itemcontrollerSpec.coffee | 11 | ||||
| -rw-r--r-- | js/tests/controllers/settingscontrollerSpec.coffee | 5 |
3 files changed, 15 insertions, 11 deletions
diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee index f28319bdf..133ab57ee 100644 --- a/js/tests/controllers/feedcontrollerSpec.coffee +++ b/js/tests/controllers/feedcontrollerSpec.coffee @@ -25,10 +25,10 @@ describe 'FeedController', -> beforeEach module 'News' - beforeEach => - angular.module('News').factory 'Persistence', => - @persistence = {} - + beforeEach module ($provide) => + @persistence = {} + $provide.value 'Persistence', @persistence + return beforeEach inject ($controller, @FolderBusinessLayer, @FeedBusinessLayer, $rootScope, @unreadCountFormatter, @@ -36,12 +36,10 @@ describe 'FeedController', -> @scope = $rootScope.$new() replace = $scope: @scope - Persistence: @persistence @controller = $controller('FeedController', replace) - it 'isAddingFolder should return false in the beginning', => expect(@scope.isAddingFolder()).toBeFalsy() diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee index 96e15e292..2316ee509 100644 --- a/js/tests/controllers/itemcontrollerSpec.coffee +++ b/js/tests/controllers/itemcontrollerSpec.coffee @@ -26,16 +26,17 @@ describe 'ItemController', -> beforeEach module 'News' + beforeEach module ($provide) => + @persistence = + getItems: -> + $provide.value 'Persistence', @persistence + return + beforeEach inject ($controller, @ItemBusinessLayer, @FeedBusinessLayer, $rootScope) => @scope = $rootScope.$new() - @persistence = { - getItems: -> - } - replace = $scope: @scope - Persistence: @persistence @controller = $controller('ItemController', replace) diff --git a/js/tests/controllers/settingscontrollerSpec.coffee b/js/tests/controllers/settingscontrollerSpec.coffee index ded9232e2..88e16c969 100644 --- a/js/tests/controllers/settingscontrollerSpec.coffee +++ b/js/tests/controllers/settingscontrollerSpec.coffee @@ -25,6 +25,11 @@ describe 'SettingsController', -> beforeEach module 'News' + beforeEach module ($provide) => + @persistence = {} + $provide.value 'Persistence', @persistence + return + beforeEach inject ($controller, @FeedBusinessLayer, @FolderBusinessLayer, @ShowAll) => @scope = {} |