Fixed getElementSize and getLocation commands for w3c webdriver clients

niziqq · Oct 11, 2019 · fd10c9b · fd10c9b
1 parent 8ba496c
commit fd10c9b
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 0 deletions.
diff --git a/lib/transport/webdriver/actions.js b/lib/transport/webdriver/actions.js
@@ -56,6 +56,14 @@ module.exports = lodashMerge({}, JsonWireActions, {
       });
     },
 
+    getElementSize(id) {
+      return `/element/${id}/rect`;
+    },
+
+    getElementLocation(id) {
+      return `/element/${id}/rect`;
+    },
+
     ///////////////////////////////////////////////////////////
     // Windows
     ///////////////////////////////////////////////////////////

diff --git a/test/src/api/commands/testGetElementSize.js b/test/src/api/commands/testGetElementSize.js
@@ -1,5 +1,6 @@
 const assert = require('assert');
 const MockServer = require('../../../lib/mockserver.js');
+const Nightwatch = require('../../../lib/nightwatch.js');
 const CommandGlobals = require('../../../lib/globals/commands.js');
 
 describe('getElementSize', function() {
@@ -31,4 +32,40 @@ describe('getElementSize', function() {
     this.client.start(done);
   });
 
+  it('client.getElementSize() with webdriver protocol', function(done) {
+    Nightwatch.initClient({
+      selenium : {
+        version2: false,
+        start_process: false
+      },
+      webdriver:{
+        start_process: true
+      },
+    }).then(client => {
+      MockServer.addMock({
+        url: '/session/13521-10219-202/element/5cc459b8-36a8-3042-8b4a-258883ea642b/rect',
+        method: 'GET',
+        response: {
+          value: {
+            x: 341.5,
+            y: 340.95001220703125,
+            width: 683,
+            height: 60
+          }
+        }
+      }, true);
+
+      client.api.getElementSize('#webdriver', function(result) {
+        assert.deepStrictEqual(result.value, {
+          x: 341.5,
+          y: 340.95001220703125,
+          width: 683,
+          height: 60
+        });
+      });
+
+      client.start(done);
+    });
+  });
+
 });
diff --git a/test/src/api/commands/testGetLocation.js b/test/src/api/commands/testGetLocation.js
@@ -1,5 +1,6 @@
 const assert = require('assert');
 const MockServer = require('../../../lib/mockserver.js');
+const Nightwatch = require('../../../lib/nightwatch.js');
 const CommandGlobals = require('../../../lib/globals/commands.js');
 
 describe('getLocation', function() {
@@ -33,4 +34,40 @@ describe('getLocation', function() {
 
     this.client.start(done);
   });
+
+  it('client.getLocation() with webdriver protocol', function(done) {
+    Nightwatch.initClient({
+      selenium : {
+        version2: false,
+        start_process: false
+      },
+      webdriver:{
+        start_process: true
+      },
+    }).then(client => {
+      MockServer.addMock({
+        url: '/session/13521-10219-202/element/5cc459b8-36a8-3042-8b4a-258883ea642b/rect',
+        method: 'GET',
+        response: {
+          value: {
+            x: 341.5,
+            y: 340.95001220703125,
+            width: 683,
+            height: 60
+          }
+        }
+      }, true);
+
+      client.api.getLocation('#webdriver', function(result) {
+        assert.deepStrictEqual(result.value, {
+          x: 341.5,
+          y: 340.95001220703125,
+          width: 683,
+          height: 60
+        });
+      });
+
+      client.start(done);
+    });
+  });
 });