Bug 1426154 - Rename Marionette:deleteSession to Marionette:Deregister. r?automatedtester
Marionette:deleteSession has always been misleadingly named as it
does not actually delete a Marionette session, but cleans up some
state and removes message listeners.
The forthcoming window tracking refactoring will formalise the
concepts "init" and "register" (with corresponding "uninit" and
"deregister"), so this can be seen as preparing for that change.
MozReview-Commit-ID: 5V1txY1S6dQ
--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -526,17 +526,17 @@ let executeInSandboxFn = dispatch(execut
let sendKeysToElementFn = dispatch(sendKeysToElement);
let reftestWaitFn = dispatch(reftestWait);
function startListeners() {
addMessageListener("Marionette:actionChain", actionChainFn);
addMessageListener("Marionette:cancelRequest", cancelRequest);
addMessageListener("Marionette:clearElement", clearElementFn);
addMessageListener("Marionette:clickElement", clickElement);
- addMessageListener("Marionette:deleteSession", deleteSession);
+ addMessageListener("Marionette:Deregister", deregister);
addMessageListener("Marionette:DOM:AddEventListener", domAddEventListener);
addMessageListener("Marionette:DOM:RemoveEventListener", domRemoveEventListener);
addMessageListener("Marionette:execute", executeFn);
addMessageListener("Marionette:executeInSandbox", executeInSandboxFn);
addMessageListener("Marionette:findElementContent", findElementContentFn);
addMessageListener("Marionette:findElementsContent", findElementsContentFn);
addMessageListener("Marionette:getActiveElement", getActiveElementFn);
addMessageListener("Marionette:getElementAttribute", getElementAttributeFn);
@@ -561,22 +561,22 @@ function startListeners() {
addMessageListener("Marionette:singleTap", singleTapFn);
addMessageListener("Marionette:switchToFrame", switchToFrame);
addMessageListener("Marionette:switchToParentFrame", switchToParentFrame);
addMessageListener("Marionette:switchToShadowRoot", switchToShadowRootFn);
addMessageListener("Marionette:takeScreenshot", takeScreenshotFn);
addMessageListener("Marionette:waitForPageLoaded", waitForPageLoaded);
}
-function deleteSession() {
+function deregister() {
removeMessageListener("Marionette:actionChain", actionChainFn);
removeMessageListener("Marionette:cancelRequest", cancelRequest);
removeMessageListener("Marionette:clearElement", clearElementFn);
removeMessageListener("Marionette:clickElement", clickElement);
- removeMessageListener("Marionette:deleteSession", deleteSession);
+ removeMessageListener("Marionette:Deregister", deregister);
removeMessageListener("Marionette:execute", executeFn);
removeMessageListener("Marionette:executeInSandbox", executeInSandboxFn);
removeMessageListener("Marionette:findElementContent", findElementContentFn);
removeMessageListener("Marionette:findElementsContent", findElementsContentFn);
removeMessageListener("Marionette:getActiveElement", getActiveElementFn);
removeMessageListener("Marionette:getElementAttribute", getElementAttributeFn);
removeMessageListener("Marionette:getElementProperty", getElementPropertyFn);
removeMessageListener("Marionette:getElementRect", getElementRectFn);