From 1cb7d9ad1f47c4fce59dad43cc88568524ebc974 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 13 Sep 2014 04:43:37 +0200 Subject: also delete feeds when their parent folder is being deleted --- js/tests/unit/controller/NavigationControllerSpec.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'js/tests/unit') diff --git a/js/tests/unit/controller/NavigationControllerSpec.js b/js/tests/unit/controller/NavigationControllerSpec.js index bab770e29..8fcc1a94c 100644 --- a/js/tests/unit/controller/NavigationControllerSpec.js +++ b/js/tests/unit/controller/NavigationControllerSpec.js @@ -771,9 +771,11 @@ describe('NavigationController', function () { it('should reversibly delete a folder', inject(function ( $controller, FolderResource, FeedResource) { FolderResource.reversiblyDelete = jasmine.createSpy('reversiblyDelete'); + FeedResource.reversiblyDelete = jasmine.createSpy('reversiblyDelete'); var ctrl = $controller('NavigationController', { FolderResource: FolderResource, + FeedResource: FeedResource }); var folder = { @@ -785,6 +787,8 @@ 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); @@ -794,6 +798,7 @@ describe('NavigationController', function () { it('should undo delete a folder', inject(function ( $controller, FolderResource, FeedResource) { FolderResource.undoDelete = jasmine.createSpy('undoDelete'); + FeedResource.undoDelete = jasmine.createSpy('undoDelete'); var ctrl = $controller('NavigationController', { FolderResource: FolderResource, @@ -815,8 +820,13 @@ describe('NavigationController', function () { 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); })); -- cgit v1.2.3