diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-15 12:06:14 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-15 12:06:14 +0200 |
| commit | 360966ab4bdafd15cdef21e34492f5d7d3151b74 (patch) | |
| tree | 0d196a502d41a5234a2da5903fda09e7d51ddaed /js/tests/controllers | |
| parent | fe2bb06a2cc7bf3cd70388d6179728a600eabc9f (diff) | |
get language from server and save it in a language object, dont use a seperate file for instantiating controllers
Diffstat (limited to 'js/tests/controllers')
| -rw-r--r-- | js/tests/controllers/feedcontrollerSpec.coffee | 9 | ||||
| -rw-r--r-- | js/tests/controllers/itemcontrollerSpec.coffee | 16 |
2 files changed, 15 insertions, 10 deletions
diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee index b5216db60..e3ecb357b 100644 --- a/js/tests/controllers/feedcontrollerSpec.coffee +++ b/js/tests/controllers/feedcontrollerSpec.coffee @@ -30,13 +30,14 @@ describe '_FeedController', -> @persistence = {} - beforeEach inject (@_FeedController, @FolderBl, @FeedBl, $rootScope, + beforeEach inject ($controller, @FolderBl, @FeedBl, $rootScope, @unreadCountFormatter, @SubscriptionsBl, @StarredBl) => @scope = $rootScope.$new() + replace = + $scope: @scope + Persistence: @persistence - @controller = new @_FeedController(@scope, @persistence, @FolderBl, - @FeedBl, @SubscriptionsBl, @StarredBl, - @unreadCountFormatter) + @controller = $controller('FeedController', replace) diff --git a/js/tests/controllers/itemcontrollerSpec.coffee b/js/tests/controllers/itemcontrollerSpec.coffee index f95f4a459..d6a33b68e 100644 --- a/js/tests/controllers/itemcontrollerSpec.coffee +++ b/js/tests/controllers/itemcontrollerSpec.coffee @@ -21,20 +21,21 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. ### -describe '_ItemController', -> +describe 'ItemController', -> beforeEach module 'News' - beforeEach inject (@_ItemController, @ActiveFeed, @ShowAll, @FeedType, - @StarredCount, @FeedModel, @FolderModel, @ItemModel, - @ItemBl, @FeedBl, @FeedLoading) => + beforeEach inject ($controller, @ItemBl, @FeedBl) => @scope = {} @persistence = { getItems: -> } - @controller = new @_ItemController(@scope, @ItemBl, @FeedModel, - @FeedLoading, @FeedBl) + + replace = + $scope: @scope + Persistence: @persistence + @controller = $controller('ItemController', replace) it 'should make ItemBl availabe', => @@ -43,3 +44,6 @@ describe '_ItemController', -> it 'should make FeedBl availabe', => expect(@scope.feedBl).toBe(@FeedBl) + + + it 'should ' |