From ece490e01b4fd73ce753b9cc535e5b4ed4593fc2 Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Wed, 29 Apr 2015 11:31:19 +0100 Subject: [PATCH] Bug 1155716: Part 1: Remove submitElement from Marionette r=dburns --HG-- extra : source : 520ede785b0967572ca6411e75ce7466886db0f5 --- testing/marionette/driver.js | 20 -------------------- testing/marionette/listener.js | 25 ------------------------- 2 files changed, 45 deletions(-) diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js index 71721c1b47c5..17eca05e6787 100644 --- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -2087,25 +2087,6 @@ GeckoDriver.prototype.getElementValueOfCssProperty = function(cmd, resp) { } }; -/** - * Submit a form on a content page by either using form or element in - * a form. - * - * @param {string} id - * Reference to the elemen that will be checked. - */ -GeckoDriver.prototype.submitElement = function(cmd, resp) { - switch (this.context) { - case Context.CHROME: - throw new WebDriverError( - "Command 'submitElement' is not available in chrome context"); - - case Context.CONTENT: - yield this.listener.submitElement({id: cmd.parameters.id}); - break; - } -}; - /** * Check if element is enabled. * @@ -2952,7 +2933,6 @@ GeckoDriver.prototype.commands = { "getElementTagName": GeckoDriver.prototype.getElementTagName, "isElementDisplayed": GeckoDriver.prototype.isElementDisplayed, "getElementValueOfCssProperty": GeckoDriver.prototype.getElementValueOfCssProperty, - "submitElement": GeckoDriver.prototype.submitElement, "getElementSize": GeckoDriver.prototype.getElementSize, //deprecated "getElementRect": GeckoDriver.prototype.getElementRect, "isElementEnabled": GeckoDriver.prototype.isElementEnabled, diff --git a/testing/marionette/listener.js b/testing/marionette/listener.js index 9dd89b9d2a76..beefc73757c2 100644 --- a/testing/marionette/listener.js +++ b/testing/marionette/listener.js @@ -221,7 +221,6 @@ function startListeners() { addMessageListenerId("Marionette:getElementTagName", getElementTagNameFn); addMessageListenerId("Marionette:isElementDisplayed", isElementDisplayed); addMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssProperty); - addMessageListenerId("Marionette:submitElement", submitElement); addMessageListenerId("Marionette:getElementSize", getElementSizeFn); // deprecated addMessageListenerId("Marionette:getElementRect", getElementRectFn); addMessageListenerId("Marionette:isElementEnabled", isElementEnabledFn); @@ -326,7 +325,6 @@ function deleteSession(msg) { removeMessageListenerId("Marionette:getElementTagName", getElementTagNameFn); removeMessageListenerId("Marionette:isElementDisplayed", isElementDisplayed); removeMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssProperty); - removeMessageListenerId("Marionette:submitElement", submitElement); removeMessageListenerId("Marionette:getElementSize", getElementSizeFn); // deprecated removeMessageListenerId("Marionette:getElementRect", getElementRectFn); removeMessageListenerId("Marionette:isElementEnabled", isElementEnabledFn); @@ -1454,29 +1452,6 @@ function getElementValueOfCssProperty(msg) { } } -/** - * Submit a form on a content page by either using form or element in a form - * @param object msg - * 'json' JSON object containing 'id' member of the element - */ -function submitElement (msg) { - let command_id = msg.json.command_id; - try { - let el = elementManager.getKnownElement(msg.json.id, curFrame); - while (el.parentNode != null && el.tagName.toLowerCase() != 'form') { - el = el.parentNode; - } - if (el.tagName && el.tagName.toLowerCase() == 'form') { - el.submit(); - sendOk(command_id); - } else { - sendError(new NoSuchElementError("Element is not a form element or in a form"), command_id); - } - } catch (e) { - sendError(e, command_id); - } -} - /** * Get the size of the element. *