Merge pull request #301 from kastiglione/scoped-xpath-finds

refs #300 - Heed scope for find's using XPath expressions

@@ -262,7 +262,7 @@
             try {
             try {
                 var pSelector = this.processSelector(selector);
                 var pSelector = this.processSelector(selector);
                 if (pSelector.type === 'xpath') {
                 if (pSelector.type === 'xpath') {
-                    return this.getElementsByXPath(pSelector.path);
+                    return this.getElementsByXPath(pSelector.path, scope);
                 } else {
                 } else {
                     return scope.querySelectorAll(pSelector.path);
                     return scope.querySelectorAll(pSelector.path);
                 }
                 }
@@ -283,7 +283,7 @@
             try {
             try {
                 var pSelector = this.processSelector(selector);
                 var pSelector = this.processSelector(selector);
                 if (pSelector.type === 'xpath') {
                 if (pSelector.type === 'xpath') {
-                    return this.getElementByXPath(pSelector.path);
+                    return this.getElementByXPath(pSelector.path, scope);
                 } else {
                 } else {
                     return scope.querySelector(pSelector.path);
                     return scope.querySelector(pSelector.path);
                 }
                 }
@@ -395,11 +395,13 @@
         /**
         /**
          * Retrieves a single DOM element matching a given XPath expression.
          * Retrieves a single DOM element matching a given XPath expression.
          *
          *
-         * @param  String  expression  The XPath expression
+         * @param  String            expression  The XPath expression
+         * @param  HTMLElement|null  scope       Element to search child elements within
          * @return HTMLElement or null
          * @return HTMLElement or null
          */
          */
-        this.getElementByXPath = function getElementByXPath(expression) {
-            var a = document.evaluate(expression, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+        this.getElementByXPath = function getElementByXPath(expression, scope) {
+            scope = scope || this.options.scope;
+            var a = document.evaluate(expression, scope, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
             if (a.snapshotLength > 0) {
             if (a.snapshotLength > 0) {
                 return a.snapshotItem(0);
                 return a.snapshotItem(0);
             }
             }
@@ -408,12 +410,14 @@
         /**
         /**
          * Retrieves all DOM elements matching a given XPath expression.
          * Retrieves all DOM elements matching a given XPath expression.
          *
          *
-         * @param  String  expression  The XPath expression
+         * @param  String            expression  The XPath expression
+         * @param  HTMLElement|null  scope       Element to search child elements within
          * @return Array
          * @return Array
          */
          */
-        this.getElementsByXPath = function getElementsByXPath(expression) {
+        this.getElementsByXPath = function getElementsByXPath(expression, scope) {
+            scope = scope || this.options.scope;
             var nodes = [];
             var nodes = [];
-            var a = document.evaluate(expression, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+            var a = document.evaluate(expression, scope, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
             for (var i = 0; i < a.snapshotLength; i++) {
             for (var i = 0; i < a.snapshotLength; i++) {
                 nodes.push(a.snapshotItem(i));
                 nodes.push(a.snapshotItem(i));
             }
             }

@@ -52,6 +52,8 @@ function fakeDocument(html) {
     // scoped
     // scoped
     var scope = clientutils.findOne('ul');
     var scope = clientutils.findOne('ul');
     casper.test.assertType(clientutils.findAll('li', scope), 'nodelist', 'ClientUtils.findAll() can find matching DOM elements within a given scope');
     casper.test.assertType(clientutils.findAll('li', scope), 'nodelist', 'ClientUtils.findAll() can find matching DOM elements within a given scope');
+    casper.test.assertEquals(clientutils.findAll('li', scope).length, 2, 'ClientUtils.findAll() can find matching DOM elements within a given scope');
+    casper.test.assertType(clientutils.findAll(x('//li'), scope), 'array', 'ClientUtils.findAll() can find matching DOM elements using XPath within a given scope');
     fakeDocument(null);
     fakeDocument(null);
 })(casper);
 })(casper);
 
 
@@ -63,8 +65,8 @@ function fakeDocument(html) {
     casper.test.assertNot(clientutils.findOne('ol'), 'ClientUtils.findOne() can find a matching DOM element');
     casper.test.assertNot(clientutils.findOne('ol'), 'ClientUtils.findOne() can find a matching DOM element');
     // scoped
     // scoped
     var scope = clientutils.findOne('ul');
     var scope = clientutils.findOne('ul');
-    casper.test.assertType(clientutils.findAll('li', scope), 'nodelist', 'ClientUtils.findAll() can find matching DOM elements within a given scope');
-    casper.test.assertEquals(clientutils.findAll('li', scope).length, 2, 'ClientUtils.findAll() can find matching DOM elements within a given scope');
+    casper.test.assertType(clientutils.findOne('li', scope), 'htmllielement', 'ClientUtils.findOne() can find a matching DOM element within a given scope');
+    casper.test.assertType(clientutils.findOne(x('//li'), scope), 'htmllielement', 'ClientUtils.findOne() can find a matching DOM element using XPath within a given scope');
     fakeDocument(null);
     fakeDocument(null);
 })(casper);
 })(casper);
 
 
@@ -109,5 +111,5 @@ function fakeDocument(html) {
 })(casper);
 })(casper);
 
 
 casper.run(function() {
 casper.run(function() {
-    this.test.done(28);
+    this.test.done(30);
 });
 });