Added verification test for path token substitutions

Author: uzquiano

build.xml

@@ -402,6 +402,7 @@
                 <file name="testNodeAttachments2.js"/>
                 <file name="testNodeAttachments3.js"/>
                 <file name="testNodeContainers1.js"/>
+                <file name="testNodeContainers2.js"/>
                 <file name="testNodeFeatures1.js"/>
                 <file name="testNodeType1.js"/>
                 <file name="testNodeQName1.js"/>

js/gitana/repository/Branch.js

@@ -200,6 +200,7 @@
                 var associationType = "a:child"; // default
                 var filePath = null;
                 var parentFolderPath = null;
+                var fileName = null;
 
                 // if they pass in a string instead of an options object, then the string can follow the format
                 // (/root/pages/file.txt) where root is the root node to start from
@@ -228,12 +229,27 @@
                     if (options.associationType) {
                         associationType = options.associationType;
                     }
-                    if (options.filePath) {
-                        filePath = options.filePath;
+                    if (options.fileName) {
+                        fileName = options.fileName;
+                    }
+                    else if (options.filename) {
+                        fileName = options.filename;
                     }
                     if (options.parentFolderPath) {
                         parentFolderPath = options.parentFolderPath;
                     }
+                    else if (options.folderPath) {
+                        parentFolderPath = options.folderPath;
+                    }
+                    else if (options.folderpath) {
+                        parentFolderPath = options.folderpath;
+                    }
+                    if (options.filePath) {
+                        filePath = options.filePath;
+                    }
+                    else if (options.filepath) {
+                        filePath = options.filepath;
+                    }
                 }
 
                 // plug in the resolved params
@@ -243,6 +259,9 @@
                 if (associationType) {
                     params.associationType = associationType;
                 }
+                if (fileName) {
+                    params.fileName = fileName;
+                }
                 if (filePath) {
                     params.filePath = filePath;
                 }

tests/js/testNodeContainers2.js

@@ -0,0 +1,52 @@
+(function($) {
+
+    module("nodeContainers2");
+
+    // Test case : Node Containers #2
+    test("Node Containers #2", function() {
+
+        stop();
+
+        expect(2);
+
+        var gitana = GitanaTest.authenticateFullOAuth();
+        gitana.createRepository().readBranch("master").then(function() {
+
+            // NOTE: this = branch
+
+            // create a nested folder
+            this.createNode({
+                "description": "Booya"
+            }, {
+                "filename": "{document.id}.txt",
+                "folderPath": "/a/b/c/{document.id}"
+            });
+
+            this.then(function() {
+
+                // query by path
+                this.readNode("root", "/a/b/c").then(function() {
+
+                    this.listChildren().then(function() {
+
+                        this.keepOne().then(function() {
+
+                            // THIS = the folder named {document.id}
+
+                            this.listChildren().keepOne().then(function() {
+
+                                var newTitle = this._doc + ".txt";
+
+                                ok(this.title == newTitle, "title matches");
+                                ok(this.description == "Booya", "description matches");
+
+                                start();
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    });
+
+}(jQuery) );