2 files changed, 60 insertions, 2 deletions
diff --git a/js/tests/unit/service/FeedResourceSpec.js b/js/tests/unit/service/FeedResourceSpec.js
index 8f93a036c..905e85811 100644
--- a/js/tests/unit/service/FeedResourceSpec.js
+++ b/js/tests/unit/service/FeedResourceSpec.js
@@ -120,6 +120,8 @@ describe('FeedResource', function () {
 
         http.flush();
 
+        expect(FeedResource.getById(2).deleted).toBe(true);
+        expect(FeedResource.getUnreadCount()).toBe(45);
     }));
 
 
@@ -225,6 +227,8 @@ describe('FeedResource', function () {
         http.flush();
 
         expect(FeedResource.get('sye').id).toBe(2);
+        expect(FeedResource.get('sye').deleted).toBe(false);
+        expect(FeedResource.getUnreadCount()).toBe(70);
     }));
 
 
@@ -238,4 +242,48 @@ describe('FeedResource', function () {
     }));
 
 
+    it ('should delete feeds of a folder', inject(function (FeedResource) {
+        FeedResource.deleteFolder(3);
+
+        expect(FeedResource.get('ye')).toBe(undefined);
+        expect(FeedResource.get('1sye')).toBe(undefined);
+        expect(FeedResource.getUnreadCount()).toBe(25);
+        expect(FeedResource.size()).toBe(1);
+    }));
+
+
+    it ('should reversibly delete a folder', inject(function (FeedResource) {
+        http.expectDELETE('base/feeds/1').respond(200, {});
+        http.expectDELETE('base/feeds/3').respond(200, {});
+
+        FeedResource.reversiblyDeleteFolder(3);
+
+        http.flush();
+
+        expect(FeedResource.getById(1).deleted).toBe(true);
+        expect(FeedResource.getById(3).deleted).toBe(true);
+        expect(FeedResource.getUnreadCount()).toBe(25);
+    }));
+
+
+    it ('should reversibly undelete a folder', inject(function (FeedResource) {
+        http.expectDELETE('base/feeds/1').respond(200, {});
+        http.expectDELETE('base/feeds/3').respond(200, {});
+
+        FeedResource.reversiblyDeleteFolder(3);
+
+        http.flush();
+
+        http.expectPOST('base/feeds/1/restore').respond(200, {});
+        http.expectPOST('base/feeds/3/restore').respond(200, {});
+
+        FeedResource.undoDeleteFolder(3);
+
+        http.flush();
+
+        expect(FeedResource.getById(1).deleted).toBe(false);
+        expect(FeedResource.getById(3).deleted).toBe(false);
+        expect(FeedResource.getUnreadCount()).toBe(70);
+    }));
+
 });
diff --git a/js/tests/unit/service/FolderResourceSpec.js b/js/tests/unit/service/FolderResourceSpec.js
index 444dba2e0..ee6485121 100644
--- a/js/tests/unit/service/FolderResourceSpec.js
+++ b/js/tests/unit/service/FolderResourceSpec.js
@@ -110,18 +110,28 @@ describe('FolderResource', function () {
     it ('should reversibly delete a folder', inject(function (FolderResource) {
         http.expectDELETE('base/folders/1').respond(200, {});
 
-        FolderResource.reversiblyDelete(1);
+        FolderResource.reversiblyDelete('ye');
 
         http.flush();
+
+        expect(FolderResource.get('ye').deleted).toBe(true);
     }));
 
 
     it ('should undo a delete folder', inject(function (FolderResource) {
+        http.expectDELETE('base/folders/1').respond(200, {});
+
+        FolderResource.reversiblyDelete('ye');
+
+        http.flush();
+
         http.expectPOST('base/folders/1/restore').respond(200, {});
 
-        FolderResource.undoDelete(1);
+        FolderResource.undoDelete('ye');
 
         http.flush();
+
+        expect(FolderResource.get('ye').deleted).toBe(false);
     }));