Bug 1451725 - Remove deprecated WebDriver Commands draft
authorVenkatesh Pitta <venkateshpitta@gmail.com>
Fri, 27 Jul 2018 11:27:22 +1000
changeset 823844 df1e51f6be50c46012cce5da9a5ecd654fe867b7
parent 822981 4e6486b672b32aba075b704c6b1e41e8ccf7a135
push id117799
push userbmo:venkateshpitta@gmail.com
push dateSun, 29 Jul 2018 01:02:23 +0000
bugs1451725
milestone63.0a1
Bug 1451725 - Remove deprecated WebDriver Commands MozReview-Commit-ID: 7PXrlwyiFvN
testing/marionette/driver.js
testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
testing/marionette/harness/marionette_harness/tests/unit/test_session.py
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -3639,70 +3639,16 @@ GeckoDriver.prototype.commands = {
   "WebDriver:SendAlertText": GeckoDriver.prototype.sendKeysToDialog,
   "WebDriver:SetTimeouts": GeckoDriver.prototype.setTimeouts,
   "WebDriver:SetWindowRect": GeckoDriver.prototype.setWindowRect,
   "WebDriver:SwitchToFrame": GeckoDriver.prototype.switchToFrame,
   "WebDriver:SwitchToParentFrame": GeckoDriver.prototype.switchToParentFrame,
   "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) {
   return win.windowUtils.outerWindowID;
 }
 
 /**
  * Exit fullscreen and wait for <var>window</var> to resize.
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
@@ -154,17 +154,17 @@ class TestCapabilityMatching(MarionetteT
                 self.marionette.start_session({"pageLoadStrategy": value})
 
     def test_timeouts(self):
         timeouts = {u"implicit": 123, u"pageLoad": 456, u"script": 789}
         caps = {"timeouts": timeouts}
         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 = [
             "accept",
             "accept and notify",
             "dismiss",
             "dismiss and notify",
             "ignore"
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_execute_script.py
@@ -251,17 +251,17 @@ class TestExecuteContent(MarionetteTestC
         self.assertEqual("function", typ)
         obj = self.marionette.execute_script(
             "return window.wrappedJSObject.foo.toString()", sandbox="system")
         self.assertIn("yolo", obj)
 
     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")
         self.assertEqual(1, foo)
 
         for property in globals:
             exists = send("return typeof {} != 'undefined'".format(property))
             self.assertTrue(exists, "property {} is undefined".format(property))
@@ -346,17 +346,17 @@ class TestExecuteContent(MarionetteTestC
                 return document.documentElement;
               }
             }""",
             sandbox=None)
         self.assert_is_web_element(el)
 
     @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"])
 
 
 class TestExecuteChrome(WindowManagerMixin, TestExecuteContent):
 
     def setUp(self):
         super(TestExecuteChrome, self).setUp()
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
@@ -30,17 +30,17 @@ class Actions(object):
             "actions": self.action_chain,
             "id": "mouse",
             "parameters": {
                 "pointerType": "mouse"
             },
             "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({
             "duration": duration,
             "origin": {WEB_ELEMENT_KEY: element.id},
             "type": "pointerMove",
             "x": x,
             "y": y,
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_session.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_session.py
@@ -39,16 +39,16 @@ class TestSession(MarionetteTestCase):
 
         self.assertTrue(self.marionette.session_id is not None)
         self.assertTrue(isinstance(self.marionette.session_id, unicode))
 
     def test_session_already_started(self):
         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"):
             self.marionette.get_url()
 
         self.marionette.start_session()
         self.marionette.get_url()