diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js index 352617fdfaaa..88a1055aabd2 100644 --- a/testing/marionette/driver.js +++ b/testing/marionette/driver.js @@ -3645,60 +3645,6 @@ GeckoDriver.prototype.commands = { "WebDriver:SwitchToShadowRoot": GeckoDriver.prototype.switchToShadowRoot, "WebDriver:SwitchToWindow": GeckoDriver.prototype.switchToWindow, "WebDriver:TakeScreenshot": GeckoDriver.prototype.takeScreenshot, - - // deprecated WebDriver commands, remove in Firefox 63 - "acceptDialog": GeckoDriver.prototype.acceptDialog, - "addCookie": GeckoDriver.prototype.addCookie, - "clearElement": GeckoDriver.prototype.clearElement, - "clickElement": GeckoDriver.prototype.clickElement, - "close": GeckoDriver.prototype.close, - "deleteAllCookies": GeckoDriver.prototype.deleteAllCookies, - "deleteCookie": GeckoDriver.prototype.deleteCookie, - "deleteSession": GeckoDriver.prototype.deleteSession, - "dismissDialog": GeckoDriver.prototype.dismissDialog, - "executeAsyncScript": GeckoDriver.prototype.executeAsyncScript, - "executeScript": GeckoDriver.prototype.executeScript, - "findElement": GeckoDriver.prototype.findElement, - "findElements": GeckoDriver.prototype.findElements, - "fullscreen": GeckoDriver.prototype.fullscreenWindow, - "getActiveElement": GeckoDriver.prototype.getActiveElement, - "getActiveFrame": GeckoDriver.prototype.getActiveFrame, - "getCookies": GeckoDriver.prototype.getCookies, - "getCurrentUrl": GeckoDriver.prototype.getCurrentUrl, - "getElementAttribute": GeckoDriver.prototype.getElementAttribute, - "getElementProperty": GeckoDriver.prototype.getElementProperty, - "getElementRect": GeckoDriver.prototype.getElementRect, - "getElementTagName": GeckoDriver.prototype.getElementTagName, - "getElementText": GeckoDriver.prototype.getElementText, - "getElementValueOfCssProperty": GeckoDriver.prototype.getElementValueOfCssProperty, - "get": GeckoDriver.prototype.get, - "getPageSource": GeckoDriver.prototype.getPageSource, - "getSessionCapabilities": GeckoDriver.prototype.getSessionCapabilities, - "getTextFromDialog": GeckoDriver.prototype.getTextFromDialog, - "getTimeouts": GeckoDriver.prototype.getTimeouts, - "getTitle": GeckoDriver.prototype.getTitle, - "getWindowHandle": GeckoDriver.prototype.getWindowHandle, - "getWindowHandles": GeckoDriver.prototype.getWindowHandles, - "getWindowRect": GeckoDriver.prototype.getWindowRect, - "goBack": GeckoDriver.prototype.goBack, - "goForward": GeckoDriver.prototype.goForward, - "isElementDisplayed": GeckoDriver.prototype.isElementDisplayed, - "isElementEnabled": GeckoDriver.prototype.isElementEnabled, - "isElementSelected": GeckoDriver.prototype.isElementSelected, - "maximizeWindow": GeckoDriver.prototype.maximizeWindow, - "newSession": GeckoDriver.prototype.newSession, - "performActions": GeckoDriver.prototype.performActions, - "refresh": GeckoDriver.prototype.refresh, - "releaseActions": GeckoDriver.prototype.releaseActions, - "sendKeysToDialog": GeckoDriver.prototype.sendKeysToDialog, - "sendKeysToElement": GeckoDriver.prototype.sendKeysToElement, - "setTimeouts": GeckoDriver.prototype.setTimeouts, - "setWindowRect": GeckoDriver.prototype.setWindowRect, - "switchToFrame": GeckoDriver.prototype.switchToFrame, - "switchToParentFrame": GeckoDriver.prototype.switchToParentFrame, - "switchToShadowRoot": GeckoDriver.prototype.switchToShadowRoot, - "switchToWindow": GeckoDriver.prototype.switchToWindow, - "takeScreenshot": GeckoDriver.prototype.takeScreenshot, }; function getOuterWindowId(win) { diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py b/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py index d003c2f52bcf..90446f47fc87 100644 --- a/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py +++ b/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py @@ -154,7 +154,7 @@ class TestCapabilityMatching(MarionetteTestCase): self.marionette.start_session(caps) self.assertIn("timeouts", self.marionette.session_capabilities) self.assertDictEqual(self.marionette.session_capabilities["timeouts"], timeouts) - self.assertDictEqual(self.marionette._send_message("getTimeouts"), timeouts) + self.assertDictEqual(self.marionette._send_message("WebDriver:GetTimeouts"), timeouts) def test_unhandled_prompt_behavior(self): behaviors = [ diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py b/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py index b0e3f2e084d4..9cb53f0245f0 100644 --- a/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py +++ b/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py @@ -256,7 +256,7 @@ class TestExecuteContent(MarionetteTestCase): def test_lasting_side_effects(self): def send(script): return self.marionette._send_message( - "executeScript", {"script": script}, key="value") + "WebDriver:ExecuteScript", {"script": script}, key="value") send("window.foo = 1") foo = send("return window.foo") @@ -351,7 +351,7 @@ class TestExecuteContent(MarionetteTestCase): @skip_if_mobile("Modal dialogs not supported in Fennec") def test_return_value_on_alert(self): - res = self.marionette._send_message("executeScript", {"script": "alert()"}) + res = self.marionette._send_message("WebDriver:ExecuteScript", {"script": "alert()"}) self.assertIn("value", res) self.assertIsNone(res["value"]) diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py b/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py index d1267de63619..45faaf9d1477 100644 --- a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py +++ b/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py @@ -35,7 +35,7 @@ class Actions(object): "type": "pointer" }]} - return self.marionette._send_message("performActions", params=params) + return self.marionette._send_message("WebDriver:PerformActions", params=params) def move(self, element, x=0, y=0, duration=250): self.action_chain.append({ diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_session.py b/testing/marionette/harness/marionette_harness/tests/unit/test_session.py index 3972b70a2981..78c1fdd4b2bd 100644 --- a/testing/marionette/harness/marionette_harness/tests/unit/test_session.py +++ b/testing/marionette/harness/marionette_harness/tests/unit/test_session.py @@ -44,7 +44,7 @@ class TestSession(MarionetteTestCase): self.marionette.start_session() self.assertTrue(isinstance(self.marionette.session_id, unicode)) with self.assertRaises(errors.SessionNotCreatedException): - self.marionette._send_message("newSession", {}) + self.marionette._send_message("WebDriver:NewSession", {}) def test_no_session(self): with self.assertRaisesRegexp(errors.MarionetteException, "Please start a session"):