remove hardcoded rootnodeid from resolvepath, adjust return types, add test

Author: mibewh

@types/index.d.ts

@@ -325,7 +325,7 @@ export declare interface NodeSession extends Session {
     refreshNode(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, callback?: ResultCb<void>): Promise<void>
     changeNodeQName(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, newQName: string, callback?: ResultCb<Object>): Promise<Object>
     nodeTree(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, config?: TreeConfig, callback?: ResultCb<TreeElement>): Promise<TreeElement>
-    resolveNodePath(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, callback?: ResultCb<{path: string}>): Promise<{path: string}>
+    resolveNodePath(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, callback?: ResultCb<{path: string}>): Promise<string>
     resolveNodePaths(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, callback?: ResultCb<{[id: string]: string}>): Promise<{[id: string]: string}>
     traverseNode(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, config: Object, callback?: ResultCb<TraversalResult>): Promise<TraversalResult>
     uploadAttachment(repository: TypedID|string, branch: TypedID|string, node: TypedID|string, attachmentId: string, file: File, mimeType: string, filename?: string, callback?: ResultCb<void>): Promise<void>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcms",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-javascript-driver.git"

src/session/default/methods/node.js

@@ -504,18 +504,17 @@ module.exports = function(Session)
          * @param node
          * @returns {*}
          */
-        resolveNodePath(repository, branch, node)
+        async resolveNodePath(repository, branch, node)
         {
             var repositoryId = this.acquireId(repository);
             var branchId = this.acquireId(branch);
             var nodeId = this.acquireId(node);
             var callback = this.extractOptionalCallback(arguments);
 
             var qs = {};
-            //qs.rootNodeId = "821c40ab613d9b5bcbbc656b62229301";
-            qs.rootNodeId = "r:root";
 
-            return this.get("/repositories/" + repositoryId + "/branches/" + branchId + "/nodes/" + nodeId + "/path", qs, callback);
+            var result = await this.get("/repositories/" + repositoryId + "/branches/" + branchId + "/nodes/" + nodeId + "/path", qs, callback);
+            return result.path;
         };
 
         /**
@@ -527,14 +526,15 @@ module.exports = function(Session)
          * @param node
          * @returns {*}
          */
-        resolveNodePaths(repository, branch, node)
+        async resolveNodePaths(repository, branch, node)
         {
             var repositoryId = this.acquireId(repository);
             var branchId = this.acquireId(branch);
             var nodeId = this.acquireId(node);
             var callback = this.extractOptionalCallback(arguments);
 
-            return this.get("/repositories/" + repositoryId + "/branches/" + branchId + "/nodes/" + nodeId + "/paths", {}, callback);
+            var result = await this.get("/repositories/" + repositoryId + "/branches/" + branchId + "/nodes/" + nodeId + "/paths", {}, callback);
+            return result.paths;
         };
 
         /**

test/node/node11.ts

@@ -55,6 +55,13 @@ describe('node11', function() {
         var n7 = await session.readNode(repository, branchId, "root", "/folder2/folder12/folder111/node7");
         var n8 = await session.readNode(repository, branchId, "root", "/folder2/folder12/folder112/node8");
 
+        // test node path
+        var n8Paths = await session.resolveNodePaths(repository, branchId, n8);
+        assert.isAbove(Object.keys(n8Paths).length, 0);
+
+        var n8Path = await session.resolveNodePath(repository, branchId, n8);
+        assert.equal("/folder2/folder12/folder112/node8", n8Path);
+
         // verify nodes exist
         assert.exists(n1);
         assert.exists(n2);