Gets delete and empty recycle bin working, adds unit tests for tree service, ensures that the recycle bin shows children whenever something is deleted (though, i now realize i need to refresh the recycle bin node and expand it when something is deleted). Renames some namespaces for content/media/etc... controllers and makes the file names more readable.

src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js

@@ -20,7 +20,7 @@ describe('edit content controller tests', function () {
         //this controller requires an angular form controller applied to it
         scope.contentForm = angularHelper.getNullForm("contentForm");
         
-        controller = $controller('Umbraco.Editors.ContentEditController', {
+        controller = $controller('Umbraco.Editors.Content.EditController', {
             $scope: scope,
             $routeParams: routeParams
         });

src/Umbraco.Web.UI.Client/test/unit/common/services/tree-service.spec.js

@@ -0,0 +1,130 @@
+describe('tree service tests', function () {
+    var treeService;
+
+    function ensureParentLevelAndView(parentNode, treeNodes, section, level) {
+        //if no level is set, then we make it 1   
+        var childLevel = (level ? level : 1);
+        for (var i = 0; i < treeNodes.length; i++) {
+            treeNodes[i].level = childLevel;
+            //if there is not route path specified, then set it automatically
+            if (!treeNodes[i].routePath) {
+                treeNodes[i].routePath = section + "/edit/" + treeNodes[i].id;
+            }
+            treeNodes[i].parent = parentNode;
+        }
+    }
+
+    function getContentTree() {
+
+        var url = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetChildren?treeType=content&id=1234&level=1";
+        var menuUrl = "/umbraco/UmbracoTrees/ApplicationTreeApi/GetMenu?treeType=content&id=1234&parentId=456";
+
+        var t = {
+            name: "content",
+            id: -1,
+            children: [
+                {
+                    name: "My website", id: 1234, childNodesUrl: url, icon: "icon-home", expanded: false, hasChildren: true, level: 1, defaultAction: "create", menuUrl: menuUrl,
+                    children: [
+                        { name: "random-name-1", childNodesUrl: url, id: 11, icon: "icon-home", defaultAction: "create", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
+                        { name: "random-name-2", childNodesUrl: url, id: 12, icon: "icon-folder-close", defaultAction: "create", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
+                        { name: "random-name-3", childNodesUrl: url, id: 13, icon: "icon-folder-close", defaultAction: "create", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl },
+                        { name: "random-name-4", childNodesUrl: url, id: 14, icon: "icon-folder-close", defaultAction: "create", children: [], expanded: false, hasChildren: true, level: 1, menuUrl: menuUrl }
+                    ]
+                },
+                { name: "Components", id: 1235, childNodesUrl: url, icon: "icon-cogs", children: [], expanded: false, hasChildren: true, level: 1, defaultAction: "create", menuUrl: menuUrl },
+                { name: "Archieve", id: 1236, childNodesUrl: url, icon: "icon-folder-close", children: [], expanded: false, hasChildren: true, level: 1, defaultAction: "create", menuUrl: menuUrl },
+                { name: "Recycle Bin", id: -20, childNodesUrl: url, icon: "icon-trash", routePath: "content/recyclebin", children: [], expanded: false, hasChildren: true, level: 1, defaultAction: "create", menuUrl: menuUrl }
+            ],
+            expanded: true,
+            hasChildren: true,
+            level: 0,
+            menuUrl: menuUrl,
+            metaData: { treeType: "Umbraco.Web.Trees.ContentTreeController" }
+        };
+        
+        ensureParentLevelAndView(t, t.children, "content", 0);
+        ensureParentLevelAndView(t.children[0], t.children[0].children, "content", 1);
+
+        return t;
+    }
+
+    beforeEach(module('umbraco.services'));
+
+    beforeEach(inject(function ($injector) {
+        treeService = $injector.get('treeService');
+    }));
+
+    describe('query existing node structure of the tree', function () {
+
+        it('can get a descendant node', function() {
+
+            var tree = getContentTree();
+            var found = treeService.getDescendantNode(tree, 13);
+
+            expect(found).toBeDefined();
+            expect(found).not.toBeNull();
+            expect(found.id).toBe(13);
+            expect(found.name).toBe("random-name-3");
+        });
+        
+        it('returns null for a descendant node that doesnt exist', function () {
+
+            var tree = getContentTree();
+            var found = treeService.getDescendantNode(tree, 123456);
+            
+            expect(found).toBeNull();            
+        });
+        
+        it('can get a child node', function () {
+
+            var tree = getContentTree();
+            var found = treeService.getChildNode(tree, 1235);
+
+            expect(found).toBeDefined();
+            expect(found).not.toBeNull();
+            expect(found.id).toBe(1235);
+            expect(found.name).toBe("Components");
+        });
+
+        it('returns null for a child node that doesnt exist', function () {
+
+            var tree = getContentTree();
+            var found = treeService.getChildNode(tree, 123456);
+
+            expect(found).toBeNull();
+        });
+
+        it('returns null for a descendant node that doesnt exist', function () {
+
+            var tree = getContentTree();
+            var found = treeService.getDescendantNode(tree, 123456);
+
+            expect(found).toBeNull();
+        });
+
+        it('can get the root node from a child node', function () {
+            
+            var tree = getContentTree();
+            var testNode = tree.children[0].children[3];
+            var root = treeService.getTreeRoot(testNode);
+            
+            expect(root).toBeDefined();
+            expect(root).not.toBeNull();
+            expect(root.id).toBe(-1);
+            expect(root.name).toBe("content");
+        });
+        
+        it('can get the root node from the root node', function () {
+
+            var tree = getContentTree();
+            var root = treeService.getTreeRoot(tree);
+
+            expect(root).toBeDefined();
+            expect(root).not.toBeNull();
+            expect(root.id).toBe(-1);
+            expect(root.name).toBe("content");
+        });
+        
+    });
+});