fix: correct implementation of doubleClick action

1. There is no `wd.doubleClick` method, there is `doubleclick` 2. It does not accept the button 3. The original code acts on incorrect element
gemini-testing · Dec 5, 2016 · f8746a9 · f8746a9
1 parent 2aa4bb0
commit f8746a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 36 deletions.
diff --git a/lib/browser/new-browser.js b/lib/browser/new-browser.js
@@ -42,7 +42,7 @@ module.exports = class NewBrowser extends Browser {
             'waitFor',
             'moveTo',
             'click',
-            'doubleClick',
+            'doubleclick',
             'buttonDown',
             'buttonUp',
             'keys',

diff --git a/lib/tests-api/actions-builder.js b/lib/tests-api/actions-builder.js
@@ -116,20 +116,18 @@ module.exports = inherit({
         return this;
     },
 
-    doubleClick: function(element, button) {
-        button = acceptMouseButton(button);
-
+    doubleClick: function(element) {
         if (isInvalidElement(element)) {
             throw new TypeError('.doubleClick() must receive valid element or CSS selector');
         }
 
         this._pushAction(this.doubleClick, function(browser) {
             return findElement(element, browser)
-                .then(function() {
-                    return browser.moveTo(element);
-                })
-                .then(function() {
-                    return browser.doubleClick(element, button);
+                .then(function(element) {
+                    return browser.moveTo(element)
+                      .then(function() {
+                          return browser.doubleclick();
+                      });
                 });
         });
         return this;

diff --git a/test/unit/browser/new-browser.js b/test/unit/browser/new-browser.js
@@ -64,7 +64,7 @@ describe('browser/new-browser', () => {
 
         [
             'sleep', 'waitForElementByCssSelector', 'waitForElementByCssSelector', 'waitFor', 'moveTo',
-            'click', 'doubleClick', 'buttonDown', 'buttonUp', 'keys', 'type', 'tapElement', 'execute',
+            'click', 'doubleclick', 'buttonDown', 'buttonUp', 'keys', 'type', 'tapElement', 'execute',
             'setWindowSize', 'getWindowSize', 'getOrientation', 'setOrientation'
         ].forEach((method) => it(method, () => testExposedWdMethod(method)));
 

diff --git a/test/unit/tests-api/actions-builder.js b/test/unit/tests-api/actions-builder.js
@@ -110,32 +110,6 @@ describe('tests-api/actions-builder', () => {
             });
         });
 
-        describe('doubleClick', () => {
-            beforeEach(() => {
-                sandbox.stub(browser, 'doubleClick').returns(Promise.resolve());
-            });
-
-            it('should use left button if not specified', () => {
-                const doubleClick = mkAction('doubleClick', browser);
-
-                return doubleClick('.some-selector')
-                    .then(() => assert.calledWith(browser.doubleClick, '.some-selector', 0));
-            });
-
-            it('should use passed button', () => {
-                const doubleClick = mkAction('doubleClick', browser);
-
-                return doubleClick('.some-selector', 1)
-                    .then(() => assert.calledWith(browser.doubleClick, '.some-selector', 1));
-            });
-
-            it('should throw on bad button (not 0, 1 or 2)', () => {
-                const doubleClick = mkAction('doubleClick', browser);
-
-                assert.throws(() => doubleClick('.some-selector', 3), /Mouse button should be/);
-            });
-        });
-
         describe('mouseDown', () => {
             beforeEach(() => {
                 sandbox.stub(browser, 'buttonDown').returns(Promise.resolve());