Fixed an issue where the set locateStrategy wasn't used correctly in …

…the case of xpath
nightwatchjs · Apr 23, 2014 · e64e03b · e64e03b
1 parent d574ab2
commit e64e03b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/lib/selenium/element-commands.js b/lib/selenium/element-commands.js
@@ -311,7 +311,6 @@ module.exports = function(client) {
   elementCommands.submitForm = 'submit';
 
   function addElementCommand(protocolAction, extraArgs) {
-    var defaultUsing = client.locateStrategy || 'css selector';
     var self = this;
     extraArgs = extraArgs || 0;
     var expectedArgs = 3 + extraArgs;
@@ -322,6 +321,7 @@ module.exports = function(client) {
         args.push(noopFn);
       }
 
+      var defaultUsing = client.locateStrategy || 'css selector';
       if (expectedArgs - args.length === 1) {
         args.unshift(defaultUsing);
       }

diff --git a/tests/mocks.json b/tests/mocks.json
@@ -49,6 +49,11 @@
       "postdata" : "{\"using\":\"css selector\",\"value\":\"#weblogin\"}",
       "response" : "{\"sessionId\":\"1352110219202\",\"status\":0,\"value\":{\"ELEMENT\":\"0\"},\"class\":\"org.openqa.selenium.remote.Response\",\"hCode\":604376696}"
     },
+    {
+      "url" : "/wd/hub/session/1352110219202/element",
+      "postdata" : "{\"using\":\"xpath\",\"value\":\"//weblogin\"}",
+      "response" : "{\"sessionId\":\"1352110219202\",\"status\":0,\"value\":{\"ELEMENT\":\"0\"},\"class\":\"org.openqa.selenium.remote.Response\",\"hCode\":604376696}"
+    },
     {
       "url" : "/wd/hub/session/1352110219202/buttondown",
       "postdata" : "{\"button\":0}",

diff --git a/tests/src/commands/testClick.js b/tests/src/commands/testClick.js
@@ -23,7 +23,28 @@ module.exports = {
       test.equals(result.status, 0)
       test.done();
     });
+  },
+
+  testClickCommandWithXpath : function(test) {
+    var client = this.client.api;
+
+    MockServer.addMock({
+      "url" : "/wd/hub/session/1352110219202/element/0/click",
+      "response" : JSON.stringify({
+        sessionId: "1352110219202",
+        status:0
+      })
+    });
 
+    client
+      .useXpath()
+      .click('//weblogin', function callback(result) {
+        test.equals(result.status, 0)
+      })
+      .click('css selector', '#weblogin', function callback(result) {
+        test.equals(result.status, 0)
+        test.done();
+      });
   },
 
   tearDown : function(callback) {