delete + undo folders

2 files changed, 10 insertions, 11 deletions

diff --git a/js/tests/unit/service/FeedResourceSpec.js b/js/tests/unit/service/FeedResourceSpec.js
index c6f3ba050..a64b1b162 100644
--- a/js/tests/unit/service/FeedResourceSpec.js
+++ b/js/tests/unit/service/FeedResourceSpec.js
@@ -229,7 +229,10 @@ describe('FeedResource', function () {
 
 
     it ('should delete a feed', inject(function (FeedResource) {
-        FeedResource.delete(2);
+        var feed = FeedResource.getById(2);
+        var deletedFeed = FeedResource.delete(2);
+
+        expect(deletedFeed).toBe(feed);
         expect(FeedResource.get('sye')).toBe(undefined);
         expect(FeedResource.size()).toBe(2);
     }));
diff --git a/js/tests/unit/service/FolderResourceSpec.js b/js/tests/unit/service/FolderResourceSpec.js
index a5902d2ee..444dba2e0 100644
--- a/js/tests/unit/service/FolderResourceSpec.js
+++ b/js/tests/unit/service/FolderResourceSpec.js
@@ -35,13 +35,9 @@ describe('FolderResource', function () {
 
 
     it ('should delete a folder', inject(function (FolderResource) {
-        http.expectDELETE('base/folders/1').respond(200, {});
-
         FolderResource.delete('ye');
-
-        http.flush();
-
         expect(FolderResource.size()).toBe(2);
+        expect(FolderResource.get('ye')).toBe(undefined);
     }));
 
 
@@ -111,21 +107,21 @@ describe('FolderResource', function () {
     }));
 
 
-    it ('should undo a delete folder', inject(function (FolderResource) {
+    it ('should reversibly delete a folder', inject(function (FolderResource) {
         http.expectDELETE('base/folders/1').respond(200, {});
 
-        FolderResource.delete('ye');
+        FolderResource.reversiblyDelete(1);
 
         http.flush();
+    }));
 
 
+    it ('should undo a delete folder', inject(function (FolderResource) {
         http.expectPOST('base/folders/1/restore').respond(200, {});
 
-        FolderResource.undoDelete();
+        FolderResource.undoDelete(1);
 
         http.flush();
-
-        expect(FolderResource.get('ye').id).toBe(1);
     }));