diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 12:00:54 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 12:00:54 +0200 |
commit | 021b68025223f2f3fdc8a7f588ae2e87128cbbc0 (patch) | |
tree | 173361a56ca40f263031915d10d0b26d4da0033d /js/tests/unit/controller | |
parent | 1cb7d9ad1f47c4fce59dad43cc88568524ebc974 (diff) |
better folder undelete
Diffstat (limited to 'js/tests/unit/controller')
-rw-r--r-- | js/tests/unit/controller/NavigationControllerSpec.js | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/js/tests/unit/controller/NavigationControllerSpec.js b/js/tests/unit/controller/NavigationControllerSpec.js index 8fcc1a94c..36687de9b 100644 --- a/js/tests/unit/controller/NavigationControllerSpec.js +++ b/js/tests/unit/controller/NavigationControllerSpec.js @@ -725,7 +725,6 @@ describe('NavigationController', function () { ctrl.reversiblyDeleteFeed(feed); expect(FeedResource.reversiblyDelete).toHaveBeenCalledWith(3); - expect(feed.deleted).toBe(true); })); @@ -745,7 +744,6 @@ describe('NavigationController', function () { ctrl.undoDeleteFeed(feed); expect(FeedResource.undoDelete).toHaveBeenCalledWith(3); - expect(feed.deleted).toBe(false); })); @@ -771,7 +769,8 @@ describe('NavigationController', function () { it('should reversibly delete a folder', inject(function ( $controller, FolderResource, FeedResource) { FolderResource.reversiblyDelete = jasmine.createSpy('reversiblyDelete'); - FeedResource.reversiblyDelete = jasmine.createSpy('reversiblyDelete'); + FeedResource.reversiblyDeleteFolder = + jasmine.createSpy('reversiblyDelete'); var ctrl = $controller('NavigationController', { FolderResource: FolderResource, @@ -786,19 +785,15 @@ describe('NavigationController', function () { ctrl.reversiblyDeleteFolder(folder); - expect(FolderResource.reversiblyDelete).toHaveBeenCalledWith(3); - expect(FeedResource.reversiblyDelete).toHaveBeenCalledWith(1); - expect(FeedResource.reversiblyDelete).toHaveBeenCalledWith(3); - expect(folder.deleted).toBe(true); - expect(FeedResource.size(2)).toBe(1); - expect(ctrl._deletedFeedsBackup.test.length).toBe(2); + expect(FolderResource.reversiblyDelete).toHaveBeenCalledWith('test'); + expect(FeedResource.reversiblyDeleteFolder).toHaveBeenCalledWith(3); })); it('should undo delete a folder', inject(function ( $controller, FolderResource, FeedResource) { FolderResource.undoDelete = jasmine.createSpy('undoDelete'); - FeedResource.undoDelete = jasmine.createSpy('undoDelete'); + FeedResource.undoDeleteFolder = jasmine.createSpy('undoDelete'); var ctrl = $controller('NavigationController', { FolderResource: FolderResource, @@ -811,28 +806,17 @@ describe('NavigationController', function () { name: 'test' }; - var feed1 = FeedResource.delete('ye'); - var feed2 = FeedResource.delete('1sye'); - expect(FeedResource.size()).toBe(1); - - ctrl._deletedFeedsBackup.test = [feed1, feed2]; - ctrl.undoDeleteFolder(folder); - expect(FolderResource.undoDelete).toHaveBeenCalledWith(3); - expect(FeedResource.undoDelete).toHaveBeenCalledWith(1); - expect(FeedResource.undoDelete).toHaveBeenCalledWith(3); - expect(folder.deleted).toBe(false); - expect(feed1.deleted).toBe(false); - expect(feed2.deleted).toBe(false); - expect(FeedResource.size()).toBe(3); - expect(ctrl._deletedFeedsBackup.test).toBe(undefined); + expect(FolderResource.undoDelete).toHaveBeenCalledWith('test'); + expect(FeedResource.undoDeleteFolder).toHaveBeenCalledWith(3); })); it('should delete a folder', inject(function ( - $controller, FolderResource) { + $controller, FolderResource, FeedResource) { FolderResource.delete = jasmine.createSpy('delete'); + FeedResource.deleteFolder = jasmine.createSpy('undoDelete'); var ctrl = $controller('NavigationController', { FolderResource: FolderResource, @@ -843,12 +827,10 @@ describe('NavigationController', function () { name: 'test' }; - ctrl._deletedFeedsBackup.test = [1, 2]; - ctrl.deleteFolder(folder); expect(FolderResource.delete).toHaveBeenCalledWith('test'); - expect(ctrl._deletedFeedsBackup.test).toBe(undefined); + expect(FeedResource.deleteFolder).toHaveBeenCalledWith(3); })); |